Merge branch 'nt-by-master' of http://192.168.0.43:8086/zh_bs/quality-inspection into nt-by-master

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

@@ -446,6 +446,9 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             ZhcxInsideInspectionDo inside = new ZhcxInsideInspectionDo();
             inside.setId(insideId);
             inside.setInspectionstatus("40");
+            //取消的时候清空
+            inside.setCheckername("");
+
             inspectionList.add(inside);
 
             NotifyDto notify = getMailInfo4Cancel(inOper, req);

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

@@ -376,6 +376,11 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                 }
                 dispatchDo.setRefusereason(vo.get(i).getReason());
                 dispatchDo.setDispatchstatus("30");
+
+                //取消的时候清空
+                dispatchDo.setSignature("");
+                dispatchDo.setSupervision("");
+
                 inspectionItpDo.setInspectionstatus("40");
 
                 //添加项目各机号报验点状态