外部报验同步报送平台

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

@@ -33,12 +33,13 @@ public interface ZhcxOutsideInspectionItpDao extends BaseMapper<ZhcxOutsideInspe
     @Select("<script>" +
             "SELECT  " +
             " itp.*,zoiisd.SUPERVISION, zoiisd.INSPECTIONCONCLUSION, zoiisd.REFUSEREASON,  " +
-            " zipn.ISSUPP, zsm.\"TYPE\" AS subcontractortype " +
+            " zipn.ISSUPP, zsm.\"TYPE\" AS subcontractortype, so.FULLNAME as threelevel, zsm.COMPANY_NAME as fourbase " +
             "FROM  " +
             " ZHCX_OUTSIDE_INSPECTION_ITP itp  " +
             "JOIN ZHCX_OUTSIDE_INSPECTION_ITP_SUPERVISION_DISPATCH zoiisd ON zoiisd.ITPID = itp.ID " +
             "LEFT JOIN ZHCX_ITP_PROJECT_NODES zipn on zipn.ID = itp.INSPECTIONCONTENTID  " +
             "LEFT JOIN ZHCX_SUBCONTRACTOR_MANAGE zsm ON zsm.ID = itp.SUBCONTRACTORID " +
+            "left join SYS_ORGANIZATION so on so.ID = itp.WORKSHOPID" +
             "<where>" +
             "<if test='startTime != null and endTime != null'>" +
             "   AND RESERVATIONINSPECTIONTIME BETWEEN #{startTime} AND #{endTime}  and LIFECYCLE = '10'" +

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

@@ -22,6 +22,7 @@ import com.rongwei.bsentity.dto.outside.OutsideInspectionInsertRequest;
 import com.rongwei.bsentity.dto.outside.OutsideInspectionUpdateRequest;
 import com.rongwei.bsentity.vo.*;
 import com.rongwei.commonservice.serial.service.SysSerialNumberService;
+import com.rongwei.rwadmincommon.system.domain.SysModuleDo;
 import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.R;
@@ -1126,6 +1127,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
         }
 
         List<ZhcxOutsideInspectionSyncRecordDo> recordList = new ArrayList<>(syncDtoList.size());
+        //车间上级
         for(OutsideInspactionSyncDto sync : syncDtoList) {
             //接收，有条件接收
             if("10".equals(sync.getInspectionconclusion()) || "30".equals(sync.getInspectionconclusion())) {
@@ -1135,7 +1137,6 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
             else if("20".equals(sync.getInspectionconclusion())) {
                 sync.setInspectionconclusion("REJ");
             }
-            sync.setBase("长兴分公司");
 
             //itp报验并且是外协点
             //非itp报验点并且分包商为驻外分包商
@@ -1147,6 +1148,9 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                 sync.setIssupp("n");
             }
 
+            sync.setBase("长兴分公司");
+
+            //同步信息
             ZhcxOutsideInspectionSyncRecordDo record = new ZhcxOutsideInspectionSyncRecordDo();
             record.setId(SecurityUtil.getUUID());
             record.setSyncstate("3");

business-entity/src/main/java/com/rongwei/bsentity/dto/OutsideInspactionSyncDto.java

@@ -2,7 +2,7 @@ package com.rongwei.bsentity.dto;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
 
@@ -17,7 +17,7 @@ import java.util.Date;
 public class OutsideInspactionSyncDto {
 
     @TableField("ID")
-    @JsonIgnoreProperties
+    @JsonIgnore
     private String id;
 
     /**
@@ -92,22 +92,36 @@ public class OutsideInspactionSyncDto {
      * 二级单位
      */
     @JsonProperty(value = "twolevel")
-    private String twolevel;
+    @TableField("DEPARTNAME")
+    private String departName;
 
     /**
      * 车间
      */
-    @TableField("WORKSHOPNAME")
+    @TableField("WORKSHOPID")
+    @JsonIgnore
+    private String workshopid;
+
+//    /**
+//     * 车间
+//     */
+//    @TableField("WORKSHOPNAME")
+//    @JsonProperty(value = "threelevel")
+//    private String workshopname;
+
+    /**
+     * 车间
+     */
+    @TableField("threelevel")
     @JsonProperty(value = "threelevel")
-    private String workshopname;
+    private String threelevel;
 
     /**
      * 分包商/劳务班组
      */
-    @TableField("SUBCONTRACTORNAME")
+    @TableField("fourbase")
     @JsonProperty(value = "fourbase")
-    private String subcontractorname;
-
+    private String fourbase;
 
     /**
      * 递交
@@ -155,7 +169,7 @@ public class OutsideInspactionSyncDto {
      * 检验员
      */
     @TableField("CHECKERNAME")
-    @JsonProperty(value = "checkername")
+    @JsonProperty(value = "inspector")
     private String checkername;
 
     /**
@@ -182,10 +196,10 @@ public class OutsideInspactionSyncDto {
     /**
      * 分包商类型
      */
-    @JsonIgnoreProperties
+    @JsonIgnore
     private String subcontractortype;
 
     @TableField("LAUNCHTYPE")
-    @JsonIgnoreProperties
+    @JsonIgnore
     private String launchtype;
 }