外部报验功能-改派异常

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxOutsideInspectionItpSupervisionDispatchDao.java

@@ -21,6 +21,10 @@ public interface ZhcxOutsideInspectionItpSupervisionDispatchDao extends BaseMapp
      *
      * @param entity
      */
-    @Update("update INCONTROL.ZHCX_OUTSIDE_INSPECTION_ITP_SUPERVISION_DISPATCH set DISPATCHSTATUS = '10', CANCELTYPE = '', CANCELREASON = '', INSPECTIONCONCLUSION = '',REFUSEREASON='',SUPERVISIONUSERID = '',SUPERVISIONID = '',SUPERVISIONACCOUNT = '',SUPERVISION = '',SUPERVISIONPHONE = '',CHECKSTARTTIME = '', CHECKENDTIME = '' where ID = #{id}")
+    @Update("update INCONTROL.ZHCX_OUTSIDE_INSPECTION_ITP_SUPERVISION_DISPATCH " +
+            "set SFILES = '', CANVAS = '', SIGNATURE = '', DISPATCHSTATUS = '10', CANCELTYPE = '', CANCELREASON = '', " +
+            "INSPECTIONCONCLUSION = '',REFUSEREASON='',SUPERVISIONUSERID = '',SUPERVISIONID = '',SUPERVISIONACCOUNT = ''," +
+            "SUPERVISION = '',SUPERVISIONPHONE = '',CHECKSTARTTIME = '', CHECKENDTIME = '' " +
+            "where ID = #{id}")
     void reInspection(ZhcxOutsideInspectionItpSupervisionDispatchDo entity);
 }

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

@@ -2,9 +2,7 @@ package com.rongwei.bscommon.sys.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bscommon.sys.utils.ZhcxCommon;
@@ -26,7 +24,6 @@ import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -222,12 +219,13 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                 dispatchDo.setSupervision(supervisionVo.getName());
                 dispatchDo.setSupervisionphone(supervisionVo.getPhone());
                 dispatchDo.setSupervisionaccount(supervisionVo.getAccount());
+                dispatchDo.setSupervisionuserid(supervisionVo.getSupervisionuserid());
                 /* 已派单 */
                 dispatchDo.setDispatchstatus("20");
             } else {
                 /* 接收/有条件接收 */
                 //不是本人的数据无法接收 Inspectionstatus=40代表取消
-                if(!dispatchDo.getSupervisionid().equals(user.getId())){
+                if(!dispatchDo.getSupervisionuserid().equals(user.getId())){
                     sb.append("单据号:"+inspectioncode+"已被改派,不能接收,请刷新数据查看</br>");
                 }
                 if("40".equals(inspectionItpDo.getInspectionstatus())){

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxOutsideInspectionItpSupervisionDispatchDo.java

@@ -120,4 +120,7 @@ public class ZhcxOutsideInspectionItpSupervisionDispatchDo extends BaseDo {
      */
     @TableField("LASTREFUSEREASON")
     private String lastrefusereason;
+
+    @TableField("SUPERVISIONUSERID")
+    private String supervisionuserid;
 }

business-entity/src/main/java/com/rongwei/bsentity/vo/SupervisionVo.java

@@ -20,4 +20,9 @@ public class SupervisionVo {
      * 监理用户账号
      */
     private String account;
+
+    /**
+     * 建立用户userid（用户表id）
+     */
+    private String supervisionuserid;
 }