From 5538a7d01eab983f4e1eeabf0bd738ec3b459e0f Mon Sep 17 00:00:00 2001 From: sy Date: Mon, 18 Sep 2023 16:30:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sischeme/param/InsuranceSchemeParam.java | 12 +++++++ .../sischeme/InsuranceSchemeMapper.java | 3 ++ .../mapper/sischeme/InsuranceSchemeMapper.xml | 32 +++++++++++++++++++ .../service/impl/SISchemeServiceImpl.java | 7 ++-- 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java b/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java index aefe8063d..fd7deadb1 100644 --- a/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java +++ b/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java @@ -24,5 +24,17 @@ public class InsuranceSchemeParam extends BaseQueryParam { private WelfareTypeEnum welfareTypeEnum; + /** + * 方案名称 + */ + private String schemeName; + /** + * 缴纳类型 + */ + private Integer paymentType; + /** + * 福利类型 + */ + private Integer welfareType; } diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java index 5ea511304..7403a8511 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java @@ -1,5 +1,6 @@ package com.engine.salary.mapper.sischeme; +import com.engine.salary.entity.sischeme.param.InsuranceSchemeParam; import com.engine.salary.entity.sischeme.po.InsuranceSchemePO; import org.apache.ibatis.annotations.Param; @@ -61,6 +62,8 @@ public interface InsuranceSchemeMapper { List listByWelfareType(@Param("welfareType")Integer welfareType); + List list(InsuranceSchemeParam param); + void deleteByIds(@Param("ids")Collection ids); } diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml index 9643d377d..d6a671a92 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml @@ -36,6 +36,22 @@ , t.tax_agent_ids + + + + AND scheme_name like CONCAT('%',#{schemeName},'%') + + + + + AND scheme_name like '%'||#{schemeName}||'%' + + + + + AND scheme_name like '%'+#{schemeName}+'%' + + + UPDATE hrsa_social_security_scheme diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 81999f2db..44400f3c4 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -194,11 +194,13 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { @Override public PageInfo list(InsuranceSchemeParam queryParam) { SalaryAssert.notNull(queryParam.getWelfareTypeEnum(), SalaryI18nUtil.getI18nLabel(84026, "参数错误")); + queryParam.setWelfareType(queryParam.getWelfareTypeEnum().getValue()); Long currentEmployeeId = (long) user.getUID(); List insuranceSchemePOS; Boolean needAuth = getTaxAgentService().isNeedAuth(currentEmployeeId); if (needAuth) { - insuranceSchemePOS = getInsuranceSchemeMapper().listByWelfareType(queryParam.getWelfareTypeEnum().getValue()); +// insuranceSchemePOS = getInsuranceSchemeMapper().listByWelfareType(queryParam.getWelfareTypeEnum().getValue()); + insuranceSchemePOS = getInsuranceSchemeMapper().list(queryParam); Boolean isAdminEnable = getTaxAgentService().isAdminEnable((long) user.getUID()); if (isAdminEnable) { //管理员 @@ -217,7 +219,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceSchemePOS = new ArrayList<>(); } } else { - insuranceSchemePOS = getInsuranceSchemeMapper().listByWelfareType(queryParam.getWelfareTypeEnum().getValue()); +// insuranceSchemePOS = getInsuranceSchemeMapper().listByWelfareType(queryParam.getWelfareTypeEnum().getValue()); + insuranceSchemePOS = getInsuranceSchemeMapper().list(queryParam); } PageInfo dtoPage = new PageInfo<>(InsuranceSchemeListDTO.class); From bf6918264f3f7dfb6292d84ac9f1e09620c854b6 Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 19 Sep 2023 15:24:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E7=A6=8F=E5=88=A9?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E4=BF=AE=E6=94=B9action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/UpdateSISchemeDetailAction.java | 250 ++++++++++++++++++ .../sischeme/InsuranceSchemeDetailMapper.xml | 6 + 2 files changed, 256 insertions(+) create mode 100644 src/com/engine/salary/action/UpdateSISchemeDetailAction.java diff --git a/src/com/engine/salary/action/UpdateSISchemeDetailAction.java b/src/com/engine/salary/action/UpdateSISchemeDetailAction.java new file mode 100644 index 000000000..2ceef43d0 --- /dev/null +++ b/src/com/engine/salary/action/UpdateSISchemeDetailAction.java @@ -0,0 +1,250 @@ +package com.engine.salary.action; + +import com.engine.salary.encrypt.EncryptUtil; +import com.engine.salary.entity.sicategory.po.ICategoryPO; +import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; +import com.engine.salary.entity.sischeme.po.InsuranceSchemePO; +import com.engine.salary.enums.sicategory.IsUseEnum; +import com.engine.salary.mapper.sicategory.ICategoryMapper; +import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper; +import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper; +import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.db.MapperProxyFactory; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import weaver.conn.RecordSet; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.interfaces.workflow.action.Action; +import weaver.soa.workflow.request.*; +import weaver.workflow.request.RequestManager; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Author: sy + * @Description: 更新福利方案明细信息action + * @Date: 2023/9/18 + **/ +@Slf4j +public class UpdateSISchemeDetailAction implements Action { + + private EncryptUtil encryptUtil = new EncryptUtil(); + + private InsuranceSchemeMapper getInsuranceSchemeMapper() { + return MapperProxyFactory.getProxy(InsuranceSchemeMapper.class); + } + + private InsuranceSchemeDetailMapper getInsuranceSchemeDetailMapper() { + return MapperProxyFactory.getProxy(InsuranceSchemeDetailMapper.class); + } + + private ICategoryMapper getICategoryMapper() { + return MapperProxyFactory.getProxy(ICategoryMapper.class); + } + + private String tableName; + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + @Override + public String execute(RequestInfo requestInfo) { + try { + RequestManager requestManager = requestInfo.getRequestManager(); + User user = requestManager.getUser(); + + DetailTable[] detailTables = requestInfo.getDetailTableInfo().getDetailTable(); + List> detailList = new ArrayList<>(); + if (detailTables.length > 0) { + for(DetailTable dt : detailTables) { + Row[] s = dt.getRow(); + for (Row r : s) { + Cell[] c = r.getCell(); + Map detailMap = Arrays.stream(c).collect(Collectors.toMap(Cell::getName, + property -> Util.null2String(property.getValue()))); + detailList.add(detailMap); + } + + } + } + RecordSet rs = new RecordSet(); + + String queryImageId = "select salaryname,processfield from " + tableName + " where workflowid = ?"; + rs.executeQuery(queryImageId, requestInfo.getWorkflowid()); + + //遍历取出明细表中对应数据 + int detailNo = 0; + List listAll = getICategoryMapper().listAll().stream().filter(f -> f.getIsUse().equals(IsUseEnum.START.getValue())).collect(Collectors.toList()); + List schemeList = getInsuranceSchemeMapper().listAll(); + List updateSchemeDetails = new ArrayList<>(); + for (Map map : detailList) { + detailNo++; + List list = new ArrayList<>(); + while (rs.next()) { + String processField = rs.getString("processfield"); + String salaryName = rs.getString("salaryname"); + String value = map.get(processField); + list.add(new UpdateSISchemeDetailAction.SalaryField(processField, salaryName, value)); + } + rs.beforFirst(); + // 流程数据 + Map importDataMap = SalaryEntityUtil.convert2Map(list, UpdateSISchemeDetailAction.SalaryField::getSalaryName, UpdateSISchemeDetailAction.SalaryField::getValue); + //设置更新对象元素 + String schemeId = importDataMap.getOrDefault("福利方案id", "").toString(); + String schemeName = importDataMap.getOrDefault("福利方案名称", "").toString(); + //查询福利方案 + InsuranceSchemePO targetSchemePO = new InsuranceSchemePO(); + if (StringUtils.isNotBlank(schemeId)) { + targetSchemePO = schemeList.stream().filter(f -> f.getId().equals(Long.valueOf(schemeId))).findFirst().orElse(null); + } else if (StringUtils.isNotBlank(schemeName)) { + targetSchemePO = schemeList.stream().filter(f -> f.getSchemeName().equals(schemeName)).findFirst().orElse(null); + } else { + requestInfo.getRequestManager().setMessage("错误行" + detailNo + ":" + "福利方案id和福利方案名称至少填写一个！"); + return FAILURE_AND_CONTINUE; + } + + if (targetSchemePO == null) { + requestInfo.getRequestManager().setMessage("错误行" + detailNo + ":" + "福利方案id和福利方案名称信息有误，无法匹配到已有福利方案！"); + return FAILURE_AND_CONTINUE; + } + //查询福利方案下的福利项明细 + List insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(targetSchemePO.getId()); + if (insuranceSchemeDetailPOS.size() > 0) { + encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class); + } else { + requestInfo.getRequestManager().setMessage("错误行" + detailNo + ":" + "该福利方案不存在福利项明细，无法进行修改！"); + return FAILURE_AND_CONTINUE; + } + + String paymentScope = importDataMap.getOrDefault("缴纳对象", "").toString(); + if (StringUtils.isBlank(paymentScope)) { + requestInfo.getRequestManager().setMessage("错误行" + detailNo + ":" + "缴纳对象必填！"); + return FAILURE_AND_CONTINUE; + } + + String insuranceId = importDataMap.getOrDefault("福利项id", "").toString(); + String insuranceName = importDataMap.getOrDefault("福利项名称", "").toString(); + + InsuranceSchemeDetailPO targetSchemeDetailPO = new InsuranceSchemeDetailPO(); + if (StringUtils.isNotBlank(insuranceId)) { + targetSchemeDetailPO = insuranceSchemeDetailPOS.stream() + .filter(f -> f.getInsuranceId().equals(Long.valueOf(insuranceId)) && f.getPaymentScope().equals(Integer.valueOf(paymentScope))) + .findFirst().orElse(null); + } else if (StringUtils.isNotBlank(insuranceName)) { + List targetCategoryPOs = listAll.stream().filter(f -> f.getInsuranceName().equals(insuranceName)).collect(Collectors.toList()); + if (targetCategoryPOs .size() == 1) { + targetSchemeDetailPO = insuranceSchemeDetailPOS.stream() + .filter(f -> f.getInsuranceId().equals(targetCategoryPOs.get(0).getId()) && f.getPaymentScope().equals(Integer.valueOf(paymentScope))) + .findFirst().orElse(null); + } else if (targetCategoryPOs.size() > 1) { + requestInfo.getRequestManager().setMessage("错误行" + detailNo + ":" + "福利项名称匹配到多个福利项！"); + return FAILURE_AND_CONTINUE; + } + + } else { + requestInfo.getRequestManager().setMessage("错误行" + detailNo + ":" + "福利项id和福利项名称至少填写一个！"); + return FAILURE_AND_CONTINUE; + } + + if (targetSchemeDetailPO == null) { + requestInfo.getRequestManager().setMessage("错误行" + detailNo + ":" + "福利项id和福利项名称信息有误，无法匹配到方案已有福利项！"); + return FAILURE_AND_CONTINUE; + } + + String isPayment = importDataMap.getOrDefault("是否缴费", "").toString(); + if (StringUtils.isNotBlank(isPayment)) { + targetSchemeDetailPO.setIsPayment(Integer.valueOf(isPayment)); + } + + String upperLimit = importDataMap.getOrDefault("基数上限", "").toString(); + if (StringUtils.isNotBlank(upperLimit)) { + targetSchemeDetailPO.setUpperLimit(upperLimit); + } + String lowerLimit = importDataMap.getOrDefault("基数下限", "").toString(); + if (StringUtils.isNotBlank(lowerLimit)) { + targetSchemeDetailPO.setLowerLimit(lowerLimit); + } + String paymentProportion = importDataMap.getOrDefault("缴纳比例", "").toString(); + if (StringUtils.isNotBlank(paymentProportion)) { + targetSchemeDetailPO.setPaymentProportion(paymentProportion); + } + String fixedCost = importDataMap.getOrDefault("固定费用", "").toString(); + if (StringUtils.isNotBlank(fixedCost)) { + targetSchemeDetailPO.setFixedCost(fixedCost); + } + String validNum = importDataMap.getOrDefault("有效小数位", "").toString(); + if (StringUtils.isNotBlank(validNum)) { + targetSchemeDetailPO.setValidNum(Integer.valueOf(validNum)); + } + String rententionRule = importDataMap.getOrDefault("进位规则", "").toString(); + if (StringUtils.isNotBlank(rententionRule)) { + targetSchemeDetailPO.setRententionRule(Integer.valueOf(rententionRule)); + } + targetSchemeDetailPO.setUpdateTime(new Date()); + + updateSchemeDetails.add(targetSchemeDetailPO); + + } + //更新方案明细 + if (updateSchemeDetails.size() > 0) { + encryptUtil.encryptList(updateSchemeDetails, InsuranceSchemeDetailPO.class); + updateSchemeDetails.forEach(getInsuranceSchemeDetailMapper()::updateAll); + } + + + } catch (Exception e) { + log.error("福利方案更新异常", e); + requestInfo.getRequestManager().setMessage(e.getMessage()); + return FAILURE_AND_CONTINUE; + } + return SUCCESS; + } + + + class SalaryField { + + private String processField; + + private String salaryName; + + private String value; + + public String getProcessField() { + return processField; + } + + public void setProcessField(String processField) { + this.processField = processField; + } + + public String getSalaryName() { + return salaryName; + } + + public void setSalaryName(String salaryName) { + this.salaryName = salaryName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public SalaryField(String processField, String salaryName, String value) { + this.processField = processField; + this.salaryName = salaryName; + this.value = value; + } + } +} diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml index 132fd1c49..dba56d9b9 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeDetailMapper.xml @@ -336,6 +336,12 @@ fixed_cost=#{fixedCost}, + + valid_num=#{validNum}, + + + rentention_rule=#{rententionRule}, + WHERE id = #{id} AND delete_type = 0 From dc93a96c8d703184de527e94d3c68277fb269225 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 20 Sep 2023 14:13:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=EF=BC=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=A0=B8=E7=AE=97=E6=95=B0=E6=8D=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SIAccountServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 95042d4c6..28284861f 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -955,32 +955,32 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { InsuranceAccountDetailPO repairSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.REPAIR.getValue()); InsuranceAccountDetailPO balanceSiAcct = siAcctResultWithEmpAndPayStatus.get(item.getEmployeeId() + "_" + PaymentStatusEnum.BALANCE.getValue()); //取正常缴纳的福利基数信息 - if (StringUtils.isNotEmpty(commonSiAcct.getSocialPaymentBaseString())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getSocialPaymentBaseString())) { Map socialBaseJson = JSON.parseObject(commonSiAcct.getSocialPaymentBaseString(), new HashMap().getClass()); socialBaseJson.forEach((k, v) -> { record.put(k + "socialBase", v); }); } - if (StringUtils.isNotEmpty(commonSiAcct.getFundPaymentBaseString())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getFundPaymentBaseString())) { Map fundBaseJson = JSON.parseObject(commonSiAcct.getFundPaymentBaseString(), new HashMap().getClass()); fundBaseJson.forEach((k, v) -> { record.put(k + "fundBase", v); }); } - if (StringUtils.isNotEmpty(commonSiAcct.getOtherPaymentBaseString())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getOtherPaymentBaseString())) { Map otherBaseJson = JSON.parseObject(commonSiAcct.getOtherPaymentBaseString(), new HashMap().getClass()); otherBaseJson.forEach((k, v) -> { record.put(k + "otherBase", v); }); } //社保-正常缴纳 - if (StringUtils.isNotEmpty(commonSiAcct.getSocialPerJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getSocialPerJson())) { Map socialJson = JSON.parseObject(commonSiAcct.getSocialPerJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "socialCommonPer", v); }); } - if (StringUtils.isNotEmpty(commonSiAcct.getSocialComJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getSocialComJson())) { Map socialJson = JSON.parseObject(commonSiAcct.getSocialComJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "socialCommonCom", v); @@ -1020,13 +1020,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { record.put("socialComBalanceSum", balanceSiAcct != null ? balanceSiAcct.getSocialComSum() : new BigDecimal("0")); //公积金-正常缴纳 - if (StringUtils.isNotEmpty(commonSiAcct.getFundPerJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getFundPerJson())) { Map socialJson = JSON.parseObject(commonSiAcct.getFundPerJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "fundCommonPer", v); }); } - if (StringUtils.isNotEmpty(commonSiAcct.getFundComJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getFundComJson())) { Map socialJson = JSON.parseObject(commonSiAcct.getFundComJson(), new HashMap().getClass()); socialJson.forEach((k, v) -> { record.put(k + "fundCommonCom", v); @@ -1066,13 +1066,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { record.put("fundComBalanceSum", balanceSiAcct != null ? balanceSiAcct.getFundComSum() : new BigDecimal("0")); //其他福利-正常缴纳 - if (StringUtils.isNotEmpty(commonSiAcct.getOtherPerJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getOtherPerJson())) { Map otherJson = JSON.parseObject(commonSiAcct.getOtherPerJson(), new HashMap().getClass()); otherJson.forEach((k, v) -> { record.put(k + "otherCommonPer", v); }); } - if (StringUtils.isNotEmpty(commonSiAcct.getOtherComJson())) { + if (commonSiAcct != null && StringUtils.isNotEmpty(commonSiAcct.getOtherComJson())) { Map otherJson = JSON.parseObject(commonSiAcct.getOtherComJson(), new HashMap().getClass()); otherJson.forEach((k, v) -> { record.put(k + "otherCommonCom", v); From 3167aaab63de99c4f202b1c2f7beec55b1ecdc20 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 20 Sep 2023 17:29:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/sischeme/param/InsuranceSchemeParam.java | 6 ++++++ src/com/engine/salary/service/impl/SISchemeServiceImpl.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java b/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java index fd7deadb1..cdc4b29f4 100644 --- a/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java +++ b/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.sischeme.param; import com.engine.salary.common.BaseQueryParam; +import com.engine.salary.enums.sicategory.PaymentTypeEnum; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,6 +25,11 @@ public class InsuranceSchemeParam extends BaseQueryParam { private WelfareTypeEnum welfareTypeEnum; + /** + * 缴纳类型 + */ + private PaymentTypeEnum paymentTypeEnum; + /** * 方案名称 */ diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 44400f3c4..b4766b277 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -195,6 +195,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { public PageInfo list(InsuranceSchemeParam queryParam) { SalaryAssert.notNull(queryParam.getWelfareTypeEnum(), SalaryI18nUtil.getI18nLabel(84026, "参数错误")); queryParam.setWelfareType(queryParam.getWelfareTypeEnum().getValue()); + if (queryParam.getPaymentTypeEnum() != null) { + queryParam.setPaymentType(queryParam.getPaymentTypeEnum().getValue()); + } Long currentEmployeeId = (long) user.getUID(); List insuranceSchemePOS; Boolean needAuth = getTaxAgentService().isNeedAuth(currentEmployeeId);