整改数据保存，默认值保存

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

@@ -320,13 +320,14 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                         JSONObject org = orgMap.get(departNameTemp);
                         if(ObjectUtil.isNotNull(org)) {
                             machineEntity.setDeptid(org.getString("ID"));
-                            machineEntity.setDeptname(departNameTemp);
-
                             machineEntity.setFirstdeptid(org.getString("PID"));
                             machineEntity.setFirstdeptname(org.getString("pshortName"));
 
                             machineEntity.setDutydeptid(org.getString("ID"));
+                            machineEntity.setFirstdutydeptid(org.getString("PID"));
+                            machineEntity.setFirstdutydeptname(org.getString("pshortName"));
                         }
+                        machineEntity.setDeptname(departNameTemp);
                         machineEntity.setDutydeptname(departNameTemp);
 
                         machineEntity.setId(SecurityUtil.getUUID());
@@ -348,6 +349,8 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                     JSONObject dutyDepartOrg = orgMap.get(dutyDepartName);
                     if(ObjectUtil.isNotEmpty(dutyDepartName) && ObjectUtil.isNotNull(dutyDepartOrg)) {
                         machine.setDutydeptid(dutyDepartOrg.getString("ID"));
+                        machine.setFirstdutydeptid(departOrg.getString("PID"));
+                        machine.setFirstdutydeptname(departOrg.getString("pshortName"));
                     }
                     machine.setDutydeptname(dutyDepartName);
 

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

@@ -110,5 +110,17 @@ public class ZhcxProjectRectifyMachineDo extends BaseDo {
     @TableField("MACHINEID")
     private String machineid;
 
+    /**
+     * 责任部门一级单位
+     */
+    @TableField("FIRSTDUTYDEPTID")
+    private String firstdutydeptid;
+
+    /**
+     * 责任部门一级单位
+     */
+    @TableField("FIRSTDUTYDEPTNAME")
+    private String firstdutydeptname;
+
 
 }