ljx 4 år sedan
förälder
incheckning
b5f574ad58

+ 17 - 0
src/main/java/com/imed/costaccount/model/AfterIncomegroup.java

@@ -52,6 +52,23 @@ public class AfterIncomegroup implements Serializable {
      * 责任中心名称
      */
     private String responsibilityName;
+    /**
+     * 责任中心代码
+     */
+    private String openResponsibilityCode;
+    /**
+     * 责任中心名称
+     */
+    private String openResponsibilityName;
+    /**
+     * 责任中心代码
+     */
+    private String startResponsibilityCode;
+    /**
+     * 责任中心名称
+     */
+    private String startResponsibilityName;
+
     /**
      * 是直接还是间接 1直接 2 间接
      */

+ 4 - 6
src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupServiceImpl.java

@@ -405,6 +405,8 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                         afterIncomegroup.setOpenDepartmentCode(openDepartmentCode);
                         afterIncomegroup.setOpenDepartmentName(openDepartmentName);
                         afterIncomegroup.setOpenDepartmentStatus(responsibility.getResponsibilityType());
+                        afterIncomegroup.setOpenResponsibilityCode(responsibility.getResponsibilityName());
+                        afterIncomegroup.setOpenResponsibilityName(responsibility.getResponsibilityName());
                     }
                 }
             } else {
@@ -438,6 +440,8 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                         afterIncomegroup.setStartDepartmentCode(startDepartmentCode);
                         afterIncomegroup.setStartDepartmentName(startDepartmentName);
                         afterIncomegroup.setStartDepartmentStatus(responsibility.getResponsibilityType());
+                        afterIncomegroup.setStartResponsibilityCode(responsibility.getResponsibilityName());
+                        afterIncomegroup.setStartResponsibilityName(responsibility.getResponsibilityName());
                     }
                 }
             } else {
@@ -495,12 +499,6 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                         afterIncomegroup.setResponsibilityCode(responsibility.getResponsibilityCode());
                         afterIncomegroup.setResponsibilityName(responsibility.getResponsibilityName());
                     }
-                }else if (NumberConstant.ONE.equals(openDepartmentStatus) && NumberConstant.TWO.equals(startDepartmentStatus)){
-                    afterIncomegroup.setResponsibilityCode(costIncomeGroup.getOpenResponsibilityCode());
-                    afterIncomegroup.setResponsibilityName(costIncomeGroup.getOpenResponsibilityName());
-                }if (NumberConstant.TWO.equals(openDepartmentStatus) && NumberConstant.ONE.equals(startDepartmentStatus)){
-                    afterIncomegroup.setResponsibilityCode(costIncomeGroup.getStartResponsibilityCode());
-                    afterIncomegroup.setResponsibilityName(costIncomeGroup.getStartResponsibilityName());
                 }
                 costIncomeGroup.setAfterIncomeGroup(JSON.toJSONString(afterIncomegroup));
             }