Преглед на файлове

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

adminGRP преди 3 месеца
родител
ревизия
1c398587e6

+ 6 - 1
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
42
 import com.unis.lawEnforcementSupervision.modular.lesJointInspectionTask.service.LesJointInspectionTaskService;
42
 import com.unis.lawEnforcementSupervision.modular.lesJointInspectionTask.service.LesJointInspectionTaskService;
43
 
43
 
44
 import javax.annotation.Resource;
44
 import javax.annotation.Resource;
45
+import java.util.Date;
45
 import java.util.List;
46
 import java.util.List;
46
 
47
 
47
 /**
48
 /**
@@ -180,7 +181,10 @@ public class LesJointInspectionTaskServiceImpl extends ServiceImpl<LesJointInspe
180
         Integer status = lesJointInspectionTask.getStatus();
181
         Integer status = lesJointInspectionTask.getStatus();
181
         if (1 == status) {
182
         if (1 == status) {
182
             // 判断驳回在提交
183
             // 判断驳回在提交
183
-            if (StringUtils.isEmpty(lesJointInspectionTask.getId())) {
184
+            QueryWrapper<AuditRequest> wrapper = new QueryWrapper<>();
185
+            wrapper.lambda().eq(AuditRequest::getRequestId, lesJointInspectionTask.getId());
186
+            AuditRequest request1 = auditRequestMapper.selectOne(wrapper);
187
+            if (ObjectUtils.isEmpty(request1)) {
184
                 // 添加审批(状态 0:待审核;1:已审核;2:驳回)
188
                 // 添加审批(状态 0:待审核;1:已审核;2:驳回)
185
                 AuditRequest request = this.addAuditRequest(lesJointInspectionTask);
189
                 AuditRequest request = this.addAuditRequest(lesJointInspectionTask);
186
                 // 添加审批流程记录
190
                 // 添加审批流程记录
@@ -205,6 +209,7 @@ public class LesJointInspectionTaskServiceImpl extends ServiceImpl<LesJointInspe
205
         request.setAuditStatus(0);
209
         request.setAuditStatus(0);
206
         request.setAuditAdvice(lesJointInspectionTask.getAuditAdvice());
210
         request.setAuditAdvice(lesJointInspectionTask.getAuditAdvice());
207
         request.setAuditUserId(lesJointInspectionTask.getAuditUserId());
211
         request.setAuditUserId(lesJointInspectionTask.getAuditUserId());
212
+        request.setAuditTime(new Date());
208
         auditRequestMapper.insert(request);
213
         auditRequestMapper.insert(request);
209
         return request;
214
         return request;
210
     }
215
     }