From b46b270dd1dd48bb819da4b2358af6b526a7e679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 8 Dec 2025 16:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E6=99=BA=EF=BC=8C=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/wiki/扩展功能/hrmSalaryQZBB.properties | 5 +++++ .../service/impl/RecordsBuildServiceImpl.java | 9 +++++---- .../salary/service/impl/SIAccountServiceImpl.java | 14 +++++++++----- 3 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 resource/wiki/扩展功能/hrmSalaryQZBB.properties diff --git a/resource/wiki/扩展功能/hrmSalaryQZBB.properties b/resource/wiki/扩展功能/hrmSalaryQZBB.properties new file mode 100644 index 000000000..824bff4e4 --- /dev/null +++ b/resource/wiki/扩展功能/hrmSalaryQZBB.properties @@ -0,0 +1,5 @@ +# ?????? +bcylbx=1731899239050 + +# ???? +dbbx=1731899212789 \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java index 68764df57..b6d0dbd3b 100644 --- a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java @@ -24,10 +24,7 @@ import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.RecordsBuildService; import com.engine.salary.service.SIArchivesService; import com.engine.salary.service.SalaryEmployeeService; -import com.engine.salary.util.SalaryAssert; -import com.engine.salary.util.SalaryDateUtil; -import com.engine.salary.util.SalaryEnumUtil; -import com.engine.salary.util.SalaryI18nUtil; +import com.engine.salary.util.*; import com.engine.salary.util.db.MapperProxyFactory; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; @@ -851,6 +848,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ } record.put("otherPerSum", item.getOtherPerSum()); record.put("perSum", item.getPerSum()); + record.put("bPerSum", item.getBPerSum()); if (StringUtils.isNotEmpty(item.getSocialComJson())) { Map fundPerJson = JSON.parseObject(item.getSocialComJson(), new HashMap().getClass()); if (fundPerJson != null) { @@ -957,10 +955,13 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ record.put("fundSpecialSum", fundSpecialSum[0].toPlainString()); record.put("specialSum", socialSpecialSum[0].add(fundSpecialSum[0]).toPlainString()); record.put("comSum", item.getComSum()); + record.put("bComSum", item.getBComSum()); record.put("socialSum", item.getSocialSum()); record.put("fundSum", item.getFundSum()); record.put("otherSum", item.getOtherSum()); record.put("total", item.getTotal()); + record.put("btotal", item.getBTotal()); + record.put("totalSum", SalaryEntityUtil.empty2Zero(item.getTotal()).add(SalaryEntityUtil.empty2Zero(item.getBTotal())).toPlainString()); result.add(record); }); return result; diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 77d3f96e5..0b65195af 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -7240,6 +7240,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List> list = getService(user).buildQzReport(dtos, (long) user.getUID(), false); + BaseBean bb = new BaseBean(); + String bcylbx = bb.getPropValue("hrmSalaryQZBB", "bcylbx"); + String dbbx = bb.getPropValue("hrmSalaryQZBB", "dbbx"); + List columns = Lists.newArrayList(); columns.add(new WeaTableColumnGroup("150", "公司名称", "paymentOrganizationName")); @@ -7260,20 +7264,20 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { columns.add(new WeaTableColumnGroup("150", "失业保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "单位缴交额", "9004socialCom"), new WeaTableColumnGroup("150", "单位补缴额", "9004bSocialCom")))); columns.add(new WeaTableColumnGroup("150", "工伤保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "单位缴交额", "9003socialCom"), new WeaTableColumnGroup("150", "单位补缴额", "9003bSocialCom")))); columns.add(new WeaTableColumnGroup("150", "生育保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "单位缴交额", "9005socialCom"), new WeaTableColumnGroup("150", "单位补缴额", "9005bSocialCom")))); - columns.add(new WeaTableColumnGroup("150", "补充医疗保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "单位缴交额", ""), new WeaTableColumnGroup("150", "单位补缴额", "")))); - columns.add(new WeaTableColumnGroup("150", "大病保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "单位缴交额", ""), new WeaTableColumnGroup("150", "单位补缴额", "")))); + columns.add(new WeaTableColumnGroup("150", "补充医疗保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "单位缴交额", bcylbx + "socialCom"), new WeaTableColumnGroup("150", "单位补缴额", bcylbx + "bSocialCom")))); + columns.add(new WeaTableColumnGroup("150", "大病保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "单位缴交额", dbbx + "socialCom"), new WeaTableColumnGroup("150", "单位补缴额", dbbx + "bSocialCom")))); columns.add(new WeaTableColumnGroup("150", "住房公积金", "", Lists.newArrayList(new WeaTableColumnGroup("150", "单位缴交额", "9006fundCom"), new WeaTableColumnGroup("150", "单位补缴额", "9006bFundCom")))); columns.add(new WeaTableColumnGroup("150", "养老保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", "9001socialPer"), new WeaTableColumnGroup("150", "个人补缴额", "9001bSocialPer")))); columns.add(new WeaTableColumnGroup("150", "医疗保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", "9002socialPer"), new WeaTableColumnGroup("150", "个人补缴额", "9002bSocialPer")))); columns.add(new WeaTableColumnGroup("150", "失业保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", "9004socialPer"), new WeaTableColumnGroup("150", "个人补缴额", "9004bSocialPer")))); - columns.add(new WeaTableColumnGroup("150", "补充医疗保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", ""), new WeaTableColumnGroup("150", "个人补缴额", "")))); - columns.add(new WeaTableColumnGroup("150", "大病保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", ""), new WeaTableColumnGroup("150", "个人补缴额", "")))); + columns.add(new WeaTableColumnGroup("150", "补充医疗保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", bcylbx + "socialPer"), new WeaTableColumnGroup("150", "个人补缴额", bcylbx + "bSocialPer")))); + columns.add(new WeaTableColumnGroup("150", "大病保险", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", dbbx +"socialPer"), new WeaTableColumnGroup("150", "个人补缴额", dbbx +"bSocialPer")))); columns.add(new WeaTableColumnGroup("150", "单位超额-社保合计", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", "socialSpecialSum")))); columns.add(new WeaTableColumnGroup("150", "住房公积金", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", "9006fundPer"), new WeaTableColumnGroup("150", "个人补缴额", "9006bFundPer")))); columns.add(new WeaTableColumnGroup("150", "单位超额-公积金合计", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", "fundSpecialSum")))); columns.add(new WeaTableColumnGroup("150", "社保公积金单位合计", "", Lists.newArrayList(new WeaTableColumnGroup("150", "单位缴交额", "comSum"), new WeaTableColumnGroup("150", "单位补缴额", "bComSum")))); columns.add(new WeaTableColumnGroup("150", "社保公积金个人合计", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", "perSum"), new WeaTableColumnGroup("150", "个人补缴额", "bPerSum")))); - columns.add(new WeaTableColumnGroup("150", "总计", "", Lists.newArrayList(new WeaTableColumnGroup("150", "总计", "total")))); + columns.add(new WeaTableColumnGroup("150", "总计", "", Lists.newArrayList(new WeaTableColumnGroup("150", "总计", "totalSum")))); columns.add(new WeaTableColumnGroup("150", "服务费", "", Lists.newArrayList(new WeaTableColumnGroup("150", "单位缴交额", ""), new WeaTableColumnGroup("150", "单位补缴额", "")))); columns.add(new WeaTableColumnGroup("150", "服务费", "", Lists.newArrayList(new WeaTableColumnGroup("150", "个人缴交额", ""), new WeaTableColumnGroup("150", "个人补缴额", ""))));