Commit 0a826d3d authored by hongguangwu's avatar hongguangwu

MVP1.7.17-商险续签待办3

parent 9290eb79
...@@ -74,6 +74,19 @@ public class TEmpContractAlertController { ...@@ -74,6 +74,19 @@ public class TEmpContractAlertController {
setAuth(searchVo); setAuth(searchVo);
return R.ok(tEmpContractAlertService.pageDiy(page, searchVo)); return R.ok(tEmpContractAlertService.pageDiy(page, searchVo));
} }
/**
* 合同待续签-分页查询
* @param page 分页对象
* @param searchVo 员工合同续签待办
* @return
*/
@Operation(summary = "给自动化用的-合同待续签-分页查询", description = "合同待续签-分页查询")
@GetMapping("/getAutoPage" )
public R<IPage<TEmpContractAlert>> getAutoPage(Page page, ContractAlertSearchVo searchVo) {
setAuth(searchVo);
return R.ok(tEmpContractAlertService.getAutoPage(page, searchVo));
}
/** /**
* 不分页查询 * 不分页查询
* @param searchVo 员工合同续签待办 * @param searchVo 员工合同续签待办
......
...@@ -46,6 +46,9 @@ public interface TAutoMainRelMapper extends BaseMapper<TAutoMainRel> { ...@@ -46,6 +46,9 @@ public interface TAutoMainRelMapper extends BaseMapper<TAutoMainRel> {
// 获取全量自动化项目与商险续保周期 // 获取全量自动化项目与商险续保周期
List<TAutoMainRel> getAutoDeptMap(); List<TAutoMainRel> getAutoDeptMap();
// 获取所有自动化的项目编号
List<String> getAutoDeptNo();
Long noPageCountDiy(@Param("tAutoMainRel")TAutoMainRelSearchVo tAutoMainRel); Long noPageCountDiy(@Param("tAutoMainRel")TAutoMainRelSearchVo tAutoMainRel);
List<TAutoMainRelExportVo> noPageDiy(@Param("tAutoMainRel")TAutoMainRelSearchVo tAutoMainRel); List<TAutoMainRelExportVo> noPageDiy(@Param("tAutoMainRel")TAutoMainRelSearchVo tAutoMainRel);
......
...@@ -41,6 +41,7 @@ import java.util.List; ...@@ -41,6 +41,7 @@ import java.util.List;
public interface TEmpContractAlertService extends IService<TEmpContractAlert> { public interface TEmpContractAlertService extends IService<TEmpContractAlert> {
IPage<TEmpContractAlert> pageDiy(Page page, ContractAlertSearchVo searchVo); IPage<TEmpContractAlert> pageDiy(Page page, ContractAlertSearchVo searchVo);
IPage<TEmpContractAlert> getAutoPage(Page page, ContractAlertSearchVo searchVo);
List<TEmpContractAlert> listDiy(ContractAlertSearchVo searchVo); List<TEmpContractAlert> listDiy(ContractAlertSearchVo searchVo);
......
...@@ -88,6 +88,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -88,6 +88,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
private final FeedBackDetailService feedBackDetailService; private final FeedBackDetailService feedBackDetailService;
private final TSettleDomainMapper settleDomainMapper; private final TSettleDomainMapper settleDomainMapper;
private final TAutoMainRelMapper tAutoMainRelMapper;
@Autowired @Autowired
private UpmsDaprUtils upmsDaprUtils; private UpmsDaprUtils upmsDaprUtils;
...@@ -98,6 +99,29 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM ...@@ -98,6 +99,29 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
@Autowired @Autowired
private WxConfig wxConfig; private WxConfig wxConfig;
@Override
public IPage<TEmpContractAlert> getAutoPage(Page page, ContractAlertSearchVo searchVo) {
List<String> deptList = tAutoMainRelMapper.getAutoDeptNo();
LambdaQueryWrapper<TEmpContractAlert> wrapper = buildQueryWrapper(searchVo);
wrapper.isNotNull(TEmpContractAlert::getId);
if (deptList != null && !deptList.isEmpty()) {
wrapper.in(TEmpContractAlert::getProjectNo, deptList);
}
if (Common.isNotNull(searchVo.getContractEndStart())){
wrapper.ge(TEmpContractAlert::getContractEnd,searchVo.getContractEndStart());
}
if (Common.isNotNull(searchVo.getContractEndEnd())){
wrapper.le(TEmpContractAlert::getContractEnd,searchVo.getContractEndEnd());
}
if (Common.isNotNull(searchVo.getAuthSql())) {
wrapper.last(searchVo.getAuthSql() + " order by CREATE_TIME desc");
} else {
wrapper.orderByDesc(BaseEntity::getCreateTime);
}
return baseMapper.selectPage(page,wrapper);
}
@Override @Override
public IPage<TEmpContractAlert> pageDiy(Page page, ContractAlertSearchVo searchVo) { public IPage<TEmpContractAlert> pageDiy(Page page, ContractAlertSearchVo searchVo) {
LambdaQueryWrapper<TEmpContractAlert> wrapper = buildQueryWrapper(searchVo); LambdaQueryWrapper<TEmpContractAlert> wrapper = buildQueryWrapper(searchVo);
......
...@@ -129,6 +129,13 @@ ...@@ -129,6 +129,13 @@
left join t_settle_domain b on d.DEPT_ID = b.id left join t_settle_domain b on d.DEPT_ID = b.id
</select> </select>
<!-- 获取全量自动化项目编码 -->
<select id="getAutoDeptNo" resultType="java.lang.String">
SELECT
d.DEPT_NO
FROM t_auto_main_rel d
</select>
<select id="noPageCountDiy" resultType="java.lang.Long"> <select id="noPageCountDiy" resultType="java.lang.Long">
SELECT SELECT
......
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