diff --git a/src/com/engine/salary/biz/EmployBiz.java b/src/com/engine/salary/biz/EmployBiz.java index 564dc18eb..1b8cac00f 100644 --- a/src/com/engine/salary/biz/EmployBiz.java +++ b/src/com/engine/salary/biz/EmployBiz.java @@ -34,4 +34,15 @@ public class EmployBiz extends BaseBean { sqlSession.close(); } } + + + public List getEmployeeByIdsAll(List list) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + EmployMapper mapper = sqlSession.getMapper(EmployMapper.class); + return mapper.getEmployeeByIdsAll(list); + } finally { + sqlSession.close(); + } + } } diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 085ae0194..00edd82d0 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -1,11 +1,29 @@ package com.engine.salary.biz; import com.engine.salary.entity.datacollection.DataCollectionEmployee; -import com.engine.salary.entity.sicategory.dto.ICategoryFormDTO; +import com.engine.salary.entity.siarchives.bo.InsuranceArchivesBO; +import com.engine.salary.entity.siarchives.dto.InsuranceArchivesBaseDTO; +import com.engine.salary.entity.siarchives.dto.InsuranceArchivesFundSchemeDTO; +import com.engine.salary.entity.siarchives.dto.InsuranceArchivesOtherSchemeDTO; +import com.engine.salary.entity.siarchives.dto.InsuranceArchivesSocialSchemeDTO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO; +import com.engine.salary.entity.sischeme.po.InsuranceSchemePO; +import com.engine.salary.enums.sicategory.UndertakerEnum; +import com.engine.salary.enums.sicategory.WelfareTypeEnum; +import com.engine.salary.mapper.archives.FundSchemeMapper; +import com.engine.salary.mapper.archives.OtherSchemeMapper; +import com.engine.salary.mapper.archives.SocialSchemeMapper; import com.engine.salary.util.SalaryAssert; +import com.engine.salary.util.SalaryDateUtil; +import org.apache.ibatis.session.SqlSession; +import weaver.conn.mybatis.MyBatisFactory; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** @@ -16,13 +34,146 @@ import java.util.List; **/ public class SIArchivesBiz { - public ICategoryFormDTO getBaseForm(Integer welfareType, Long employeeId) { + public Map getBaseForm(WelfareTypeEnum welfareType, Long employeeId, Long operateId) { + Map data = new HashMap<>(16); SalaryAssert.notNull(employeeId, "员工id不可为空"); EmployBiz employBiz = new EmployBiz(); - List employeeByIds = employBiz.getEmployeeByIds(Collections.singletonList(employeeId)); + List employeeByIds = employBiz.getEmployeeByIdsAll(Collections.singletonList(employeeId)); SalaryAssert.notEmpty(employeeByIds,"员工信息不存在"); DataCollectionEmployee item = employeeByIds.get(0); - return null; + + + if (welfareType == null) { + //基础信息表单 + InsuranceArchivesBaseDTO insuranceArchivesBaseDTO = InsuranceArchivesBaseDTO.builder().department(item.getDepartmentName()) + .hiredate(SalaryDateUtil.getFormatLocalDate(item.getCompanystartdate())) + .position(item.getJobtitleName()) + .username(item.getUsername()) + .telephone(item.getMobile()) + .dimissionDate(SalaryDateUtil.getFormatLocalDate(item.getDissmissdate())) + .build(); + +// if (item.getStatus() == UserStatus.unavailable) { +// InsuranceArchivesListParam insuranceArchivesListParam = new InsuranceArchivesListParam(); +// insuranceArchivesListParam.setEmployeeIds(Collections.singletonList(employeeId)); +// List insuranceArchivesEmployeePOS = siArchivesSocialMapper.queryEmployeeList(insuranceArchivesListParam, tenantKey); +// if (CollectionUtils.isNotEmpty(insuranceArchivesEmployeePOS)) { +// insuranceArchivesBaseDTO.setDimissionDate(SalaryDateUtil.getFormatLocalDate(insuranceArchivesEmployeePOS.get(0).getDimissionDate())); +// } +// } + + //WeaForm weaForm = SalaryFormatUtil.getInstance().buildForm(InsuranceArchivesBaseDTO.class, insuranceArchivesBaseDTO); + // weaForm.getGroups().add(new WeaFormGroup("g1", "员工信息")); + // weaForm.getLayout().forEach(items -> items.forEach(e -> e.setGroupId("g1"))); + data.put("data",insuranceArchivesBaseDTO); + return data; + } + + SISchemeBiz siSchemeBiz = new SISchemeBiz(); + List list = siSchemeBiz.listAll(); + //返回组件 + + //返回数据 + switch (welfareType) { + case SOCIAL_SECURITY: + InsuranceArchivesSocialSchemeDTO insuranceArchivesSocialSchemeDTO = buildSocialForm(list, employeeId, operateId ); + data.put("data",insuranceArchivesSocialSchemeDTO); + break; + case ACCUMULATION_FUND: + InsuranceArchivesFundSchemeDTO insuranceArchivesFundSchemeDTO = buildFundForm(list, employeeId, operateId); + data.put("data",insuranceArchivesFundSchemeDTO); + break; + case OTHER: + InsuranceArchivesOtherSchemeDTO insuranceArchivesOtherSchemeDTO = buildOtherForm(list, employeeId, operateId); + data.put("data",insuranceArchivesOtherSchemeDTO); + break; + default: + data.put("data",""); + } + return data; + } + + /** + * 其它基础表单 + * @param list + * @param employeeId + * @param operateId + * @return + */ + public InsuranceArchivesOtherSchemeDTO buildOtherForm(List list, Long employeeId, Long operateId) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + OtherSchemeMapper otherSchemeMapper = sqlSession.getMapper(OtherSchemeMapper.class); + InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO = otherSchemeMapper.getOtherByEmployeeId(employeeId); + InsuranceArchivesOtherSchemeDTO data = InsuranceArchivesBO.convertOtherPOtoDTO(insuranceArchivesOtherSchemePO, employeeId); + if (insuranceArchivesOtherSchemePO == null) { + data.setEmployeeId(employeeId); + data.setUnderTake(UndertakerEnum.SCOPE_COMPANY); + } + return data; + }finally { + sqlSession.close(); + } } + + /** + * 公积金基础表单 + * @param list + * @param employeeId + * @param operateId + * @return + */ + public InsuranceArchivesFundSchemeDTO buildFundForm(List list, Long employeeId, Long operateId) { + + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + FundSchemeMapper fundSchemeMapper = sqlSession.getMapper(FundSchemeMapper.class); + InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO = fundSchemeMapper.getFundByEmployeeId(employeeId); + InsuranceArchivesFundSchemeDTO data = InsuranceArchivesBO.convertFundPOtoDTO(insuranceArchivesFundSchemePO, employeeId); + if (insuranceArchivesFundSchemePO == null) { + data.setEmployeeId(employeeId); + data.setUnderTake(UndertakerEnum.SCOPE_COMPANY); + } + return data; + }finally { + sqlSession.close(); + } + + } + + /** + * 社保基础表单 + * @param list + * @param employeeId + * @param operateId + * @return + */ + public InsuranceArchivesSocialSchemeDTO buildSocialForm(List list, Long employeeId, Long operateId) { + InsuranceArchivesSocialSchemePO insuranceArchivesSocialSchemePO = getSocialByEmployeeId(employeeId); + InsuranceArchivesSocialSchemeDTO data = InsuranceArchivesBO.convertSocialPOtoDTO(insuranceArchivesSocialSchemePO, employeeId); + if (insuranceArchivesSocialSchemePO == null) { + data.setEmployeeId(employeeId); + data.setUnderTake(UndertakerEnum.SCOPE_COMPANY); + } + return data; + } + + + /** + * 获取社保档案表 + * @param employeeId + * @return + */ + public InsuranceArchivesSocialSchemePO getSocialByEmployeeId(Long employeeId) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SocialSchemeMapper socialSchemeMapper = sqlSession.getMapper(SocialSchemeMapper.class); + return socialSchemeMapper.getSocialByEmployeeId(employeeId); + }finally { + sqlSession.close(); + } + } + + } diff --git a/src/com/engine/salary/biz/SISchemeBiz.java b/src/com/engine/salary/biz/SISchemeBiz.java index af24126e3..431944bac 100644 --- a/src/com/engine/salary/biz/SISchemeBiz.java +++ b/src/com/engine/salary/biz/SISchemeBiz.java @@ -58,7 +58,7 @@ public class SISchemeBiz { * @param id 方案主键id * @return form */ - private List getSchemeDetailFormDTO(WelfareTypeEnum welfareTypeEnum, Long id) { + public List getSchemeDetailFormDTO(WelfareTypeEnum welfareTypeEnum, Long id) { List insuranceCategoryPOS = listByWelfareType(welfareTypeEnum.getValue()); List insuranceSchemeDetailDTOList = new ArrayList<>(); insuranceCategoryPOS.forEach(item -> { @@ -125,7 +125,7 @@ public class SISchemeBiz { * @param welfareType * @return */ - private List listByWelfareType(Integer welfareType) { + public List listByWelfareType(Integer welfareType) { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { ICategoryMapper iCategoryMapper = sqlSession.getMapper(ICategoryMapper.class); @@ -193,6 +193,25 @@ public class SISchemeBiz { } } + + /** + * 获取所有方案 + * @return + */ + public List listAll() { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class); + List insuranceSchemePOList = insuranceSchemeMapper.listAll(); + + return insuranceSchemePOList; + } finally { + sqlSession.close(); + } + } + + + /** * 社保方案基础信息明细表 * @param primaryId diff --git a/src/com/engine/salary/cmd/archives/SIArchivesGetBaseFormCmd.java b/src/com/engine/salary/cmd/archives/SIArchivesGetBaseFormCmd.java deleted file mode 100644 index 7474113dd..000000000 --- a/src/com/engine/salary/cmd/archives/SIArchivesGetBaseFormCmd.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.engine.salary.cmd.archives; - -import com.api.browser.bean.SearchConditionItem; -import com.api.browser.util.ConditionFactory; -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.interceptor.CommandContext; -import com.engine.salary.biz.SIArchivesBiz; -import com.engine.salary.biz.SICategoryBiz; -import com.engine.salary.entity.sicategory.dto.ICategoryFormDTO; -import weaver.hrm.User; - -import java.util.HashMap; -import java.util.Map; - -/** - * @Author weaver_cl - * @Description: TODO - * @Date 2022/3/12 - * @Version V1.0 - **/ -public class SIArchivesGetBaseFormCmd extends AbstractCommonCommand> { - - - public SIArchivesGetBaseFormCmd(Map params, User user) { - this.user = user; - this.params = params; - } - - @Override - public BizLogContext getLogContext() { - return null; - } - - @Override - public Map execute(CommandContext commandContext) { - Map apidatas = new HashMap<>(16); - SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); - Integer welfareType = (Integer) params.get("welfareType"); - Long employeeId = (Long) params.get("employeeId"); - ICategoryFormDTO form = siArchivesBiz.getBaseForm(welfareType,employeeId); - apidatas.put("form",form); - - ConditionFactory conditionFactory = new ConditionFactory(user); - Map items = new HashMap<>(); - - - return apidatas; - } -} diff --git a/src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java index 4258ad2e5..c727231c1 100644 --- a/src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java +++ b/src/com/engine/salary/cmd/datacollection/AddUpDeductionImportCmd.java @@ -122,7 +122,7 @@ public class AddUpDeductionImportCmd extends AbstractCommonCommand employeeSameIds = employees.stream().filter(e -> (StringUtils.isBlank(userName) || Objects.equals(e.getUsername(), userName)) - && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDeparmentName(), deparmentName))).map(DataCollectionEmployee::getEmployeeId) + && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName))).map(DataCollectionEmployee::getEmployeeId) .collect(Collectors.toList()); diff --git a/src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java b/src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java index 7e7d943f1..fe7cf8c71 100644 --- a/src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java +++ b/src/com/engine/salary/cmd/datacollection/AddUpSituationImportCmd.java @@ -117,7 +117,7 @@ public class AddUpSituationImportCmd extends AbstractCommonCommand employeeSameIds = employees.stream().filter(e -> (StringUtils.isBlank(userName) || Objects.equals(e.getUsername(), userName)) - && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDeparmentName(), deparmentName))).map(DataCollectionEmployee::getEmployeeId) + && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName))).map(DataCollectionEmployee::getEmployeeId) .collect(Collectors.toList()); diff --git a/src/com/engine/salary/cmd/datacollection/OtherDeductionImportCmd.java b/src/com/engine/salary/cmd/datacollection/OtherDeductionImportCmd.java index bbd1f2e9b..e51bac20f 100644 --- a/src/com/engine/salary/cmd/datacollection/OtherDeductionImportCmd.java +++ b/src/com/engine/salary/cmd/datacollection/OtherDeductionImportCmd.java @@ -119,7 +119,7 @@ public class OtherDeductionImportCmd extends AbstractCommonCommand employeeSameIds = employees.stream().filter(e -> (StringUtils.isBlank(userName) || Objects.equals(e.getUsername(), userName)) - && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDeparmentName(), deparmentName))).map(DataCollectionEmployee::getEmployeeId) + && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName))).map(DataCollectionEmployee::getEmployeeId) .collect(Collectors.toList()); diff --git a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java index 26a85ae63..93afd6c4f 100644 --- a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java +++ b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java @@ -5,6 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + /** * @Description: 员工基本信息 * @Author: wangxiangzhong @@ -24,5 +26,18 @@ public class DataCollectionEmployee { private String username; // //部门") - private String deparmentName; + private String departmentName; + + //岗位 + private String jobtitleName; + + //入职日期 + private Date companystartdate; + + //手机号 + private String mobile; + + //离职日期 + private Date dissmissdate; + } diff --git a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java new file mode 100644 index 000000000..c7d3a429b --- /dev/null +++ b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java @@ -0,0 +1,82 @@ +package com.engine.salary.entity.siarchives.bo; + +import com.engine.salary.entity.siarchives.dto.InsuranceArchivesFundSchemeDTO; +import com.engine.salary.entity.siarchives.dto.InsuranceArchivesOtherSchemeDTO; +import com.engine.salary.entity.siarchives.dto.InsuranceArchivesSocialSchemeDTO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO; +import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO; +import com.engine.salary.enums.sicategory.UndertakerEnum; +import com.engine.salary.enums.sicategory.WelfareTypeEnum; +import com.engine.salary.util.SalaryEnumUtil; + +import java.util.Objects; + +/** + * @Author weaver_cl + * @Description: TODO + * @Date 2022/3/15 + * @Version V1.0 + **/ +public class InsuranceArchivesBO { + + public static InsuranceArchivesSocialSchemeDTO convertSocialPOtoDTO(InsuranceArchivesSocialSchemePO po, Long employeeId) { + if (Objects.isNull(po)) { + return InsuranceArchivesSocialSchemeDTO.builder().build(); + } + return InsuranceArchivesSocialSchemeDTO.builder() + .socialName(po.getSocialSchemeId() == null ? null : String.valueOf(po.getSocialSchemeId())) + .welfareType(SalaryEnumUtil.enumMatchByValue(po.getWelfareType(), WelfareTypeEnum.values(), WelfareTypeEnum.class)) + .id(po.getId()) + .employeeId(po.getEmployeeId()) + .nonPayment(po.getNonPayment()) + .paymentOrganization(po.getPaymentOrganization()) + .socialEndTime(po.getSocialEndTime()) + .socialStartTime(po.getSocialStartTime()) + .schemeAccount(po.getSocialAccount()) + .schemePaymentBaseString(po.getSocialPaymentBaseString()) + .underTake(SalaryEnumUtil.enumMatchByValue(po.getUnderTake(), UndertakerEnum.values(), UndertakerEnum.class)) + .build(); + } + + + public static InsuranceArchivesFundSchemeDTO convertFundPOtoDTO(InsuranceArchivesFundSchemePO po, Long employeeId) { + if (Objects.isNull(po)) { + return InsuranceArchivesFundSchemeDTO.builder().build(); + } + return InsuranceArchivesFundSchemeDTO.builder() + .id(po.getId()) + .employeeId(po.getEmployeeId()) + .fundAccount(po.getFundAccount()) + .fundEndTime(po.getFundEndTime()) + .fundSchemeId(po.getFundSchemeId()) + .paymentOrganization(po.getPaymentOrganization()) + .fundPaymentBaseString(po.getFundPaymentBaseString()) + .fundStartTime(po.getFundStartTime()) + .supplementFundAccount(po.getSupplementFundAccount()) + .nonPayment(po.getNonPayment()) + .underTake(SalaryEnumUtil.enumMatchByValue(po.getUnderTake(), UndertakerEnum.values(), UndertakerEnum.class)) + .welfareType(SalaryEnumUtil.enumMatchByValue(po.getWelfareType(), WelfareTypeEnum.values(), WelfareTypeEnum.class)) + .build(); + } + + public static InsuranceArchivesOtherSchemeDTO convertOtherPOtoDTO(InsuranceArchivesOtherSchemePO po, Long employeeId) { + if (Objects.isNull(po)) { + return InsuranceArchivesOtherSchemeDTO.builder().build(); + } + return InsuranceArchivesOtherSchemeDTO.builder() + .id(po.getId()) + .employeeId(po.getEmployeeId()) + .underTake(SalaryEnumUtil.enumMatchByValue(po.getUnderTake(), UndertakerEnum.values(), UndertakerEnum.class)) + .nonPayment(po.getNonPayment()) + .otherName(po.getOtherSchemeId() == null ? null : String.valueOf(po.getOtherSchemeId())) + .otherSchemeId(po.getOtherSchemeId()) + .otherPaymentBaseString(po.getOtherPaymentBaseString()) + .otherStartTime(po.getOtherStartTime()) + .otherEndTime(po.getOtherEndTime()) + .paymentOrganization(po.getPaymentOrganization()) + .welfareType(SalaryEnumUtil.enumMatchByValue(po.getWelfareType(), WelfareTypeEnum.values(), WelfareTypeEnum.class)) + .build(); + } + +} diff --git a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseDTO.java b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseDTO.java new file mode 100644 index 000000000..4026b072a --- /dev/null +++ b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesBaseDTO.java @@ -0,0 +1,49 @@ +package com.engine.salary.entity.siarchives.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author weaver_cl + * @Description: TODO 员工档案基础信息 + * @Date 2022/3/15 + * @Version V1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InsuranceArchivesBaseDTO { + + /** + * 姓名 + */ + private String username; + + /** + * 部门 + */ + private String department; + + /** + * 岗位 + */ + private String position; + + /** + * 入职时间 + */ + private String hiredate; + + /** + * 手机号 + */ + private String telephone; + + /** + * 离职时间 + */ + private String dimissionDate; +} diff --git a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesFundSchemeDTO.java b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesFundSchemeDTO.java new file mode 100644 index 000000000..a0ee1c7a9 --- /dev/null +++ b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesFundSchemeDTO.java @@ -0,0 +1,69 @@ +package com.engine.salary.entity.siarchives.dto; + +import com.engine.salary.enums.sicategory.UndertakerEnum; +import com.engine.salary.enums.sicategory.WelfareTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +/** + * @Author weaver_cl + * @Description: TODO 员工福利档案公积金 + * @Date 2022/3/15 + * @Version V1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InsuranceArchivesFundSchemeDTO { + + //主键id + private Long id; + + //员工id + private Long employeeId; + + //暂不缴纳 + private Integer nonPayment; + + //福利类型 + private WelfareTypeEnum welfareType; + + //公积金起始缴纳月 + private String fundStartTime; + + + //公积金最后缴纳月 + private String fundEndTime; + + + //公积金方案名称 + private Long fundName; + + //公积金方案id + private Long fundSchemeId; + + //private List siFundList; + + //公积金账号 + private String fundAccount; + + + //补充公积金账号 + private String supplementFundAccount; + + + //公积金缴纳组织 + private Long paymentOrganization; + + //private List paymentOrganizationList; + + // 公积金个人实际承担方 + private UndertakerEnum underTake; + + //缴纳基数 + private String fundPaymentBaseString; +} diff --git a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesOtherSchemeDTO.java b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesOtherSchemeDTO.java new file mode 100644 index 000000000..21b2867ec --- /dev/null +++ b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesOtherSchemeDTO.java @@ -0,0 +1,61 @@ +package com.engine.salary.entity.siarchives.dto; + +import com.engine.salary.enums.sicategory.UndertakerEnum; +import com.engine.salary.enums.sicategory.WelfareTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +/** + * @Author weaver_cl + * @Description: TODO 员工福利档案其他福利 + * @Date 2022/3/15 + * @Version V1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InsuranceArchivesOtherSchemeDTO { + + //主键id + private Long id; + + //员工id + private Long employeeId; + + //暂不缴纳 + private Integer nonPayment; + + //福利类型 + private WelfareTypeEnum welfareType; + + //其他福利起始缴纳月 + private String otherStartTime; + + //其他福利最后缴纳月 + private String otherEndTime; + + //其他福利方案名称 + private String otherName; + + //其他福利方案id + private Long otherSchemeId; + + //private List siOtherList; + + + //其他福利缴纳组织 + private Long paymentOrganization; + + //private List paymentOrganizationList; + + //其他福利个人实际承担方 + private UndertakerEnum underTake; + + private String otherPaymentBaseString; + + //private WeaForm otherPaymentBase; +} diff --git a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java new file mode 100644 index 000000000..a8c70c9a8 --- /dev/null +++ b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java @@ -0,0 +1,63 @@ +package com.engine.salary.entity.siarchives.dto; + +import com.engine.salary.enums.sicategory.UndertakerEnum; +import com.engine.salary.enums.sicategory.WelfareTypeEnum; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +/** + * @Author weaver_cl + * @Description: TODO 员工福利档案社保 + * @Date 2022/3/15 + * @Version V1.0 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class InsuranceArchivesSocialSchemeDTO { + + //主键id + private Long id; + + //员工id + private Long employeeId; + + //暂不缴纳 + private Integer nonPayment; + + //福利类型 + private WelfareTypeEnum welfareType; + + //社保起始缴纳月 + private String socialStartTime; + + //社保最后缴纳月 + private String socialEndTime; + + //社保方案名称 + private String socialName; + + //社保方案id + private String socialSchemeId; + + //private List siSocialList; + + //社保账号 + private String schemeAccount; + + //社保缴纳组织 + private Long paymentOrganization; + + //private List paymentOrganizationList; + + //社保个人实际承担方 + private UndertakerEnum underTake; + + //社保缴纳基数 + private String schemePaymentBaseString; + +} diff --git a/src/com/engine/salary/mapper/archives/FundSchemeMapper.java b/src/com/engine/salary/mapper/archives/FundSchemeMapper.java new file mode 100644 index 000000000..accb48c37 --- /dev/null +++ b/src/com/engine/salary/mapper/archives/FundSchemeMapper.java @@ -0,0 +1,20 @@ +package com.engine.salary.mapper.archives; + +import com.engine.salary.entity.siarchives.po.InsuranceArchivesFundSchemePO; +import org.apache.ibatis.annotations.Param; + +/** + * @Author weaver_cl + * @Description: TODO + * @Date 2022/3/15 + * @Version V1.0 + **/ +public interface FundSchemeMapper { + + /** + * 根据员工id获取 + * @param employeeId + * @return + */ + InsuranceArchivesFundSchemePO getFundByEmployeeId(@Param("employeeId")Long employeeId); +} diff --git a/src/com/engine/salary/mapper/archives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/archives/FundSchemeMapper.xml new file mode 100644 index 000000000..c7ff70287 --- /dev/null +++ b/src/com/engine/salary/mapper/archives/FundSchemeMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + t.id + , t.employee_id + , t.non_payment + , t.welfare_type + , t.fund_start_time + , t.fund_end_time + , t.fund_scheme_id + , t.fund_account + , t.supplement_fund_account + , t.payment_organization + , t.under_take + , t.fund_payment_base_string + , t.create_time + , t.update_time + , t.creator + , t.delete_type + , t.tenant_key + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/archives/OtherSchemeMapper.java b/src/com/engine/salary/mapper/archives/OtherSchemeMapper.java new file mode 100644 index 000000000..12040fd1c --- /dev/null +++ b/src/com/engine/salary/mapper/archives/OtherSchemeMapper.java @@ -0,0 +1,20 @@ +package com.engine.salary.mapper.archives; + +import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO; +import org.apache.ibatis.annotations.Param; + +/** + * @Author weaver_cl + * @Description: TODO + * @Date 2022/3/15 + * @Version V1.0 + **/ +public interface OtherSchemeMapper { + + /** + * 根据员工id获取 + * @param employeeId + * @return + */ + InsuranceArchivesOtherSchemePO getOtherByEmployeeId(@Param("employeeId")Long employeeId); +} diff --git a/src/com/engine/salary/mapper/archives/OtherSchemeMapper.xml b/src/com/engine/salary/mapper/archives/OtherSchemeMapper.xml new file mode 100644 index 000000000..4dfc82731 --- /dev/null +++ b/src/com/engine/salary/mapper/archives/OtherSchemeMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + t.id + , t.employee_id + , t.non_payment + , t.welfare_type + , t.other_start_time + , t.other_end_time + , t.other_scheme_id + , t.other_account + , t.payment_organization + , t.under_take + , t.other_payment_base_string + , t.create_time + , t.update_time + , t.creator + , t.delete_type + , t.tenant_key + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/archives/SocialSchemeMapper.java b/src/com/engine/salary/mapper/archives/SocialSchemeMapper.java new file mode 100644 index 000000000..6fdba9daa --- /dev/null +++ b/src/com/engine/salary/mapper/archives/SocialSchemeMapper.java @@ -0,0 +1,20 @@ +package com.engine.salary.mapper.archives; + +import com.engine.salary.entity.siarchives.po.InsuranceArchivesSocialSchemePO; +import org.apache.ibatis.annotations.Param; + +/** + * @Author weaver_cl + * @Description: TODO + * @Date 2022/3/15 + * @Version V1.0 + **/ +public interface SocialSchemeMapper { + + /** + * 根据员工id获取 + * @param employeeId + * @return + */ + InsuranceArchivesSocialSchemePO getSocialByEmployeeId(@Param("employeeId")Long employeeId); +} diff --git a/src/com/engine/salary/mapper/archives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/archives/SocialSchemeMapper.xml new file mode 100644 index 000000000..e937723bf --- /dev/null +++ b/src/com/engine/salary/mapper/archives/SocialSchemeMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + t.id + , t.employee_id + , t.non_payment + , t.welfare_type + , t.social_start_time + , t.social_end_time + , t.social_scheme_id + , t.social_account + , t.payment_organization + , t.under_take + , t.social_payment_base_string + , t.create_time + , t.update_time + , t.creator + , t.delete_type + , t.tenant_key + + + + + + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.java b/src/com/engine/salary/mapper/datacollection/EmployMapper.java index 7d55529ec..def5bb42f 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.java +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.java @@ -15,4 +15,7 @@ public interface EmployMapper { List listEmployee(); List getEmployeeByIds(@Param("collection") List ids); + + List getEmployeeByIdsAll(@Param("collection") List ids); + } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index 2bc6043fe..8e4c67cd9 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -13,7 +13,7 @@ + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/sicategory/ICategoryMapper.java b/src/com/engine/salary/mapper/sicategory/ICategoryMapper.java index 3e2128ba5..dd4877f17 100644 --- a/src/com/engine/salary/mapper/sicategory/ICategoryMapper.java +++ b/src/com/engine/salary/mapper/sicategory/ICategoryMapper.java @@ -1,7 +1,6 @@ package com.engine.salary.mapper.sicategory; import com.engine.salary.entity.sicategory.po.ICategoryPO; -import com.engine.salary.enums.sicategory.WelfareTypeEnum; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -23,6 +22,14 @@ public interface ICategoryMapper { */ ICategoryPO getById(Long id); + + /** + * 查询所有 + * @return + */ + List listAll(); + + /** * 根据福利名称获取 * @param insuranceName diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java index 3d28a78e3..3786d2260 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.java @@ -1,8 +1,6 @@ package com.engine.salary.mapper.sischeme; -import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; import com.engine.salary.entity.sischeme.po.InsuranceSchemePO; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -43,5 +41,11 @@ public interface InsuranceSchemeMapper { */ List listByName(String schemeName); + /** + * 查询所有 + * @return + */ + List listAll(); + } diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml index d673ad89d..7875824ea 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml @@ -50,6 +50,14 @@ ORDER BY id DESC + + getBaseForm(Map params) { - return null; + Map apidatas = new HashMap<>(16); + SIArchivesBiz siArchivesBiz = new SIArchivesBiz(); + WelfareTypeEnum welfareTypeEnum = (WelfareTypeEnum)params.get("welfareTypeEnum"); + Long employeeId = Long.valueOf(Util.null2String(params.get("employeeId"))); + apidatas = siArchivesBiz.getBaseForm(welfareTypeEnum, employeeId,(long) user.getUID()); + if (welfareTypeEnum != null) { + + } + return apidatas; } } diff --git a/src/com/engine/salary/web/SIArchivesController.java b/src/com/engine/salary/web/SIArchivesController.java index 13c772e80..196966479 100644 --- a/src/com/engine/salary/web/SIArchivesController.java +++ b/src/com/engine/salary/web/SIArchivesController.java @@ -54,13 +54,9 @@ public class SIArchivesController { @QueryParam(value = "employeeId") Long employeeId) { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); - if (Objects.nonNull(welfareTypeEnum)){ - InsuranceSchemeDTO insuranceSchemeDTO = InsuranceSchemeDTO.builder().welfareType(welfareTypeEnum).build(); - Integer welfareType = insuranceSchemeDTO.getWelfareType().getValue(); - map.put("welfareType",welfareType); - } + map.put("welfareTypeEnum",welfareTypeEnum); map.put("employeeId",employeeId); - return ResponseResult.run(getService(user)::getBaseForm, ParamUtil.request2Map(request)); + return ResponseResult.run(getService(user)::getBaseForm, map); }