qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领悦nc调整

This commit is contained in:
Harryxzy 2025-04-17 14:20:06 +08:00
parent d172cb402e
commit 9addd39bf0
13 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/ly/po/LyFundReportPO.java
View File

@ -25,6 +25,8 @@ public class LyFundReportPO {
private Long subcompanyId;
private Long departmentId;
/**
* 职能项目类型
*/

2
src/com/engine/salary/entity/ly/po/LySalaryReportPO.java
View File

@ -30,6 +30,8 @@ public class LySalaryReportPO {
private Long subcompanyId;
private Long departmentId;
// 职能项目类型， 是职能还是项目
@Alias("职能项目类型")
private String znxmlx;

2
src/com/engine/salary/entity/ly/po/LySocialReportPO.java
View File

@ -25,6 +25,8 @@ public class LySocialReportPO {
private Long subcompanyId;
private Long departmentId;
/**
* 职能项目类型
*/

2
src/com/engine/salary/entity/ly/po/UfGjjInfo.java
View File

@ -21,6 +21,8 @@ public class UfGjjInfo {
// 分部
private Long fb;
private Long bm;
// 员工
private Long yg;

2
src/com/engine/salary/entity/ly/po/UfSbInfo.java
View File

@ -21,6 +21,8 @@ public class UfSbInfo {
// 分部
private Integer fb;
private Integer bm;
// 员工
private Long yg;

8
src/com/engine/salary/mapper/ly/LyFundReportMapper.xml
View File

@ -19,6 +19,7 @@
<result column="id" property="id" />
<result column="salary_month" property="salaryMonth" />
<result column="subcompany_id" property="subcompanyId" />
<result column="department_id" property="departmentId" />
<result column="update_time" property="updateTime" />
<result column="znxmlx" property="znxmlx" />
<result column="znxmmc" property="znxmmc" />
@ -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 @@
<if test="subcompanyId != null">
subcompany_id,
</if>
<if test="departmentId != null">
department_id,
</if>
<if test="updateTime != null">
update_time,
</if>
@ -258,6 +263,9 @@
<if test="subcompanyId != null" >
#{subcompanyId},
</if>
<if test="departmentId != null">
#{departmentId},
</if>
<if test="updateTime != null" >
#{updateTime},
</if>

8
src/com/engine/salary/mapper/ly/LySalaryReportMapper.xml
View File

@ -4,6 +4,7 @@
<resultMap id="BaseResultMap" type="com.engine.salary.entity.ly.po.LySalaryReportPO">
<result column="id" property="id" />
<result column="subcompany_id" property="subcompanyId" />
<result column="department_id" property="departmentId" />
<result column="ffgsqc" property="ffgsqc" />
<result column="fycdgsqc" property="fycdgsqc" />
<result column="znxmmc" property="znxmmc" />
@ -43,6 +44,7 @@
<sql id="baseColumns">
t.id
, t.subcompany_id
, t.department_id
, t.salary_month
, t.ffgsqc
, t.fycdgsqc
@ -222,6 +224,9 @@
<if test="subcompanyId != null">
subcompany_id,
</if>
<if test="departmentId != null">
department_id,
</if>
<if test="znxmlx != null">
znxmlx,
</if>
@ -335,6 +340,9 @@
<if test="subcompanyId != null" >
#{subcompanyId},
</if>
<if test="departmentId != null">
#{departmentId},
</if>
<if test="znxmlx != null">
#{znxmlx},
</if>

10
src/com/engine/salary/mapper/ly/LySocialReportMapper.xml
View File

@ -36,6 +36,9 @@
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="delete_type" property="deleteType" />
<result column="znxmlx" property="znxmlx" />
<result column="subcompany_id" property="subcompanyId" />
<result column="department_id" property="departmentId" />
</resultMap>
<!-- 表字段 -->
@ -76,6 +79,7 @@
, t.delete_type
, t.znxmlx
, t.subcompany_id
, t.department_id
</sql>
<!-- 查询全部 -->
@ -223,6 +227,9 @@
<if test="subcompanyId != null">
subcompany_id,
</if>
<if test="departmentId != null">
department_id,
</if>
<if test="znxmlx != null">
znxmlx,
</if>
@ -333,6 +340,9 @@
<if test="subcompanyId != null" >
#{subcompanyId},
</if>
<if test="departmentId != null">
#{departmentId},
</if>
<if test="znxmlx != null" >
#{znxmlx},
</if>

4
src/com/engine/salary/mapper/ly/UfSbgjjMapper.xml
View File

@ -5,6 +5,7 @@
<resultMap id="SbBaseResultMap" type="com.engine.salary.entity.ly.po.UfSbInfo">
<result column="dbylbx" property="dbylbx" />
<result column="fb" property="fb" />
<result column="bm" property="bm" />
<result column="fuwufi" property="fuwufi" />
<result column="fyszq" property="fyszq" />
<result column="gkgrygzhje" property="gkgrygzhje" />
@ -40,6 +41,7 @@
<sql id="sbBaseColumns">
t.dbylbx
, t.fb
, t.bm
, t.fuwufi
, t.fyszq
, t.gkgrygzhje
@ -86,6 +88,7 @@
<resultMap id="GjjBaseResultMap" type="com.engine.salary.entity.ly.po.UfGjjInfo">
<result column="fuwufi" property="fuwufi" />
<result column="fb" property="fb" />
<result column="bm" property="bm" />
<result column="fycdgsqc" property="fycdgsqc" />
<result column="fyszq" property="fyszq" />
<result column="gjjcdgsmc" property="gjjcdgsmc" />
@ -104,6 +107,7 @@
<sql id="gjjBaseColumns">
t.fuwufi
, t.fb
, t.bm
, t.fycdgsqc
, t.fyszq
, t.gjjcdgsmc

2
src/com/engine/salary/service/impl/LyFundReportServiceImpl.java
View File

@ -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)

6
src/com/engine/salary/service/impl/LyPZServiceImpl.java
View File

@ -124,7 +124,8 @@ public class LyPZServiceImpl extends Service implements LyPZService {
// 获取所有的部门信息
List<DeptInfo> deptInfos = getSalaryEmployeeService(user).listAllDeptInfoList();
// key:分部id-部门名称， value:部门id
Map<String, DeptInfo> depInfoMap = SalaryEntityUtil.convert2Map(deptInfos, dep -> dep.getSubcompanyid1() + "-" + dep.getName());
// Map<String, DeptInfo> depInfoMap = SalaryEntityUtil.convert2Map(deptInfos, dep -> dep.getSubcompanyid1() + "-" + dep.getName());
Map<String, DeptInfo> depInfoMap = SalaryEntityUtil.convert2Map(deptInfos, dep -> dep.getId().toString());
Set<Long> subCompanyIds = new HashSet<>();
Set<Long> departmentIds = new HashSet<>();
Set<String> 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;

3
src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java
View File

@ -303,6 +303,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
List<SalaryAcctResultPO> acctResultList = getSalaryAcctResultService(user).listByAcctEmployeeIdsAndSalaryItemIds(salaryAcctEmpIds, salaryItemIds);
List<SalarySobEmpFieldPO> salarySobEmpFields = new ArrayList<>();
salarySobEmpFields.add(SalarySobEmpFieldPO.builder().fieldCode("subcompanyId").build());
salarySobEmpFields.add(SalarySobEmpFieldPO.builder().fieldCode("departmentId").build());
List<Map<String, Object>> resultMapList = buildData4LyReport(salaryItemList, salaryAcctEmployeePOList, salarySobEmpFields, acctResultList, false);
// 根据费用承担公司全称、职能/项目名称进行分组
Map<String, List<Map<String, Object>>> 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<String, Object> map = value.get(0);
String rylb = map.get(ffgsztItemId.toString()) == null ? "" : map.get(ffgsztItemId.toString()).toString();

2
src/com/engine/salary/service/impl/LySocialReportServiceImpl.java
View File

@ -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)