整改问题修复

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

@@ -879,7 +879,8 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
             main.setMainstatus(LuckySheet4SummaryHelp.getCommonStatus(status));
             main.setReqdate(LuckySheet4SummaryHelp.getDateDefaultNull(row, "提出日期"));
             main.setRequser(row.getString("提出者"));
-            main.setRectifydate(LuckySheet4SummaryHelp.getDateDefaultNull(row, "整改日期"));
+//            main.setRectifydate(LuckySheet4SummaryHelp.getDateDefaultNull(row, "整改期限"));
+            main.setRectifydate(row.getString("整改期限"));
             main.setRemark1(row.getString("备注1"));
             main.setRemark2(row.getString("备注2"));
 
@@ -910,6 +911,9 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                 String mochineStatus = machineObj.getString("状态");
                 machine.setStatus(LuckySheet4SummaryHelp.getCommonStatus(mochineStatus));
 
+                machine.setSubcontractorname(machineObj.getString("施工分包商/班组"));
+                machine.setDutysubcontractorname(machineObj.getString("责任分包商/班组"));
+
                 Map<String, JSONObject> orgMap = summaryDataBo.getOrgMap();
                 Map<String, JSONObject> orgIdMap = summaryDataBo.getOrgIdMap();
 

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

@@ -93,7 +93,7 @@ public class ZhcxProjectRectifyDo extends BaseDo {
      * 整改日期
      */
     @TableField("RECTIFYDATE")
-    private Date rectifydate;
+    private String rectifydate;
     /**
      * 备注1
      */

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

@@ -140,4 +140,16 @@ public class ZhcxProjectRectifyMachineDo extends BaseDo {
     @TableField("DUTYIFOUTSIDEBASE")
     private String dutyifoutsidebase;
 
+    /**
+     * 施工分包商/班组
+     */
+    @TableField("SUBCONTRACTORNAME")
+    private String subcontractorname;
+
+    /**
+     * 怎忍分包商/班组
+     */
+    @TableField("DUTYSUBCONTRACTORNAME")
+    private String dutysubcontractorname;
+
 }