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

@@ -179,28 +179,23 @@ public class LesJointInspectionTaskServiceImpl extends ServiceImpl<LesJointInspe
     private void audit(LesJointInspectionTask lesJointInspectionTask) {
         // 状态 0：保存状态；1：发布（申请中）；2：审核通过；3：驳回
         Integer status = lesJointInspectionTask.getStatus();
-        // 直接提交
-        if (StringUtils.isEmpty(lesJointInspectionTask.getId()) && 1 == status) {
-            // 添加审批(状态 0：待审核；1：已审核；2：驳回)
-            AuditRequest request = this.addAuditRequest(lesJointInspectionTask);
-            // 添加审批流程记录
-            this.addAuditRecord(lesJointInspectionTask, request.getId(), 0);
-        } else {
-            if (1 == status) {
-                // 判断驳回在提交
-                if (StringUtils.isEmpty(lesJointInspectionTask.getId())) {
-                    // 添加审批(状态 0：待审核；1：已审核；2：驳回)
-                    AuditRequest request = this.addAuditRequest(lesJointInspectionTask);
-                    // 添加审批流程记录
-                    this.addAuditRecord(lesJointInspectionTask, request.getId(), 0);
-                } else {
-                    this.editAuditRequest(lesJointInspectionTask, 0);
-                }
-            } else if (2 == status) {
-                this.editAuditRequest(lesJointInspectionTask, 1);
-            } else if (3 == status) {
-                this.editAuditRequest(lesJointInspectionTask, 2);
+        if (1 == status) {
+            // 判断驳回在提交
+            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);
+                // 添加审批流程记录
+                this.addAuditRecord(lesJointInspectionTask, request.getId(), 0);
+            } else {
+                this.editAuditRequest(lesJointInspectionTask, 0);
             }
+        } else if (2 == status) {
+            this.editAuditRequest(lesJointInspectionTask, 1);
+        } else if (3 == status) {
+            this.editAuditRequest(lesJointInspectionTask, 2);
         }
     }
 
@@ -212,9 +207,9 @@ public class LesJointInspectionTaskServiceImpl extends ServiceImpl<LesJointInspe
         request.setRequestId(lesJointInspectionTask.getId());
         // 状态 0：待审核；1：已审核；2：驳回
         request.setAuditStatus(0);
-        request.setAuditAdvice(lesJointInspectionTask.getAuditAdvice());
+        /*request.setAuditAdvice(lesJointInspectionTask.getAuditAdvice());
         request.setAuditUserId(lesJointInspectionTask.getAuditUserId());
-        request.setAuditTime(new Date());
+        request.setAuditTime(new Date());*/
         auditRequestMapper.insert(request);
         return request;
     }
@@ -242,6 +237,7 @@ public class LesJointInspectionTaskServiceImpl extends ServiceImpl<LesJointInspe
         request.setAuditStatus(status);
         request.setAuditAdvice(lesJointInspectionTask.getAuditAdvice());
         request.setAuditUserId(lesJointInspectionTask.getAuditUserId());
+        request.setAuditTime(new Date());
         auditRequestMapper.update(request, wrapper);
 
         // 新增流程记录