Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/supervision/config/MyMetaObjectHandler.java

@@ -1,14 +1,16 @@
 package com.supervision.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.supervision.police.dto.user.UserInfoDTO;
+import com.supervision.utils.UserUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
-
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * @author Ray
  */
+@Slf4j
 public class MyMetaObjectHandler implements MetaObjectHandler {
     public MyMetaObjectHandler() {
     }
@@ -17,11 +19,30 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
     public void insertFill(MetaObject metaObject) {
         this.setFieldValByName("createTime", LocalDateTime.now(), metaObject);
         this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
+        if (null == this.getFieldValByName("createUserId", metaObject)){
+            // 只有为空才会继续创建
+            try {
+                UserInfoDTO user = UserUtil.getUser();
+                this.setFieldValByName("createUserId", user.getId(), metaObject);
+            }catch (Exception e){
+                log.info("获取用户信息失败");
+            }
+        }
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
         this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
+
+        if (null == this.getFieldValByName("updateUserId", metaObject)){
+            // 只有为空才会继续创建
+            try {
+                UserInfoDTO user = UserUtil.getUser();
+                this.setFieldValByName("updateUserId", user.getId(), metaObject);
+            }catch (Exception e){
+                log.info("获取用户信息失败");
+            }
+        }
     }
 
 }

src/main/java/com/supervision/police/domain/TaskRecord.java

@@ -61,11 +61,12 @@ public class TaskRecord implements Serializable {
     /**
      * 取消时间
      */
-    private Date cancelTime;
+    private LocalDateTime cancelTime;
 
     /**
      * 创建人ID
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createUserId;
 
     /**
@@ -77,6 +78,7 @@ public class TaskRecord implements Serializable {
     /**
      * 更新人ID
      */
+    @TableField(fill = FieldFill.UPDATE)
     private String updateUserId;
 
     /**

src/main/java/com/supervision/police/service/impl/MroServiceImpl.java

@@ -28,12 +28,12 @@ public class MroServiceImpl implements MroService {
 
     private final ModelService modelService;
 
-    private final TaskCaseRecordService caseRecordService;
 
     @Override
     public IPage<CaseProcessDTO> queryCaseList(CaseProcessReqVO caseProcessReqVO, Integer page, Integer size) {
 
         Page<ModelCase> paged = modelCaseService.lambdaQuery()
+                .eq(ModelCase::getDataStatus, "1")
                 .like(StrUtil.isNotEmpty(caseProcessReqVO.getCaseName()), ModelCase::getCaseName, caseProcessReqVO.getCaseName())
                 .in(CollUtil.isNotEmpty(caseProcessReqVO.getIdentifyResult()), ModelCase::getIdentifyResult, caseProcessReqVO.getIdentifyResult())
                 .in(CollUtil.isNotEmpty(caseProcessReqVO.getAnalysisStatus()), ModelCase::getCaseAnalysisStatus, caseProcessReqVO.getAnalysisStatus())

src/main/java/com/supervision/police/service/impl/TaskRecordServiceImpl.java

@@ -216,7 +216,7 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
     @Override
     public Boolean taskStatusCancelEnabled(String status) {
 
-        return StrUtil.equalsAny(status, TaskRecordConstants.TASK_STATUS_WAITING);
+        return StrUtil.equalsAny(status, TaskRecordConstants.TASK_STATUS_WAITING, TaskRecordConstants.TASK_STATUS_PROCESSING);
     }
 
     @Override
@@ -238,10 +238,11 @@ public class TaskRecordServiceImpl extends ServiceImpl<TaskRecordMapper, TaskRec
         }
         Assert.isTrue(CollUtil.isEmpty(list), "取消任务失败，存在不可取消的任务");
 
-        super.lambdaUpdate()
+        for (TaskRecord taskRecord : taskRecords) {
-                .set(TaskRecord::getStatus, TaskRecordConstants.TASK_STATUS_CANCELLING)
+            taskRecord.setStatus(TaskRecordConstants.TASK_STATUS_CANCELED);
-                .set(TaskRecord::getCancelTime, LocalDateTime.now())
+            taskRecord.setCancelTime(LocalDateTime.now());
-                .in(TaskRecord::getId, taskIds).update();
+            super.updateById(taskRecord);
+        }
     }
 
     @Override

src/main/resources/mapper/TaskRecordMapper.xml

@@ -35,10 +35,10 @@
                t.create_time as createTime,
                t.cancel_time as cancelTime,
                t.create_user_id as createUserId,
-               p.name as createUserName
+               su.user_name as createUserName
         from task_record t
                  left join model_case c on t.case_id = c.id
-                 left join case_person p on t.create_user_id = p.id
+                 left join system_user su on t.create_user_id = su.id
         <where>
             <if test="taskInfo.caseName != null and taskInfo.caseName != ''">
                 and c.case_name like concat('%',#{taskInfo.caseName},'%')