内部报验功能-执行/发起

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

@@ -2,6 +2,7 @@ package com.rongwei.bscommon.sys.service;
 
 import com.rongwei.bsentity.domain.ZhcxInsideInspectionDispatchDo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ZhcxInsideInspectionDo;
 
 /**
  * <p>
@@ -16,7 +17,7 @@ public interface ZhcxInsideInspectionDispatchService extends IService<ZhcxInside
     /**
      * 生成空派单
      *
-     * @param insideId
+     * @param inspectionDo
      */
-    void genEmptyDispatch(String insideId);
+    void genDispatch(ZhcxInsideInspectionDo inspectionDo);
 }

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

@@ -1,11 +1,13 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.rongwei.bsentity.domain.ZhcxInsideInspectionDispatchDo;
 import com.rongwei.bscommon.sys.dao.ZhcxInsideInspectionDispatchDao;
 import com.rongwei.bscommon.sys.service.ZhcxInsideInspectionDispatchService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bsentity.domain.ZhcxInsideInspectionDo;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import org.springframework.stereotype.Service;
 
@@ -23,25 +25,37 @@ public class ZhcxInsideInspectionDispatchServiceImpl extends ServiceImpl<ZhcxIns
     /**
      * 生成空派单
      *
-     * @param insideId
+     * @param inspectionDo
      */
     @Override
-    public void genEmptyDispatch(String insideId) {
+    public void genDispatch(ZhcxInsideInspectionDo inspectionDo) {
 
         //已经存在不重复生成
         LambdaQueryWrapper<ZhcxInsideInspectionDispatchDo> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(ZhcxInsideInspectionDispatchDo::getInsideid, insideId);
+        queryWrapper.eq(ZhcxInsideInspectionDispatchDo::getInsideid, inspectionDo.getId());
         queryWrapper.eq(ZhcxInsideInspectionDispatchDo::getDeleted, "0");
         int count = count(queryWrapper);
         if(count > 0) {
             return ;
         }
 
-        //生成空派单
+        //生成派单信息
         ZhcxInsideInspectionDispatchDo dispatchDo = new ZhcxInsideInspectionDispatchDo();
         dispatchDo.setId(SecurityUtil.getUUID());
         dispatchDo.setDeleted("0");
-        dispatchDo.setInsideid(insideId);
+        dispatchDo.setInsideid(inspectionDo.getId());
+
+        //存在派单
+        if(ObjectUtil.isNotEmpty(inspectionDo.getCheckerid())) {
+            dispatchDo.setSupervisionid(inspectionDo.getCheckerid());
+            dispatchDo.setSupervision(inspectionDo.getCheckername());
+            dispatchDo.setSupervisionphone(inspectionDo.getCheckercontact());
+            dispatchDo.setDispatchstatus("20");
+        } else {
+            dispatchDo.setDispatchstatus("10");
+        }
+
+
         save(dispatchDo);
     }
 }

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

@@ -67,9 +67,9 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
     public void launch(InsideInspectionOperRequest req) {
         ZhcxInsideInspectionDo inspectionDo = getById(req.getId());
         //生成报验单号
-        genInspectionCode(inspectionDo);
+        updateInspection(inspectionDo);
         //生成空派单信息
-        dispatchService.genEmptyDispatch(req.getId());
+        dispatchService.genDispatch(inspectionDo);
 
         //生成操作记录
         SysUserVo user = zhcxCommon.getCurrentUser();
@@ -92,7 +92,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
     public void cancel(InsideInspectionCancelDto dto) {
 
         if(ObjectUtil.isEmpty(dto.getInsideIdList())) {
-            return ;
+            throw  new CustomException("请联系管理员，暂无报验单");
         }
 
         OperDto operDto = getOper();
@@ -129,7 +129,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
     @Override
     public void dispatch(InsideInspectionDispatchRequest dto) {
         if(ObjectUtil.isEmpty(dto.getInsideIdList())) {
-            return ;
+            throw  new CustomException("请联系管理员，暂无报验单");
         }
 
         OperDto operDto = getOper();
@@ -188,7 +188,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
     @Override
     public void execute(InsideInspectionExecuteRequest req) {
         if(ObjectUtil.isEmpty(req.getInsideIdList())) {
-            return ;
+            throw  new CustomException("请联系管理员，暂无报验单");
         }
 
         OperDto operDto = getOper();
@@ -224,13 +224,11 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
 
             //报验单
             ZhcxInsideInspectionDo inspection = new ZhcxInsideInspectionDo();
-            inspection.setInspectioncode(insideId);
+            inspection.setId(insideId);
             inspection.setInspectionstatus("30");
-
             if(ObjectUtil.isNull(inOper.getInspection().getInspectioncomplatetime())) {
                 inspection.setInspectioncomplatetime(new Date());
             }
-
             inspectionList.add(inspection);
         }
 
@@ -352,7 +350,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
      *
      * @param inspectionDo
      */
-    private void genInspectionCode(ZhcxInsideInspectionDo inspectionDo) {
+    private void updateInspection(ZhcxInsideInspectionDo inspectionDo) {
         //存在报验单号，则不再生成
         if(ObjectUtil.isNotEmpty(inspectionDo.getInspectioncode())) {
             return ;