福利方案分页创建

This commit is contained in:
MustangDeng 2022-05-18 16:37:23 +08:00
parent 51e5649dd8
commit fcbc6c7202
4 changed files with 18 additions and 3 deletions

View File

@ -315,6 +315,9 @@ public class
SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
try {
InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class);
List<InsuranceSchemePO> listResult = insuranceSchemeMapper.listByName(schemeName);
SalaryAssert.isEmpty(listResult, "方案名称重复");
InsuranceSchemeDetailMapper insuranceSchemeDetailMapper = sqlSession.getMapper(InsuranceSchemeDetailMapper.class);
if (Objects.isNull(id)) {
throw new SalaryRunTimeException("方案id为空");

View File

@ -5,6 +5,7 @@ import com.engine.salary.entity.sicategory.dto.ICategoryFormDTO;
import com.engine.salary.entity.sicategory.po.ICategoryPO;
import com.engine.salary.enums.sicategory.DataTypeEnum;
import com.engine.salary.util.SalaryEnumUtil;
import dm.jdbc.util.IdGenerator;
import java.util.Date;
import java.util.Objects;
@ -22,7 +23,7 @@ public class ICategoryBO {
return null;
}
return ICategoryPO.builder()
//.id(IdGenerator.generate())
.id(IdGenerator.generate())
.paymentScope(SalaryEnumUtil.enumArrToString(dto.getPaymentScope()))
.welfareType(dto.getWelfareType().getValue())
.insuranceName(dto.getInsuranceName())

View File

@ -52,6 +52,7 @@
>
INSERT INTO hrsa_insurance_category
<trim prefix="(" suffix=")" suffixOverrides=",">
id,
insurance_name,
welfare_type,
is_use,
@ -64,6 +65,7 @@
tenant_key,
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
#{id},
#{insuranceName},
#{welfareType},
#{isUse},

View File

@ -16,6 +16,8 @@ import com.engine.salary.entity.datacollection.po.AttendQuoteDataPO;
import com.engine.salary.entity.datacollection.po.AttendQuoteDataValuePO;
import com.engine.salary.entity.datacollection.po.AttendQuoteFieldPO;
import com.engine.salary.entity.datacollection.po.AttendQuotePO;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctRecordListDTO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryarchive.dto.TaxAgentListDTO;
import com.engine.salary.entity.salarysob.po.SalarySobPO;
import com.engine.salary.entity.siaccount.param.DSTenantKeyThreadVar;
@ -162,8 +164,10 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
@Override
public PageInfo<InsuranceSchemeListDTO> list(InsuranceSchemeParam queryParam) {
SalaryAssert.notNull(queryParam.getWelfareTypeEnum(), SalaryI18nUtil.getI18nLabel( 84026, "参数错误"));
PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
List<InsuranceSchemePO> insuranceSchemePOS = MapperProxyFactory.getProxy(InsuranceSchemeMapper.class).listByWelfareType(queryParam.getWelfareTypeEnum().getValue());
PageInfo<InsuranceSchemePO> pageInfo = new PageInfo<>(insuranceSchemePOS, InsuranceSchemePO.class);
List<InsuranceSchemeListDTO> collect = insuranceSchemePOS.stream().map(item ->
InsuranceSchemeListDTO.builder()
.id(item.getId())
@ -175,8 +179,13 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
.remarks(item.getRemarks())
.build()
).collect(Collectors.toList());
PageInfo<InsuranceSchemeListDTO> pageInfo = new PageInfo<>(collect,InsuranceSchemeListDTO.class);
return pageInfo;
PageInfo<InsuranceSchemeListDTO> dtoPage = new PageInfo<>(InsuranceSchemeListDTO.class);
dtoPage.setPageNum(queryParam.getCurrent());
dtoPage.setPageSize(queryParam.getPageSize());
dtoPage.setTotal(pageInfo.getTotal());
dtoPage.setList(collect);
return dtoPage;
}
@Override