安全检查登记调试

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -304,6 +304,12 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             throw new ServiceException("被检机构不存在");
         }
 
+        if (baseMapper.selectCount(new LambdaQueryWrapper<CoreSafetyTask>()
+                .eq(CoreSafetyTask::getId, data.getId())
+                .eq(CoreSafetyTask::getDoneStatus, SafetyCheckTaskStatus.Completed.getValue())) > 0) {
+            throw new ServiceException("任务已完成");
+        }
+
         removeExistData(data.getId());
 
         List<CoreSafetyTaskData> points = new ArrayList();
@@ -347,7 +353,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
     }
 
     private CoreSafetyTaskData dataVoToDomain(TaskRegisterVo task, AppTaskRegisterPointVo pointVo) {
-        if (ObjectUtil.equal(task.getIsSubmit(), 1)) {
+        if (ObjectUtil.equal(task.getIsSubmit(), 1) && ObjectUtil.equal(pointVo.getStatus(), 1)) {
             if (StringUtils.isEmpty(pointVo.getRemark())) {
                 throw new ServiceException("检查内容【" + pointVo.getPointName() + "】的情况描述未填写");
             }
@@ -422,7 +428,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
     private boolean updateTask(TaskRegisterVo data, Integer exceptionCount) {
         LambdaUpdateWrapper<CoreSafetyTask> taskUpdateWraper = new LambdaUpdateWrapper();
         taskUpdateWraper.eq(CoreSafetyTask::getId, data.getId())
-                .set(CoreSafetyTask::getStatus, ObjectUtil.equal(data.getIsSubmit(), 0) ? SafetyCheckTaskStatus.UnderWay.getValue() : SafetyCheckTaskStatus.Completed.getValue())
+                .set(CoreSafetyTask::getDoneStatus, ObjectUtil.equal(data.getIsSubmit(), 0) ? SafetyCheckTaskStatus.UnderWay.getValue() : SafetyCheckTaskStatus.Completed.getValue())
                 .set(CoreSafetyTask::getSubmitTime, new Date())
                 .set(CoreSafetyTask::getSubmitorId, SecurityUtils.getUserId())
                 .set(CoreSafetyTask::getSubmitBy, SecurityUtils.getLoginUser().getName())

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -473,6 +473,9 @@
         <if test="info.username != null and info.username != ''">
             AND u.username like concat('%', #{info.username}, '%')
         </if>
+        <if test="info.name != null and info.name != ''">
+            AND u.name like concat('%', #{info.name}, '%')
+        </if>
         <if test="info.params.beginTime != null and info.params.beginTime != ''">
             <!-- 开始时间检索 -->
             AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{info.params.beginTime},'%y%m%d')