Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 外部报验-ITP报验 Mapper 接口
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+public interface ZhcxOutsideInspectionItpDao extends BaseMapper<ZhcxOutsideInspectionItpDo> {
+
+}

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

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpNdtResultDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.rwadmincommon.system.domain.SysUserRoleDo;
+import org.apache.ibatis.annotations.Insert;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-无损探伤检测内容和结算 Mapper 接口
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+public interface ZhcxOutsideInspectionItpNdtResultDao extends BaseMapper<ZhcxOutsideInspectionItpNdtResultDo> {
+
+    @Insert("INSERT INTO INCONTROL.ZHCX_OUTSIDE_INSPECTION_ITP_QC_ITEM_RESULT(ID,TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,ITPID,QCITEMID,CHECKTYPE,CHECKITEM,CHECKRESULT) " +
+            "SELECT guid(),TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,#{newItpId},QCITEMID,CHECKTYPE,CHECKITEM,CHECKRESULT FROM INCONTROL.ZHCX_OUTSIDE_INSPECTION_ITP_QC_ITEM_RESULT WHERE ITPID = #{itpId}")
+    int insertBySelect(Map<String, String> map);
+}

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

@@ -0,0 +1,22 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpQcItemResultDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-QC检查内容和结论 Mapper 接口
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+public interface ZhcxOutsideInspectionItpQcItemResultDao extends BaseMapper<ZhcxOutsideInspectionItpQcItemResultDo> {
+
+    @Insert("INSERT INTO INCONTROL.ZHCX_OUTSIDE_INSPECTION_ITP_NDT_RESULT(ID,TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE,ITPID,NDTID,CHECKTYPE,CHECKER,CHECKRESULT) " +
+            "SELECT guid(),TENANTID,ROPTION,DELETED,REMARK,CREATEUSERID,CREATEUSERNAME,CREATEDATE,MODIFYUSERID,MODIFYUSERNAME,MODIFYDATE, #{newItpId},NDTID,CHECKTYPE,CHECKER,CHECKRESULT FROM INCONTROL.ZHCX_OUTSIDE_INSPECTION_ITP_NDT_RESULT WHERE ITPID = #{itpId}")
+    int insertBySelect(Map<String, String> map);
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpSupervisionDispatchDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-监理派单 Mapper 接口
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+public interface ZhcxOutsideInspectionItpSupervisionDispatchDao extends BaseMapper<ZhcxOutsideInspectionItpSupervisionDispatchDo> {
+
+}

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

@@ -5,12 +5,14 @@ import com.rongwei.rwadmincommon.system.domain.SysUserRoleDo;
 import com.rongwei.rwcommon.base.BaseDao;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Map;
 
 /**
  * @author zhuang
  */
+@Mapper
 public interface ZhcxSubcontractorUserDao extends BaseDao<SysUserDo> {
 
     @Delete("DELETE FROM INCONTROL.SYS_USER_ROLE WHERE USERID = #{userid}")

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

@@ -0,0 +1,27 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpDo;
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpNdtResultDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-无损探伤检测内容和结算 服务类
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+public interface ZhcxOutsideInspectionItpNdtResultService extends IService<ZhcxOutsideInspectionItpNdtResultDo> {
+
+    /**
+     * 复制itp下无损探伤
+     *
+     * @param itpId
+     * @param newItpIdList
+     */
+    void copyByItpId(String itpId, List<String> newItpIdList);
+
+}

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

@@ -0,0 +1,24 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpQcItemResultDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-QC检查内容和结论 服务类
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+public interface ZhcxOutsideInspectionItpQcItemResultService extends IService<ZhcxOutsideInspectionItpQcItemResultDo> {
+    /**
+     * 复制itp下qc
+     *
+     * @param itpId
+     * @param newItpIdList
+     */
+    void copyByItpId(String itpId, List<String> newItpIdList);
+}

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

@@ -0,0 +1,22 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 外部报验-ITP报验 服务类
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+public interface ZhcxOutsideInspectionItpService extends IService<ZhcxOutsideInspectionItpDo> {
+
+    /**
+     * 拆单
+     *
+     * @param id
+     */
+    void splitOrder(String id);
+}

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

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpSupervisionDispatchDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-监理派单 服务类
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+public interface ZhcxOutsideInspectionItpSupervisionDispatchService extends IService<ZhcxOutsideInspectionItpSupervisionDispatchDo> {
+
+}

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

@@ -16,5 +16,5 @@ public interface ZhcxSubcontractorUserService extends IService<SysUserDo> {
 
     void batchSaveList(SubcontractorUserVo subcontractorUserVo);
 
-    R saveOrUpdate(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid);
+    R saveOrUpdate(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid,String opertionType);
 }

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

@@ -0,0 +1,49 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpNdtResultDo;
+import com.rongwei.bscommon.sys.dao.ZhcxOutsideInspectionItpNdtResultDao;
+import com.rongwei.bscommon.sys.service.ZhcxOutsideInspectionItpNdtResultService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-无损探伤检测内容和结算 服务实现类
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@Service
+public class ZhcxOutsideInspectionItpNdtResultServiceImpl extends ServiceImpl<ZhcxOutsideInspectionItpNdtResultDao, ZhcxOutsideInspectionItpNdtResultDo> implements ZhcxOutsideInspectionItpNdtResultService {
+
+    @Autowired
+    private ZhcxOutsideInspectionItpNdtResultDao dao;
+
+    /**
+     * 复制itp下无损探伤
+     *
+     * @param itpId
+     * @param newItpIdList
+     */
+    @Override
+    public void copyByItpId(String itpId, List<String> newItpIdList) {
+
+        if(ObjectUtil.isEmpty(newItpIdList)) {
+            return ;
+        }
+
+        for(String newItpId : newItpIdList) {
+            Map<String, String> map = new HashMap<>();
+            map.put("itpId", itpId);
+            map.put("newItpId", newItpId);
+            dao.insertBySelect(map);
+        }
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpQcItemResultDo;
+import com.rongwei.bscommon.sys.dao.ZhcxOutsideInspectionItpQcItemResultDao;
+import com.rongwei.bscommon.sys.service.ZhcxOutsideInspectionItpQcItemResultService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-QC检查内容和结论 服务实现类
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@Service
+public class ZhcxOutsideInspectionItpQcItemResultServiceImpl extends ServiceImpl<ZhcxOutsideInspectionItpQcItemResultDao, ZhcxOutsideInspectionItpQcItemResultDo> implements ZhcxOutsideInspectionItpQcItemResultService {
+
+    @Autowired
+    private ZhcxOutsideInspectionItpQcItemResultDao dao;
+
+    /**
+     * 复制itp下qc
+     *
+     * @param itpId
+     * @param newItpIdList
+     */
+    @Override
+    public void copyByItpId(String itpId, List<String> newItpIdList) {
+        if(ObjectUtil.isEmpty(newItpIdList)) {
+            return ;
+        }
+
+        for(String newItpId : newItpIdList) {
+            Map<String, String> map = new HashMap<>();
+            map.put("itpId", itpId);
+            map.put("newItpId", newItpId);
+            dao.insertBySelect(map);
+        }
+    }
+}

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

@@ -0,0 +1,112 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.rongwei.bscommon.sys.service.ZhcxOutsideInspectionItpNdtResultService;
+import com.rongwei.bscommon.sys.service.ZhcxOutsideInspectionItpQcItemResultService;
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpDo;
+import com.rongwei.bscommon.sys.dao.ZhcxOutsideInspectionItpDao;
+import com.rongwei.bscommon.sys.service.ZhcxOutsideInspectionItpService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.commonservice.serial.service.SysSerialNumberService;
+import com.rongwei.rwcommon.utils.SecurityUtil;
+import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 外部报验-ITP报验 服务实现类
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@Service
+public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutsideInspectionItpDao, ZhcxOutsideInspectionItpDo> implements ZhcxOutsideInspectionItpService {
+
+    @Autowired
+    private ZhcxOutsideInspectionItpNdtResultService itpNdtResultService;
+    @Autowired
+    private ZhcxOutsideInspectionItpQcItemResultService qcItemResultService;
+    @Autowired
+    private SysSerialNumberService serialNumberService;
+
+    /**
+     * 拆单
+     *
+     * @param id
+     */
+    @Override
+    public void splitOrder(String id) {
+        ZhcxOutsideInspectionItpDo itpDo = this.getById(id); //报验单
+
+        //构件
+        if(ObjectUtil.isEmpty(itpDo.getStructurename())) {
+            return ;
+        }
+
+        //报验点
+        if(ObjectUtil.isEmpty(itpDo.getInspectioncontent())) {
+            return ;
+        }
+
+        String[] structurNames = itpDo.getStructurename().split(","); //构件
+        String[] inspectionContents = itpDo.getInspectioncontent().split(","); //报验点
+
+        if(structurNames.length * inspectionContents.length <= 1) {
+            return ;
+        }
+
+        List<ZhcxOutsideInspectionItpDo> insertList = new ArrayList<>();
+        List<ZhcxOutsideInspectionItpDo> updateList = new ArrayList<>();
+        List<String> newItpIdList = new ArrayList<>();
+
+        int count = -1;
+        for(String structurName : structurNames) {
+            for(String inspectionContent : inspectionContents) {
+                count++;
+                SysSerialVo sysSerialVo = new SysSerialVo();
+                sysSerialVo.setRuleTemplateStr("W@{date:yyyyMMdd}@{serialNumber:#0000}");
+                sysSerialVo.setModulecode("ZHCX_OUTSIDE_INSPECTION_ITP_CODE");
+                sysSerialVo.setIfautomaticreset("y");
+                sysSerialVo.setResetrule("date:yyyyMMdd");
+                sysSerialVo.setInitValue(0L);
+                String code = serialNumberService.getCodeByTemplate(sysSerialVo);
+                if(count > 0) {
+                    itpDo.setStructurename(structurName);
+                    itpDo.setInspectioncontent(inspectionContent);
+                    itpDo.setInspectioncode(code);
+                    updateList.add(itpDo);
+                    continue;
+                }
+
+                ZhcxOutsideInspectionItpDo entity = new ZhcxOutsideInspectionItpDo();
+                BeanUtil.copyProperties(itpDo, entity);
+                entity.setStructurename(structurName);
+                entity.setInspectioncontent(inspectionContent);
+                entity.setId(SecurityUtil.getUUID());
+                entity.setInspectioncode(code);
+                insertList.add(entity);
+                newItpIdList.add(entity.getId());
+            }
+        }
+
+        //钢结构
+        if("10".equals(itpDo.getInspectiontype())) {
+            itpNdtResultService.copyByItpId(id, newItpIdList);
+        }
+        String[] array = {"10", "20", "30"};
+        List<String> qcTypeList = Arrays.asList(array);
+        if(qcTypeList.contains(itpDo.getInspectiontype())) {
+            qcItemResultService.copyByItpId(id, newItpIdList);
+        }
+
+        updateBatchById(updateList);
+        saveBatch(insertList);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bsentity.domain.ZhcxOutsideInspectionItpSupervisionDispatchDo;
+import com.rongwei.bscommon.sys.dao.ZhcxOutsideInspectionItpSupervisionDispatchDao;
+import com.rongwei.bscommon.sys.service.ZhcxOutsideInspectionItpSupervisionDispatchService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-监理派单 服务实现类
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@Service
+public class ZhcxOutsideInspectionItpSupervisionDispatchServiceImpl extends ServiceImpl<ZhcxOutsideInspectionItpSupervisionDispatchDao, ZhcxOutsideInspectionItpSupervisionDispatchDo> implements ZhcxOutsideInspectionItpSupervisionDispatchService {
+
+}

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

@@ -59,13 +59,13 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
                 String secPas = SecurityUtil.getSaltMd5AndSha(userVo.getPassword(), userVo.getId());
                 userVo.setPassword(secPas);
             }
-            R r = this.saveOrUpdate(userVo,currUser,roleid);
+            R r = this.saveOrUpdate(userVo,currUser,roleid,opertionType);
             SysUserDo user = this.getById(userVo.getId());
         }
     }
 
     @Override
-    public R saveOrUpdate(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid) {
+    public R saveOrUpdate(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid,String opertionType) {
         log.info("sysUser：" + sysUser);
 
         // 1.保存用户信息
@@ -85,7 +85,7 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
         //this.saveUserOrg(sysUser);
 
         // 3.保存用户角色
-        this.saveUserRole(sysUser,currUser,roleid);
+        this.saveUserRole(sysUser,currUser,roleid,opertionType);
 
         return R.ok();
     }
@@ -96,7 +96,7 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
      * @param sysUser
      * @param roleid
      */
-    private void saveUserRole(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid) {
+    private void saveUserRole(SubContractorBySysUserVo sysUser, SysUserVo currUser, String roleid,String opertionType) {
         // 先删除用户原有的角色
         String userId = sysUser.getId();
         Map<String, Object> params = new HashMap<>(5);
@@ -106,11 +106,20 @@ public class ZhcxSubcontractorUserServiceImpl extends BaseServiceImpl<ZhcxSubcon
         sysUserRoleDo.setUserid(userId);
         if (StringUtils.isBlank(sysUser.getRoleid())) {
             sysUserRoleDo.setRoleid(roleid);
+            SaveUserRoles(sysUser, currUser, sysUserRoleDo,opertionType);
         }else{
-            sysUserRoleDo.setRoleid(sysUser.getRoleid());
+            String[] split = sysUser.getRoleid().split(",");
+            for(String splitRoleId : split){
+                sysUserRoleDo.setRoleid(splitRoleId);
+                SaveUserRoles(sysUser, currUser, sysUserRoleDo,opertionType);
+            }
         }
+
+    }
+
+    private void SaveUserRoles(SubContractorBySysUserVo sysUser, SysUserVo currUser, SysUserRoleDo sysUserRoleDo,String opertionType) {
         sysUserRoleDo.setId(SecurityUtil.getUUID());
-        if (StringUtils.isBlank(sysUser.getPassword())) {
+        if ("insert".equals(opertionType)) {
             sysUserRoleDo.setCreatedate(new Date());
             sysUserRoleDo.setCreateuserid(currUser.getId());
             sysUserRoleDo.setCreateusername(currUser.getName());

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

@@ -0,0 +1,236 @@
+package com.rongwei.bsentity.domain;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 外部报验-ITP报验
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("zhcx_outside_inspection_itp")
+public class ZhcxOutsideInspectionItpDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId("ID")
+    private String id;
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展预留
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * 外部报验单号
+     */
+    @TableField("INSPECTIONCODE")
+    private String inspectioncode;
+    /**
+     * 报验类型
+     */
+    @TableField("INSPECTIONTYPE")
+    private String inspectiontype;
+    /**
+     * 项目id
+     */
+    @TableField("PROJECTID")
+    private String projectid;
+    /**
+     * 项目工号
+     */
+    @TableField("PROJECTCODE")
+    private String projectcode;
+    /**
+     * 项目名称
+     */
+    @TableField("PROJECTNAME")
+    private String projectname;
+    /**
+     * 监理客户管理id
+     */
+    @TableField("CUSTOMERMANAGEID")
+    private String customermanageid;
+    /**
+     * 监理客户要求id
+     */
+    @TableField("CUSTOMERREQUIREID")
+    private String customerrequireid;
+    /**
+     * 项目机号id
+     */
+    @TableField("PROJECTMACHINEID")
+    private String projectmachineid;
+    /**
+     * 机号
+     */
+    @TableField("MACHINENO")
+    private String machineno;
+    /**
+     * 递交
+     */
+    @TableField("COMPANYSHORTNAME")
+    private String companyshortname;
+    /**
+     * 构建Id
+     */
+    @TableField("STRUCTUREID")
+    private String structureid;
+    /**
+     * 构件名称
+     */
+    @TableField("STRUCTURENAME")
+    private String structurename;
+    /**
+     * 构件图号
+     */
+    @TableField("STRUCTUREDRAWING")
+    private String structuredrawing;
+    /**
+     * 报验内容id
+     */
+    @TableField("INSPECTIONCONTENTID")
+    private String inspectioncontentid;
+    /**
+     * 报验内容
+     */
+    @TableField("INSPECTIONCONTENT")
+    private String inspectioncontent;
+    /**
+     * 报验数量
+     */
+    @TableField("QTY")
+    private BigDecimal qty;
+    /**
+     * 检查地点id
+     */
+    @TableField("INSPECTIONLOCATIONID")
+    private String inspectionlocationid;
+    /**
+     * 检查地点
+     */
+    @TableField("INSPECTIONLOCATION")
+    private String inspectionlocation;
+    /**
+     * 预约报验时间
+     */
+    @TableField("RESERVATIONINSPECTIONTIME")
+    private Date reservationinspectiontime;
+    /**
+     * 分包商id
+     */
+    @TableField("SUBCONTRACTORID")
+    private String subcontractorid;
+    /**
+     * 分包商挂靠单位id
+     */
+    @TableField("SUBCONTRACTORUNITID")
+    private String subcontractorunitid;
+    /**
+     * 分包商/劳务班组
+     */
+    @TableField("SUBCONTRACTORNAME")
+    private String subcontractorname;
+    /**
+     * 车间id
+     */
+    @TableField("WORKSHOPID")
+    private String workshopid;
+    /**
+     * 车间
+     */
+    @TableField("WORKSHOPNAME")
+    private String workshopname;
+    /**
+     * 车间负责人id
+     */
+    @TableField("WORKSHOPMANAGERID")
+    private String workshopmanagerid;
+    /**
+     * 车间负责人
+     */
+    @TableField("WORKSHOPMANAGERNAME")
+    private String workshopmanagername;
+    /**
+     * 自检员
+     */
+    @TableField("SELFTESTER")
+    private String selftester;
+    /**
+     * 车间递交时间
+     */
+    @TableField("HANDINTIME")
+    private Date handintime;
+    /**
+     * 检验员id
+     */
+    @TableField("CHECKERID")
+    private String checkerid;
+    /**
+     * 检验员
+     */
+    @TableField("CHECKERNAME")
+    private String checkername;
+    /**
+     * 检验员结论
+     */
+    @TableField("CHECKERCONCLUSION")
+    private String checkerconclusion;
+    /**
+     * 检验员联系方式
+     */
+    @TableField("CHECKERCONTACT")
+    private String checkercontact;
+    /**
+     * 项目主管ID
+     */
+    @TableField("PMID")
+    private String pmid;
+    /**
+     * 项目主管
+     */
+    @TableField("PMNAME")
+    private String pmname;
+    /**
+     * 报验次数
+     */
+    @TableField("INSPECTIONCOUNT")
+    private Integer inspectioncount;
+    /**
+     * 报验单状态
+     */
+    @TableField("INSPECTIONSTATUS")
+    private String inspectionstatus;
+    /**
+     * 发起类型（itp、unitp）
+     */
+    @TableField("LAUNCHTYPE")
+    private String launchtype;
+    /**
+     * 附件
+     */
+    @TableField("FILES")
+    private String files;
+
+
+}

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

@@ -0,0 +1,70 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-无损探伤检测内容和结算
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("zhcx_outside_inspection_itp_ndt_result")
+public class ZhcxOutsideInspectionItpNdtResultDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId("ID")
+    private String id;
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展预留
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * ITP报验id
+     */
+    @TableField("ITPID")
+    private String itpid;
+    /**
+     * 无损探伤检测内容和结算id
+     */
+    @TableField("NDTID")
+    private String ndtid;
+    /**
+     * 检测类型
+     */
+    @TableField("CHECKTYPE")
+    private String checktype;
+    /**
+     * 检测人员
+     */
+    @TableField("CHECKER")
+    private String checker;
+    /**
+     * 结果
+     */
+    @TableField("CHECKRESULT")
+    private String checkresult;
+
+
+}

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

@@ -0,0 +1,69 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-QC检查内容和结论
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("zhcx_outside_inspection_itp_qc_item_result")
+public class ZhcxOutsideInspectionItpQcItemResultDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableField("ID")
+    private String id;
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展预留
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * ITP报验id
+     */
+    @TableField("ITPID")
+    private String itpid;
+    /**
+     * QC检查内容和结论ID
+     */
+    @TableField("QCITEMID")
+    private String qcitemid;
+    /**
+     * 检查类别
+     */
+    @TableField("CHECKTYPE")
+    private String checktype;
+    /**
+     * 检查项目
+     */
+    @TableField("CHECKITEM")
+    private String checkitem;
+    /**
+     * 结果
+     */
+    @TableField("CHECKRESULT")
+    private String checkresult;
+
+
+}

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

@@ -0,0 +1,110 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-监理派单
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("zhcx_outside_inspection_itp_supervision_dispatch")
+public class ZhcxOutsideInspectionItpSupervisionDispatchDo extends BaseDo {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId("ID")
+    private String id;
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+    /**
+     * 扩展预留
+     */
+    @TableField("ROPTION")
+    private String roption;
+    /**
+     * ITP报验id
+     */
+    @TableField("ITPID")
+    private String itpid;
+    /**
+     * 报验结论
+     */
+    @TableField("INSPECTIONCONCLUSION")
+    private String inspectionconclusion;
+    /**
+     * 监理用户ID
+     */
+    @TableField("SUPERVISIONID")
+    private String supervisionid;
+    /**
+     * 监理用户账号
+     */
+    @TableField("SUPERVISIONACCOUNT")
+    private String supervisionaccount;
+    /**
+     * 监理用户
+     */
+    @TableField("SUPERVISION")
+    private String supervision;
+    /**
+     * 监理电话
+     */
+    @TableField("SUPERVISIONPHONE")
+    private String supervisionphone;
+    /**
+     * 检验开始时间
+     */
+    @TableField("CHECKSTARTTIME")
+    private Date checkstarttime;
+    /**
+     * 检验结束时间
+     */
+    @TableField("CHECKENDTIME")
+    private Date checkendtime;
+    /**
+     * 派单状态
+     */
+    @TableField("DISPATCHSTATUS")
+    private String dispatchstatus;
+    /**
+     * 取消类型
+     */
+    @TableField("CANCELTYPE")
+    private String canceltype;
+    /**
+     * 取消原因
+     */
+    @TableField("CANCELREASON")
+    private String cancelreason;
+    /**
+     * 附件
+     */
+    @TableField("SFILES")
+    private String sfiles;
+    /**
+     * 拒绝原因
+     */
+    @TableField("REFUSEREASON")
+    private String refusereason;
+
+
+}

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxOutsideInspectionItpController.java

@@ -0,0 +1,36 @@
+package com.rongwei.bsserver.controller;
+
+
+import com.rongwei.bscommon.sys.service.ZhcxOutsideInspectionItpService;
+import com.rongwei.bsentity.vo.CopyAddTemplateVo;
+import com.rongwei.rwcommon.base.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 外部报验-ITP报验 前端控制器
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@RestController
+@RequestMapping("/zhcxOutsideInspectionItp")
+public class ZhcxOutsideInspectionItpController {
+
+    @Autowired
+    private ZhcxOutsideInspectionItpService service;
+
+    @RequestMapping("/splitOrder")
+    public R copyNodesSave(@RequestBody Map<String, String> map){
+        service.splitOrder(map.get("id"));
+        return R.ok();
+    }
+}
+

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxOutsideInspectionItpNdtResultController.java

@@ -0,0 +1,20 @@
+package com.rongwei.bsserver.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-无损探伤检测内容和结算 前端控制器
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@RestController
+@RequestMapping("/zhcxOutsideInspectionItpNdtResult")
+public class ZhcxOutsideInspectionItpNdtResultController {
+
+}
+

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxOutsideInspectionItpQcItemResultController.java

@@ -0,0 +1,20 @@
+package com.rongwei.bsserver.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-QC检查内容和结论 前端控制器
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@RestController
+@RequestMapping("/zhcxOutsideInspectionItpQcItemResult")
+public class ZhcxOutsideInspectionItpQcItemResultController {
+
+}
+

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxOutsideInspectionItpSupervisionDispatchController.java

@@ -0,0 +1,20 @@
+package com.rongwei.bsserver.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 外部报验-ITP报验-监理派单 前端控制器
+ * </p>
+ *
+ * @author wm
+ * @since 2023-12-26
+ */
+@RestController
+@RequestMapping("/zhcxOutsideInspectionItpSupervisionDispatch")
+public class ZhcxOutsideInspectionItpSupervisionDispatchController {
+
+}
+

business-server/src/main/resources/bootstrap.yml

@@ -11,6 +11,8 @@ spring:
     multipart:
       max-file-size: 100MB
       max-request-size: 1000MB
+  main:
+    allow-bean-definition-overriding: true
 server:
   port: 9689