任务模块接口

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -560,7 +560,6 @@ public class TaskController {
         HttpRespMsg msg = new HttpRespMsg();
         String userId = request.getHeader("Token");
         QueryWrapper<Task> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("indate");
 
         //任务状态
         queryWrapper.eq("task_status", status);
@@ -578,15 +577,9 @@ public class TaskController {
 //            //已超期的任务,未完成的任务
 //            queryWrapper.lt("end_date", LocalDate.now()).eq("task_status", 0);
 //        }
-        IPage<Task> taskIPage = taskMapper.selectPage(new Page<>(pageIndex, pageSize),
-                queryWrapper);
-        List<Task> list = taskIPage.getRecords();
-        List<Integer> collect = list.stream().map(Task::getProjectId).collect(Collectors.toList());
-        List<Project> projectList = projectService.list(new QueryWrapper<Project>().in("id", collect));
-        list.forEach(l->{
-            l.setProjectName(projectList.stream().filter(p->p.getId().equals(l.getProjectId())).findFirst().get().getProjectName());
-        });
-        Long total = taskIPage.getTotal();
+        List<Task> list = taskMapper.getTaskWithProjectName(queryWrapper, (pageIndex-1)*pageSize, pageSize);
+
+        int total = taskMapper.selectCount(queryWrapper);;
         Map<String, Object> map = new HashMap<>();
         map.put("records", list);
         map.put("total", total);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/TaskMapper.java

@@ -33,4 +33,6 @@ public interface TaskMapper extends BaseMapper<Task> {
     List getProjectTask(Integer companyId, Integer pageStart, Integer pageSize);
 
     Integer getProjectTaskCount(Integer companyId);
+
+    List getTaskWithProjectName(@Param(Constants.WRAPPER) Wrapper wrapper, Integer pageStart, Integer pageSize);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -99,7 +99,7 @@ management:
   security:
     enabled:false:
   server:
-    port: 10011
+    port: 10012
 #  endpoints:
 #    web:
 #      exposure:

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml

@@ -57,6 +57,34 @@
         <result column="finish_date" property="finishDate" />
         <result column="work_hours" property="workHours" />
     </resultMap>
+    <resultMap id="RichResultMap" type="com.management.platform.entity.Task">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="task_desc" property="taskDesc" />
+        <result column="creater_id" property="createrId" />
+        <result column="creater_name" property="createrName" />
+        <result column="creator_color" property="creatorColor" />
+        <result column="executor_id" property="executorId" />
+        <result column="executor_name" property="executorName" />
+        <result column="executor_color" property="executorColor" />
+        <result column="task_level" property="taskLevel" />
+        <result column="task_status" property="taskStatus" />
+        <result column="create_date" property="createDate" />
+        <result column="end_date" property="endDate" />
+        <result column="project_id" property="projectId" />
+        <result column="stages_id" property="stagesId" />
+        <result column="company_id" property="companyId" />
+        <result column="indate" property="indate" />
+        <result column="parent_tid" property="parentTid" />
+        <result column="group_id" property="groupId" />
+        <result column="seq" property="seq" />
+        <result column="plan_hours" property="planHours" />
+        <result column="task_type" property="taskType" />
+        <result column="parent_tname" property="parentTname" />
+        <result column="finish_date" property="finishDate" />
+        <result column="project_name" property="projectName" />
+    </resultMap>
+
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -128,4 +156,12 @@
         WHERE project.`company_id` = #{companyId}
     </select>
 
+    <select id="getTaskWithProjectName" resultMap="RichResultMap">
+        SELECT task.*, project.`project_name` FROM task LEFT JOIN project ON project.id = task.`project_id`
+        ${ew.customSqlSegment}
+        ORDER BY task.indate desc
+        <if test="pageStart != null and pageSize != null">
+            limit #{pageStart}, #{pageSize}
+        </if>
+    </select>
 </mapper>

fhKeeper/formulahousekeeper/timesheet/src/assets/myfont/demo_index.html

@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xec4e;</span>
+                <div class="name">待办事项</div>
+                <div class="code-name">&amp;#xec4e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64b;</span>
+                <div class="name">待办</div>
+                <div class="code-name">&amp;#xe64b;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe614;</span>
                 <div class="name">工时统计</div>
@@ -414,9 +426,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1631157632503') format('woff2'),
-       url('iconfont.woff?t=1631157632503') format('woff'),
-       url('iconfont.ttf?t=1631157632503') format('truetype');
+  src: url('iconfont.woff2?t=1637975267232') format('woff2'),
+       url('iconfont.woff?t=1637975267232') format('woff'),
+       url('iconfont.ttf?t=1637975267232') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -442,6 +454,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont firerock-icondaibanshixiang"></span>
+            <div class="name">
+              待办事项
+            </div>
+            <div class="code-name">.firerock-icondaibanshixiang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont firerock-icondaiban"></span>
+            <div class="name">
+              待办
+            </div>
+            <div class="code-name">.firerock-icondaiban
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont firerock-icongongshitongji"></span>
             <div class="name">
@@ -982,6 +1012,22 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#firerock-icondaibanshixiang"></use>
+                </svg>
+                <div class="name">待办事项</div>
+                <div class="code-name">#firerock-icondaibanshixiang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#firerock-icondaiban"></use>
+                </svg>
+                <div class="name">待办</div>
+                <div class="code-name">#firerock-icondaiban</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#firerock-icongongshitongji"></use>

fhKeeper/formulahousekeeper/timesheet/src/assets/myfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2390497 */
-  src: url('iconfont.woff2?t=1631157632503') format('woff2'),
-       url('iconfont.woff?t=1631157632503') format('woff'),
-       url('iconfont.ttf?t=1631157632503') format('truetype');
+  src: url('iconfont.woff2?t=1637975267232') format('woff2'),
+       url('iconfont.woff?t=1637975267232') format('woff'),
+       url('iconfont.ttf?t=1637975267232') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.firerock-icondaibanshixiang:before {
+  content: "\ec4e";
+}
+
+.firerock-icondaiban:before {
+  content: "\e64b";
+}
+
 .firerock-icongongshitongji:before {
   content: "\e614";
 }

fhKeeper/formulahousekeeper/timesheet/src/assets/myfont/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "firerock-icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "5961300",
+      "name": "待办事项",
+      "font_class": "daibanshixiang",
+      "unicode": "ec4e",
+      "unicode_decimal": 60494
+    },
+    {
+      "icon_id": "11465003",
+      "name": "待办",
+      "font_class": "daiban",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
     {
       "icon_id": "6023953",
       "name": "工时统计",

fhKeeper/formulahousekeeper/timesheet/src/main.js

@@ -45,11 +45,11 @@ import 'nprogress/nprogress.css'
 
 var addRouFlag = false;
 //角色权限对应关系
-var userModules = [{role:0, modules:["工时报告","专业审核","部门审核","自动计时","费用报销","项目管理"]},
-            {role:3, modules:["工时报告","工时成本统计","项目报表服务","费用报销","项目管理"]},
-            {role:4, modules:["工时报告","财务核算成本", "费用报销", "组织架构"]},
-            {role:5, modules:["工时报告","自动计时","项目管理","专业管理"]},
-            {role:6, modules:["工时报告","工时成本统计","财务核算成本","项目报表服务","费用报销","项目管理"]},];
+var userModules = [{role:0, modules:["工时报告","专业审核","部门审核","自动计时","费用报销","待办任务", "项目管理"]},
+            {role:3, modules:["工时报告","工时成本统计","项目报表服务","费用报销","待办任务","项目管理"]},
+            {role:4, modules:["工时报告","财务核算成本", "费用报销", "待办任务","组织架构"]},
+            {role:5, modules:["工时报告","自动计时","待办任务","项目管理","专业管理"]},
+            {role:6, modules:["工时报告","工时成本统计","财务核算成本","项目报表服务","费用报销","待办任务","项目管理"]},];
 router.beforeEach((to, from, next) => {
     NProgress.start();
     if (to.path == '/register') {

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -194,7 +194,7 @@ export const allRouters = [//组织架构
         path: '/',
         component: Home,
         name: '待办任务',
-        iconCls: 'iconfont firerock-iconcaiwu',
+        iconCls: 'iconfont firerock-icondaibanshixiang',
         leaf: true,
         children: [
             { path: '/task', component: tasks, name: '待办任务' },

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -358,7 +358,7 @@ import { error } from 'dingtalk-jsapi';
             //获取项目列表
             getList() {
                 this.listLoading = true;
-                this.http.post('task/listByPage', {
+                this.http.post('/task/listByPage', {
                     status: this.searchField,
                     viewId: this.idx,
                     pageIndex: this.page,