Merge branch 'dev-2.18.0' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/lawEnforcementSupervision/modular/lesJointInspectionTask/service/impl/LesJointInspectionTaskServiceImpl.java

@@ -42,6 +42,7 @@ import com.unis.lawEnforcementSupervision.modular.lesJointInspectionTask.param.L
 import com.unis.lawEnforcementSupervision.modular.lesJointInspectionTask.service.LesJointInspectionTaskService;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -180,7 +181,10 @@ public class LesJointInspectionTaskServiceImpl extends ServiceImpl<LesJointInspe
         Integer status = lesJointInspectionTask.getStatus();
         if (1 == status) {
             // 判断驳回在提交
-            if (StringUtils.isEmpty(lesJointInspectionTask.getId())) {
+            QueryWrapper<AuditRequest> wrapper = new QueryWrapper<>();
+            wrapper.lambda().eq(AuditRequest::getRequestId, lesJointInspectionTask.getId());
+            AuditRequest request1 = auditRequestMapper.selectOne(wrapper);
+            if (ObjectUtils.isEmpty(request1)) {
                 // 添加审批(状态 0：待审核；1：已审核；2：驳回)
                 AuditRequest request = this.addAuditRequest(lesJointInspectionTask);
                 // 添加审批流程记录
@@ -205,6 +209,7 @@ public class LesJointInspectionTaskServiceImpl extends ServiceImpl<LesJointInspe
         request.setAuditStatus(0);
         request.setAuditAdvice(lesJointInspectionTask.getAuditAdvice());
         request.setAuditUserId(lesJointInspectionTask.getAuditUserId());
+        request.setAuditTime(new Date());
         auditRequestMapper.insert(request);
         return request;
     }