Commit 88d75ebc authored by fangxinjiang's avatar fangxinjiang

派单大病&项目查询导出

parent cef21fd8
......@@ -75,6 +75,18 @@ public class TSettleDomainController {
return R.ok(tSettleDomainService.page(page, Wrappers.query(tSettleDomain)));
}
/**
* 不分页查询
*
* @param tSettleDomain 项目表
* @return
*/
@Operation(summary = "不分页查询", description = "不分页查询")
@GetMapping("/noPage")
public R<List<TSettleDomain>> getTSettleDomainNoPage(TSettleDomain tSettleDomain) {
return R.ok(tSettleDomainService.list(Wrappers.query(tSettleDomain)));
}
/**
* 通过id查询项目表
......@@ -267,7 +279,7 @@ public class TSettleDomainController {
/**
* 修改项目表--EKP调用接口
* @author hyc
* @param list 项目表
* @param jsonStr 项目表
* @return R
*/
@Operation(summary = "修改项目表--EKP调用接口", description = "修改项目表--EKP调用接口")
......
......@@ -1047,6 +1047,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund.setUpperLimit(socialSet.getUpperLimit());
socialFund.setPayPolicy(socialSet.getPayPolicy());
socialFund.setLatestCardinality(socialSet.getInsuranceIsLatestCardinality());
//配置没有大病清理社保公积金查询里面残留的历史大病信息
if (CommonConstants.ONE_STRING.equals(socialSet.getIsIllness())
&& Common.isNotNull(socialFund.getBigailmentHandle())){
socialFund.setBigailmentHandle(null);
socialFund.setBigailmentStart(null);
socialFund.setUnitBigailmentCardinal(null);
socialFund.setUnitBigailmentPer(null);
socialFund.setPersonalBigailmentCardinal(null);
socialFund.setPersonalBigailmentPer(null);
socialFund.setPersonalBigailmentMoney(null);
socialFund.setUnitBigailmentMoney(null);
}
}
}
if (Common.isNotNull(excel.getProvidentHousehold())){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment