外部报验功能-提醒

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpServiceImpl.java

@@ -275,7 +275,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                 /* 检验员才有拒收 */
                 dispatchDo.setInspectionconclusion("20");
                 dispatchDo.setRefusereason(vo.get(i).getReason());
-                dispatchDo.setLastrefusereason(vo.get(i).getReason());
+//                dispatchDo.setLastrefusereason(vo.get(i).getReason());
                 inspectionItpDo.setInspectionstatus("30");
 
                 //完成时间，取首次提交时间
@@ -377,18 +377,18 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
 
         log.info("邮件发送", JSONUtil.toJsonStr(notifyDtoList));
         //邮件发送
-        if(ObjectUtil.isNotEmpty(notifyDtoList)) {
-            for(NotifyDto notifyDto : notifyDtoList) {
-                MailDo mainDo = new MailDo();
-                mainDo.setSubject(notifyDto.getSubject());
-                mainDo.setContent(notifyDto.getContent());
-                mainDo.setOperationtype("10");
-                mainDo.setCcEmail(new String[]{});
-                mainDo.setNeedTransReceive(true);
-                mainDo.setReceiveEmail(notifyDto.getReceiverIds().stream().toArray(String[]::new));
-                notifyFeginService.sendHtmlMail(mainDo);
-            }
-        }
+//        if(ObjectUtil.isNotEmpty(notifyDtoList)) {
+//            for(NotifyDto notifyDto : notifyDtoList) {
+//                MailDo mainDo = new MailDo();
+//                mainDo.setSubject(notifyDto.getSubject());
+//                mainDo.setContent(notifyDto.getContent());
+//                mainDo.setOperationtype("10");
+//                mainDo.setCcEmail(new String[]{});
+//                mainDo.setNeedTransReceive(true);
+//                mainDo.setReceiveEmail(notifyDto.getReceiverIds().stream().toArray(String[]::new));
+//                notifyFeginService.sendHtmlMail(mainDo);
+//            }
+//        }
 
         return R.ok();
     }
@@ -434,8 +434,13 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
         map.put("id", id);
         dao.updateInspectionCount(map);
 
-        //更新
-        dispatchService.reInspection(dispatchDo.getId(), dispatchDo.getRefusereason());
+        if(ObjectUtil.isNotEmpty(dispatchDo.getInspectionconclusion()) && "20".equals(dispatchDo.getInspectionconclusion())) {
+            //更新
+            dispatchService.reInspection(dispatchDo.getId(), dispatchDo.getRefusereason());
+        } else {
+            dispatchService.reInspection(dispatchDo.getId(), null);
+        }
+
     }
 
     /**

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpSupervisionDispatchServiceImpl.java

@@ -42,8 +42,9 @@ public class ZhcxOutsideInspectionItpSupervisionDispatchServiceImpl extends Serv
         }
 
         //上次拒收原因
-        ZhcxOutsideInspectionItpSupervisionDispatchDo entity = new ZhcxOutsideInspectionItpSupervisionDispatchDo();
+        ZhcxOutsideInspectionItpSupervisionDispatchDo entity;
         if(ObjectUtil.isNotEmpty(refuseReason)) {
+            entity = new ZhcxOutsideInspectionItpSupervisionDispatchDo();
             entity.setId(id);
             entity.setLastrefusereason(refuseReason);
             updateById(entity);