配置文件修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -442,6 +442,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                 if (Objects.nonNull(tfFlowApproveLog)) {
                     tfFlowApproveLogService.saveOrUpdate(tfFlowApproveLog);
                 }
+                examTask.updateInfo(sysUser.getId());
+                examTaskService.updateById(examTask);
             } else {
                 throw ExceptionResultEnum.ERROR.exception("正在审批中，请稍候再试！");
             }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -292,8 +292,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 //            examTask.setStatus(ExamStatusEnum.READY);
 //        }
         examTask.setEnable(true);
-        examTask.setCreateId(sysUser.getId());
-        examTask.setCreateTime(System.currentTimeMillis());
+        examTask.insertInfo(sysUser.getId());
         examTask.setReview(basicExamRule.getReview());
         this.save(examTask);
         return examTask;
@@ -332,8 +331,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             if (basicExamRule == null) {
                 throw ExceptionResultEnum.ERROR.exception("通用规则未设置");
             }
-            examTask.setId(SystemConstant.getDbUuid());
-            examTask.setCreateId(sysUser.getId());
+            examTask.insertInfo(sysUser.getId());
+            examTask.updateInfo(sysUser.getId());
             examTask.setReview(basicExamRule.getReview());
             examTask.setOrgId(sysUser.getOrgId());
             if (examTask.getUserId() == null) {
@@ -574,8 +573,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setEnable(true);
             examTask.setCardRuleId(task.getCardRuleId());
             examTask.setBatchNo(task.getBatchNo());
-            examTask.setCreateId(sysUser.getId());
-            examTask.setCreateTime(System.currentTimeMillis());
+            examTask.insertInfo(sysUser.getId());
+            examTask.updateInfo(sysUser.getId());
 
             String userId = userMap.get("userId");
             String specialty = userMap.get("specialty");
@@ -1359,6 +1358,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setCreateId(sysUser.getId());
             examTask.setReview(basicExamRule.getReview());
             examTask.setUserId(sysUser.getId());
+            examTask.updateInfo(sysUser.getId());
 
             examTask.setStatus(ExamStatusEnum.valueOf(examTaskDetail.getOperateType()));
             if (Objects.isNull(examTask.getFlowId())) {

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -836,7 +836,7 @@
     </sql>
 
     <select id="getFlowTaskReadyList" resultType="com.qmth.distributed.print.business.bean.result.WorkResult">
-          select
+          select * from(select
                 et.id,
                 et.school_id schoolId,
                 et.org_id as orgId,
@@ -855,7 +855,7 @@
                 et.end_time endTime,
                 tffa.status,
                 et.enable,
-                et.create_time createTime,
+                et.update_time createTime,
                 art.EXECUTION_ID_ as executionId,
                 et.flow_id as flowId,
                 art.NAME_ as taskName,
@@ -895,7 +895,7 @@
                 et.end_time endTime,
                 tffa.status,
                 et.enable,
-                et.create_time createTime,
+                et.update_time createTime,
                 art.EXECUTION_ID_ as executionId,
                 et.flow_id as flowId,
                 art.NAME_ as taskName,
@@ -939,7 +939,7 @@
                 et.end_time endTime,
                 et.flowStatus as status,
                 et.enable,
-                et.create_time createTime,
+                et.update_time createTime,
                 et.EXECUTION_ID_ as executionId,
                 et.flow_id as flowId,
                 et.NAME_ as taskName,
@@ -975,7 +975,7 @@
             left join basic_card_rule b ON
                 et.card_rule_id = b.id
             left join sys_user c ON
-                et.userId = c.id
+                et.userId = c.id) t order by t.createTime desc
     </select>
 
     <select id="findFlowIdToMySelf" resultType="java.lang.Long">