内部报验功能-重新报验

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

@@ -21,7 +21,7 @@ public interface ZhcxInsideInspectionDispatchDao extends BaseMapper<ZhcxInsideIn
      */
     @Update("update INCONTROL.ZHCX_INSIDE_INSPECTION_DISPATCH " +
             "set SFILES = '', CANVAS = '', SIGNATURE = '', DISPATCHSTATUS = '10', CANCELTYPE = '', CANCELREASON = '', " +
-            "INSPECTIONCONCLUSION = '',REFUSEREASON='',SUPERVISIONUSERID = '',SUPERVISIONID = '',SUPERVISIONACCOUNT = ''," +
+            "INSPECTIONCONCLUSION = '',REFUSEREASON='',SUPERVISIONID = ''," +
             "SUPERVISION = '',SUPERVISIONPHONE = '',CHECKSTARTTIME = '', CHECKENDTIME = '' " +
             "where ID = #{id}")
     void reInspection(ZhcxInsideInspectionDispatchDo entity);

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

@@ -17,6 +17,6 @@ import java.util.Map;
 public interface ZhcxInsideInspectionOperLogDao extends BaseMapper<ZhcxInsideInspectionOperLogDo> {
 
     @Insert("INSERT INTO INCONTROL.ZHCX_INSIDE_INSPECTION_OPER_LOG(ID,TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,INSIDEID,OPERTYPE,OPERDESCRIPTION,OPERSOURCE,OPERTIME, OPERUSERID, OPERUSERNAME) " +
-            "SELECT guid(),TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,#{newItpId},OPERTYPE,OPERDESCRIPTION,OPERSOURCE,OPERTIME, OPERUSERID, OPERUSERNAME FROM INCONTROL.ZHCX_INSIDE_INSPECTION_OPER_LOG WHERE ITPID = #{itpId}")
+            "SELECT guid(),TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,#{newItpId},OPERTYPE,OPERDESCRIPTION,OPERSOURCE,OPERTIME, OPERUSERID, OPERUSERNAME FROM INCONTROL.ZHCX_INSIDE_INSPECTION_OPER_LOG WHERE INSIDEID = #{itpId}")
     int insertBySelect(Map<String, String> map);
 }

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

@@ -28,6 +28,7 @@ import com.rongwei.rwcommon.vo.generalsql.MasterSlaveUpdateVo;
 import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -323,6 +324,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
      * @param req
      */
     @Override
+    @Transactional
     public void reInspection(InsideInspectionReInspectionRequest req) {
         if(ObjectUtil.isEmpty(req.getInsideIdList())) {
             throw  new CustomException("请联系管理员，暂无报验单");