diff --git a/src/com/engine/salary/entity/ly/po/LyFundReportPO.java b/src/com/engine/salary/entity/ly/po/LyFundReportPO.java
index 599ac900a..94e63cd64 100644
--- a/src/com/engine/salary/entity/ly/po/LyFundReportPO.java
+++ b/src/com/engine/salary/entity/ly/po/LyFundReportPO.java
@@ -25,6 +25,8 @@ public class LyFundReportPO {
private Long subcompanyId;
+ private Long departmentId;
+
/**
* 职能项目类型
*/
diff --git a/src/com/engine/salary/entity/ly/po/LySalaryReportPO.java b/src/com/engine/salary/entity/ly/po/LySalaryReportPO.java
index 255031c36..adb692d52 100644
--- a/src/com/engine/salary/entity/ly/po/LySalaryReportPO.java
+++ b/src/com/engine/salary/entity/ly/po/LySalaryReportPO.java
@@ -30,6 +30,8 @@ public class LySalaryReportPO {
private Long subcompanyId;
+ private Long departmentId;
+
// 职能项目类型， 是职能还是项目
@Alias("职能项目类型")
private String znxmlx;
diff --git a/src/com/engine/salary/entity/ly/po/LySocialReportPO.java b/src/com/engine/salary/entity/ly/po/LySocialReportPO.java
index 3cf8f9bd1..bd4669a78 100644
--- a/src/com/engine/salary/entity/ly/po/LySocialReportPO.java
+++ b/src/com/engine/salary/entity/ly/po/LySocialReportPO.java
@@ -25,6 +25,8 @@ public class LySocialReportPO {
private Long subcompanyId;
+ private Long departmentId;
+
/**
* 职能项目类型
*/
diff --git a/src/com/engine/salary/entity/ly/po/UfGjjInfo.java b/src/com/engine/salary/entity/ly/po/UfGjjInfo.java
index 9dd5e589d..4ad35c11d 100644
--- a/src/com/engine/salary/entity/ly/po/UfGjjInfo.java
+++ b/src/com/engine/salary/entity/ly/po/UfGjjInfo.java
@@ -21,6 +21,8 @@ public class UfGjjInfo {
// 分部
private Long fb;
+ private Long bm;
+
// 员工
private Long yg;
diff --git a/src/com/engine/salary/entity/ly/po/UfSbInfo.java b/src/com/engine/salary/entity/ly/po/UfSbInfo.java
index ab500dfb9..6f4f98d82 100644
--- a/src/com/engine/salary/entity/ly/po/UfSbInfo.java
+++ b/src/com/engine/salary/entity/ly/po/UfSbInfo.java
@@ -21,6 +21,8 @@ public class UfSbInfo {
// 分部
private Integer fb;
+ private Integer bm;
+
// 员工
private Long yg;
diff --git a/src/com/engine/salary/mapper/ly/LyFundReportMapper.xml b/src/com/engine/salary/mapper/ly/LyFundReportMapper.xml
index a87397b00..749433100 100644
--- a/src/com/engine/salary/mapper/ly/LyFundReportMapper.xml
+++ b/src/com/engine/salary/mapper/ly/LyFundReportMapper.xml
@@ -19,6 +19,7 @@
+
@@ -43,6 +44,7 @@
, t.id
, t.salary_month
, t.subcompany_id
+ , t.department_id
, t.update_time
, t.znxmlx
, t.znxmmc
@@ -196,6 +198,9 @@
subcompany_id,
+
+ department_id,
+
update_time,
@@ -258,6 +263,9 @@
#{subcompanyId},
+
+ #{departmentId},
+
#{updateTime},
diff --git a/src/com/engine/salary/mapper/ly/LySalaryReportMapper.xml b/src/com/engine/salary/mapper/ly/LySalaryReportMapper.xml
index 12598c9d7..d15a01bdd 100644
--- a/src/com/engine/salary/mapper/ly/LySalaryReportMapper.xml
+++ b/src/com/engine/salary/mapper/ly/LySalaryReportMapper.xml
@@ -4,6 +4,7 @@
+
@@ -43,6 +44,7 @@
t.id
, t.subcompany_id
+ , t.department_id
, t.salary_month
, t.ffgsqc
, t.fycdgsqc
@@ -222,6 +224,9 @@
subcompany_id,
+
+ department_id,
+
znxmlx,
@@ -335,6 +340,9 @@
#{subcompanyId},
+
+ #{departmentId},
+
#{znxmlx},
diff --git a/src/com/engine/salary/mapper/ly/LySocialReportMapper.xml b/src/com/engine/salary/mapper/ly/LySocialReportMapper.xml
index 6942dbcc8..e7d91c856 100644
--- a/src/com/engine/salary/mapper/ly/LySocialReportMapper.xml
+++ b/src/com/engine/salary/mapper/ly/LySocialReportMapper.xml
@@ -36,6 +36,9 @@
+
+
+
@@ -76,6 +79,7 @@
, t.delete_type
, t.znxmlx
, t.subcompany_id
+ , t.department_id
@@ -223,6 +227,9 @@
subcompany_id,
+
+ department_id,
+
znxmlx,
@@ -333,6 +340,9 @@
#{subcompanyId},
+
+ #{departmentId},
+
#{znxmlx},
diff --git a/src/com/engine/salary/mapper/ly/UfSbgjjMapper.xml b/src/com/engine/salary/mapper/ly/UfSbgjjMapper.xml
index 5308c942e..63bf2f7ac 100644
--- a/src/com/engine/salary/mapper/ly/UfSbgjjMapper.xml
+++ b/src/com/engine/salary/mapper/ly/UfSbgjjMapper.xml
@@ -5,6 +5,7 @@
+
@@ -40,6 +41,7 @@
t.dbylbx
, t.fb
+ , t.bm
, t.fuwufi
, t.fyszq
, t.gkgrygzhje
@@ -86,6 +88,7 @@
+
@@ -104,6 +107,7 @@
t.fuwufi
, t.fb
+ , t.bm
, t.fycdgsqc
, t.fyszq
, t.gjjcdgsmc
diff --git a/src/com/engine/salary/service/impl/LyFundReportServiceImpl.java b/src/com/engine/salary/service/impl/LyFundReportServiceImpl.java
index 7b421dfa9..c0d157a15 100644
--- a/src/com/engine/salary/service/impl/LyFundReportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/LyFundReportServiceImpl.java
@@ -176,11 +176,13 @@ public class LyFundReportServiceImpl extends Service implements LyFundReportServ
String fycdgsqc = split.length > 1 ? split[1] : "";
String znxmmc = split.length > 2 ? split[2] : "";
Long subcompanyId = CollectionUtils.isEmpty(valueList) ? 0L : valueList.get(0).getFb() == null ? 0L : Long.valueOf(valueList.get(0).getFb());
+ Long departmentId = CollectionUtils.isEmpty(valueList) ? 0L : valueList.get(0).getBm() == null ? 0L : Long.valueOf(valueList.get(0).getBm());
String znxmlxStr = CollectionUtils.isEmpty(valueList) ? "" : valueList.get(0).getZnxmlb() == null ? "" : valueList.get(0).getZnxmlb();
LyFundReportPO build = LyFundReportPO.builder()
.id(IdGenerator.generate())
.subcompanyId(subcompanyId)
+ .departmentId(departmentId)
.ftempNum(CollectionUtils.isEmpty(valueList) ? 0 : valueList.size())
.salaryMonth(salaryMonthDate)
.znxmlx(znxmlxStr)
diff --git a/src/com/engine/salary/service/impl/LyPZServiceImpl.java b/src/com/engine/salary/service/impl/LyPZServiceImpl.java
index d6721382e..a58b35676 100644
--- a/src/com/engine/salary/service/impl/LyPZServiceImpl.java
+++ b/src/com/engine/salary/service/impl/LyPZServiceImpl.java
@@ -124,7 +124,8 @@ public class LyPZServiceImpl extends Service implements LyPZService {
// 获取所有的部门信息
List deptInfos = getSalaryEmployeeService(user).listAllDeptInfoList();
// key:分部id-部门名称， value:部门id
- Map depInfoMap = SalaryEntityUtil.convert2Map(deptInfos, dep -> dep.getSubcompanyid1() + "-" + dep.getName());
+ // Map depInfoMap = SalaryEntityUtil.convert2Map(deptInfos, dep -> dep.getSubcompanyid1() + "-" + dep.getName());
+ Map depInfoMap = SalaryEntityUtil.convert2Map(deptInfos, dep -> dep.getId().toString());
Set subCompanyIds = new HashSet<>();
Set departmentIds = new HashSet<>();
Set frztNameList = new HashSet<>();
@@ -146,7 +147,8 @@ public class LyPZServiceImpl extends Service implements LyPZService {
singleCount = true;
} else if (znxmlxContent.equals("职能")) {
// 获取部门信息
- DeptInfo dept = depInfoMap.get(subcompanyId + "-" + varMap.getOrDefault("职能项目名称", ""));
+ // DeptInfo dept = depInfoMap.get(subcompanyId + "-" + varMap.getOrDefault("职能项目名称", ""));
+ DeptInfo dept = depInfoMap.get(varMap.getOrDefault("departmentId", ""));
// 获取部门属性信息
if (dept == null) {
singleCount = true;
diff --git a/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java b/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java
index 5ae92c8bb..e01b10071 100644
--- a/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java
@@ -303,6 +303,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
List acctResultList = getSalaryAcctResultService(user).listByAcctEmployeeIdsAndSalaryItemIds(salaryAcctEmpIds, salaryItemIds);
List salarySobEmpFields = new ArrayList<>();
salarySobEmpFields.add(SalarySobEmpFieldPO.builder().fieldCode("subcompanyId").build());
+ salarySobEmpFields.add(SalarySobEmpFieldPO.builder().fieldCode("departmentId").build());
List> resultMapList = buildData4LyReport(salaryItemList, salaryAcctEmployeePOList, salarySobEmpFields, acctResultList, false);
// 根据费用承担公司全称、职能/项目名称进行分组
Map>> resultGroup = SalaryEntityUtil.group2Map(resultMapList, map -> (map.get(ffgsqcItemId.toString()) == null ? " " : map.get(ffgsqcItemId.toString()).toString())
@@ -340,6 +341,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
.salaryMonth(salaryMonthDate)
.znxmlx(valueMap.getOrDefault(znxmlxItemId.toString(), "").toString())
.subcompanyId(Long.valueOf(valueMap.getOrDefault("subcompanyId", "0").toString()))
+ .departmentId(Long.valueOf(valueMap.getOrDefault("departmentId", "0").toString()))
.ffgsqc(ffgsqc)
.fycdgsqc(fycdgsqc)
.znxmmc(znxmmc)
@@ -481,6 +483,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
itemSum.put("idNo", CollectionUtils.isEmpty(value) ? "" : value.get(0).get("idNo"));
itemSum.put("employeeId", CollectionUtils.isEmpty(value) ? "" : value.get(0).get("employeeId"));
itemSum.put("subcompanyId", CollectionUtils.isEmpty(value) ? "" : value.get(0).get("subcompanyId") == null ? "0" : value.get(0).get("subcompanyId"));
+ itemSum.put("departmentId", CollectionUtils.isEmpty(value) ? "" : value.get(0).get("departmentId") == null ? "0" : value.get(0).get("departmentId"));
if (ffgsztItemId != null) {
Map map = value.get(0);
String rylb = map.get(ffgsztItemId.toString()) == null ? "" : map.get(ffgsztItemId.toString()).toString();
diff --git a/src/com/engine/salary/service/impl/LySocialReportServiceImpl.java b/src/com/engine/salary/service/impl/LySocialReportServiceImpl.java
index 69ef4c46b..1a313bc0b 100644
--- a/src/com/engine/salary/service/impl/LySocialReportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/LySocialReportServiceImpl.java
@@ -193,11 +193,13 @@ public class LySocialReportServiceImpl extends Service implements LySocialReport
String fycdgsqc = split.length > 1 ? split[1] : "";
String znxmmc = split.length > 2 ? split[2] : "";
Long subcompanyId = CollectionUtils.isEmpty(valueList) ? 0L : valueList.get(0).getFb() == null ? 0L : Long.valueOf(valueList.get(0).getFb());
+ Long departmentId = CollectionUtils.isEmpty(valueList) ? 0L : valueList.get(0).getBm() == null ? 0L : Long.valueOf(valueList.get(0).getBm());
String znxmlxStr = CollectionUtils.isEmpty(valueList) ? "" : valueList.get(0).getZnxmlb() == null ? "" : valueList.get(0).getZnxmlb();
LySocialReportPO build = LySocialReportPO.builder()
.id(IdGenerator.generate())
.subcompanyId(subcompanyId)
+ .departmentId(departmentId)
.ftempNum(CollectionUtils.isEmpty(valueList) ? 0 : valueList.size())
.salaryMonth(salaryMonthDate)
.znxmlx(znxmlxStr)