Skip to content

Y
yifu-mvp
Commit 84082289 authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 7a5c835b b5b7a44b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 561 additions and 328 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/LExcelHeadForIoController.java
View file @ 84082289
......@@ -71,7 +71,9 @@ public class LExcelHeadForIoController {
@GetMapping("/getOwnList/{useCode}")
public R<List<LExcelHeadForIo>> getOwnListByUseCode(@PathVariable("useCode") String useCode) {
YifuUser user = SecurityUtils.getUser();
return new R<>(lExcelHeadForIoService.list(Wrappers.<LExcelHeadForIo>lambdaQuery().eq(LExcelHeadForIo::getCreateUser, String.valueOf(user.getId())).eq(LExcelHeadForIo::getUseCode, useCode)));
return new R<>(lExcelHeadForIoService.list(Wrappers.<LExcelHeadForIo>lambdaQuery()
.eq(LExcelHeadForIo::getCreateUser, String.valueOf(user.getId()))
.eq(LExcelHeadForIo::getUseCode, useCode)));
}
/**
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @ 84082289
......@@ -316,6 +316,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
}else {
alert.setFirstAlertTime(new Date());
}
alert.setCreateBy(contract.getCreateBy());
alert.setCreateName(contract.getCreateName());
alert.setContractId(contract.getId());
alert.setAlertPerson(contract.getCreateName());
alert.setEmpName(contract.getEmpName());
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @ 84082289
......@@ -39,6 +39,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
......@@ -115,10 +116,10 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
@Override
public List<TSettleDomainSelectVo> selectAllSettleDomainSelectVos() {
List<TSettleDomainSelectVo> sdList = baseMapper.selectAllSettleDomainSelectVos();
return sdList;
return baseMapper.selectAllSettleDomainSelectVos();
}
@Transactional
@Override
public R updateProjectInfo(List<TSettleDomain> list) {
if (Common.isNotNull(list)) {
......@@ -153,8 +154,12 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
saveForEkp(res.getData().getUserIds(),tSettleDomain.getId());
}
}
tSettleDomainInfo = baseMapper.selectById(tSettleDomain.getId());
tSettleDomainInfo = baseMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
.eq(TSettleDomain::getDeleteFlag,CommonConstants.ZERO_STRING)
.eq(TSettleDomain::getDepartNo,tSettleDomain.getDepartNo())
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(tSettleDomainInfo)) {
tSettleDomain.setId(tSettleDomainInfo.getId());
baseMapper.updateById(tSettleDomain);
} else {
baseMapper.insert(tSettleDomain);
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListParam.java
View file @ 84082289
package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @ 84082289
......@@ -80,8 +80,9 @@ public class TInsuranceDetailController {
*/
@Operation(summary = "投保分页查询", description = "投保分页查询")
@PostMapping("/getInsuranceListPage")
public R<IPage<InsuranceListVO>> getInsuranceListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
return R.ok(tInsuranceDetailService.getInsuranceListPage(page, param));
public R<IPage<InsuranceListVO>> getInsuranceListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param,
@RequestParam(required = false) String mId) {
return R.ok(tInsuranceDetailService.getInsuranceListPage(page, param, mId));
}
/**
......@@ -94,8 +95,8 @@ public class TInsuranceDetailController {
@Operation(summary = "投保不分页查询", description = "投保不分页查询")
@PostMapping("/getInsuranceList")
@PreAuthorize("@pms.hasPermission('insurance_custserve_insure_export')")
public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam param) {
return tInsuranceDetailService.getInsuranceList(param);
public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam param,@RequestParam(required = false) String mId) {
return tInsuranceDetailService.getInsuranceList(param,mId);
}
/**
......@@ -108,8 +109,9 @@ public class TInsuranceDetailController {
*/
@Operation(summary = "投保办理分页查询", description = "投保办理分页查询")
@PostMapping("/getInsuranceHandleListPage")
public R<IPage<InsuranceListVO>> getInsuranceHandleListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, param));
public R<IPage<InsuranceListVO>> getInsuranceHandleListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param,
@RequestParam(required = false) String mId) {
return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, param, mId));
}
/**
......@@ -219,8 +221,9 @@ public class TInsuranceDetailController {
@Operation(summary = "导出办理", description = "导出办理")
@PostMapping("/getInsuranceExportList")
@PreAuthorize("@pms.hasPermission('handle_insure_export')")
public R<List<InsuranceExportListVO>> getInsuranceExportList(@RequestBody InsuranceExportListParam param) {
return tInsuranceDetailService.getInsuranceExportList(param);
public R<List<InsuranceExportListVO>> getInsuranceExportList(@RequestBody InsuranceExportListParam param,
@RequestParam(required = false) String mId) {
return tInsuranceDetailService.getInsuranceExportList(param,mId);
}
/**
......@@ -345,8 +348,9 @@ public class TInsuranceDetailController {
*/
@Operation(summary = "已投保列表分页查询", description = "已投保列表分页查询")
@PostMapping("/getInsuredListPage")
public R<IPage<InsuredListVo>> getInsuredListPage(Page<InsuredListVo> page, @RequestBody InsuredParam param) {
return R.ok(tInsuranceDetailService.getInsuredListPage(page,param));
public R<IPage<InsuredListVo>> getInsuredListPage(Page<InsuredListVo> page, @RequestBody InsuredParam param,
@RequestParam(required = false) String mId) {
return R.ok(tInsuranceDetailService.getInsuredListPage(page,param,mId));
}
/**
......@@ -372,8 +376,9 @@ public class TInsuranceDetailController {
*/
@Operation(summary = "已减员列表分页查询", description = "已减员列表分页查询")
@PostMapping("/getInsuranceRefundPageList")
public R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, @RequestBody InsuranceRefundParam param) {
return tInsuranceDetailService.getInsuranceRefundPageList(page,param);
public R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, @RequestBody InsuranceRefundParam param,
@RequestParam(required = false) String mId) {
return tInsuranceDetailService.getInsuranceRefundPageList(page,param,mId);
}
/**
......@@ -400,8 +405,9 @@ public class TInsuranceDetailController {
*/
@Operation(summary = "减员办理列表分页查询", description = "减员办理列表分页查询")
@GetMapping("/getInsuranceRefundHandlingPageList")
public R<IPage<RefundExportListVo>> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page,InsuranceRefundHandlingParam param) {
return R.ok(tInsuranceDetailService.getInsuranceRefundHandlingPageList(page,param));
public R<IPage<RefundExportListVo>> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page,InsuranceRefundHandlingParam param,
@RequestParam(required = false) String mId) {
return R.ok(tInsuranceDetailService.getInsuranceRefundHandlingPageList(page,param,mId));
}
/**
......@@ -414,8 +420,8 @@ public class TInsuranceDetailController {
@Operation(summary = "导出减员列表", description = "导出减员列表")
@PostMapping("/getInsuranceRefundHandlingList")
@PreAuthorize("@pms.hasPermission('handle_down_export')")
public R getInsuranceRefundHandlingList(@RequestBody RefundExportListParam param) {
return tInsuranceDetailService.getInsuranceRefundHandlingList(param);
public R getInsuranceRefundHandlingList(@RequestBody RefundExportListParam param, @RequestParam(required = false) String mId) {
return tInsuranceDetailService.getInsuranceRefundHandlingList(param,mId);
}
/**
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java
View file @ 84082289
......@@ -47,7 +47,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param
* @return {@link IPage<InsuranceListVO>}
*/
IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param);
IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param, String mId);
/**
* 投保不分页查询
......@@ -56,7 +56,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param
* @return {@link R<List<InsuranceListVO>>}
*/
R<List<InsuranceListVO>> getInsuranceList(InsuranceListParam param);
R<List<InsuranceListVO>> getInsuranceList(InsuranceListParam param,String mId);
/**
* 投保办理分页查询
......@@ -66,7 +66,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param
* @return {@link IPage<InsuranceListVO>}
*/
IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param);
IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param, String mId);
/**
* 商险新增
......@@ -137,7 +137,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param
* @return {@link R<List<InsuranceExportListVO>>}
*/
R<List<InsuranceExportListVO>> getInsuranceExportList(InsuranceExportListParam param);
R<List<InsuranceExportListVO>> getInsuranceExportList(InsuranceExportListParam param, String mId);
/**
* 投保退回
......@@ -197,7 +197,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param 查询参数
* @return {@link IPage< InsuredListVo>}
*/
IPage<InsuredListVo> getInsuredListPage(Page<InsuredListVo> page, InsuredParam param);
IPage<InsuredListVo> getInsuredListPage(Page<InsuredListVo> page, InsuredParam param, String mId);
/**
* 已投保列表不分页查询
......@@ -216,7 +216,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param 查询参数
* @return {@link IPage< InsuranceRefundListVo >}
*/
R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, InsuranceRefundParam param);
R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, InsuranceRefundParam param, String mId);
/**
* 已减员列表导出
......@@ -235,7 +235,8 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param 查询参数
* @return {@link IPage< RefundExportListVo >}
*/
IPage<RefundExportListVo> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, InsuranceRefundHandlingParam param);
IPage<RefundExportListVo> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, InsuranceRefundHandlingParam param,
String mId);
/**
* 减员办理列表不分页查询
......@@ -244,7 +245,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param param 查询参数
* @return {@link List< RefundExportListVo >}
*/
R<List<RefundExportListVo>> getInsuranceRefundHandlingList(RefundExportListParam param);
R<List<RefundExportListVo>> getInsuranceRefundHandlingList(RefundExportListParam param, String mId);
/**
* 减员办理
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @ 84082289
......@@ -191,18 +191,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @author licancan
*/
@Override
public IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param) {
public IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param, String mId) {
YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(param.getMId())) {
param.setMId("1547501570923819009");
if (!Common.isEmpty(mId)) {
param.setMId(mId);
}
param.setCreateBy(user.getId());
menuUtil.setAuthSql(user, param);
List<String> deptNoList = getDeptNoList(user);
IPage<InsuranceListVO> insuranceList = new Page<>();
if (CollectionUtils.isEmpty(deptNoList)){
return insuranceList;
}
param.setDeptNoList(deptNoList);
IPage<InsuranceListVO> insuranceList;
insuranceList = baseMapper.getInsuranceListPage(page,param);
//根据项目编码获取项目名称
setProjectNameByDeptNo(insuranceList.getRecords());
......@@ -223,14 +219,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @author licancan
*/
@Override
public R<List<InsuranceListVO>> getInsuranceList(InsuranceListParam param) {
public R<List<InsuranceListVO>> getInsuranceList(InsuranceListParam param, String mId) {
YifuUser user = SecurityUtils.getUser();
List<String> deptList = getDeptNoList(user);
List<InsuranceListVO> insuranceList = new ArrayList<>();
if (CollectionUtils.isEmpty(deptList)){
return R.ok(insuranceList);
if (!Common.isEmpty(mId)) {
param.setMId(mId);
}
param.setDeptNoList(deptList);
param.setCreateBy(user.getId());
menuUtil.setAuthSql(user, param);
List<InsuranceListVO> insuranceList;
insuranceList = baseMapper.getInsuranceList(param);
//根据项目编码获取项目名称
setProjectNameByDeptNo(insuranceList);
......@@ -254,9 +250,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @author licancan
*/
@Override
public IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param) {
IPage<InsuranceListVO> iPage = new Page<>();
public IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param, String mId) {
YifuUser user = SecurityUtils.getUser();
if (Common.isNotNull(mId)) {
param.setMId(mId);
}
param.setCreateBy(user.getId());
menuUtil.setAuthSql(user, param);
Integer buyHandleStatus = param.getBuyHandleStatus();
if(buyHandleStatus == CommonConstants.TWO_INT || buyHandleStatus == CommonConstants.THREE_INT){
......@@ -878,8 +877,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @author licancan
*/
@Override
public R<List<InsuranceExportListVO>> getInsuranceExportList(InsuranceExportListParam param) {
public R<List<InsuranceExportListVO>> getInsuranceExportList(InsuranceExportListParam param, String mId) {
YifuUser user = SecurityUtils.getUser();
if (Common.isNotNull(mId)) {
param.setMId(mId);
}
param.setCreateBy(user.getId());
menuUtil.setAuthSql(user, param);
List<InsuranceExportListVO> insuranceExportList = new ArrayList<>();
//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待投保」的结果集
......@@ -3346,15 +3349,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link IPage< InsuredListVo>}
*/
@Override
public IPage<InsuredListVo> getInsuredListPage(Page<InsuredListVo> page, InsuredParam param) {
public IPage<InsuredListVo> getInsuredListPage(Page<InsuredListVo> page, InsuredParam param, String mId) {
YifuUser user = SecurityUtils.getUser();
if (Common.isNotNull(mId)) {
param.setMId(mId);
}
param.setCreateBy(user.getId());
menuUtil.setAuthSql(user, param);
List<String> deptList = getDeptNoList(user);
IPage<InsuredListVo> insuranceList = new Page<>();
if (CollectionUtils.isEmpty(deptList)){
return insuranceList;
}
param.setDeptNoList(deptList);
insuranceList = this.baseMapper.getInsuredListPage(page, param);
if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){
//根据项目编码获取项目名称
......@@ -3430,14 +3432,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link IPage< InsuranceRefundListVo >}
*/
@Override
public R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, InsuranceRefundParam param) {
public R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, InsuranceRefundParam param, String mId) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, param);
List<String> deptList = getDeptNoList(user);
if (CollectionUtils.isEmpty(deptList)){
return R.ok("当前登录人无任何项目权限");
if (Common.isNotNull(mId)) {
param.setMId(mId);
}
param.setDeptNoList(deptList);
param.setCreateBy(user.getId());
menuUtil.setAuthSql(user, param);
IPage<InsuranceRefundListVo> insuranceRefundPageList = this.baseMapper.getInsuranceRefundPageList(page, param);
if (CollectionUtils.isNotEmpty(insuranceRefundPageList.getRecords())){
//根据项目编码获取项目名称
......@@ -3512,8 +3513,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link IPage< RefundExportListVo >}
*/
@Override
public IPage<RefundExportListVo> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, InsuranceRefundHandlingParam param) {
public IPage<RefundExportListVo> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, InsuranceRefundHandlingParam param,
String mId) {
YifuUser user = SecurityUtils.getUser();
if (!Common.isEmpty(mId)) {
param.setMId(mId);
}
param.setCreateBy(user.getId());
menuUtil.setAuthSql(user, param);
String id = user.getId();
Integer reduceHandleStatus = param.getReduceHandleStatus();
......@@ -3550,8 +3556,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
*/
@Override
@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
public R getInsuranceRefundHandlingList(RefundExportListParam param){
public R getInsuranceRefundHandlingList(RefundExportListParam param, String mId){
YifuUser user = SecurityUtils.getUser();
if (!Common.isEmpty(mId)) {
param.setMId(mId);
}
param.setCreateBy(user.getId());
menuUtil.setAuthSql(user, param);
List<RefundExportListVo> refundExportList;
//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待减员」的结果集
......@@ -6071,8 +6081,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
public void createInsuranceInfo(TInsuranceDetail insuranceDetail) {
//获取项目信息
TSettleDomain settleDomain = new TSettleDomain();
List<TSettleDomainSelectVo> settleDomainR = null;
R<TSettleDomainListVo> listVo = null;
List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo;
listVo = archivesDaprUtil.selectSettleDomainSelectVoByNo(insuranceDetail.getDeptNo());
if (Common.isNotNull(listVo)) {
TSettleDomainListVo tSettleDomainListVo = listVo.getData();
......
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @ 84082289
......@@ -95,7 +95,7 @@
a.SETTLE_MONTH as settleMonth
from t_insurance_detail a
<if test="param.authSql != null and param.authSql.trim() != ''">
left join t_insurance_area_res p on a.CREATE_BY=p.USER_ID
left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
</if>
where a.DELETE_FLAG = 0
<if test="param.deptNo != null and param.deptNo.trim() != ''">
......@@ -104,12 +104,6 @@
<if test="param.orderNo != null and param.orderNo.trim() != ''">
and a.DEPT_NO = #{param.orderNo}
</if>
<if test="param.deptNo == null or param.deptNo.trim() == ''">
and a.DEPT_NO in
<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.buyHandleStatus != null">
and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
</if>
......@@ -165,16 +159,13 @@
a.SETTLE_TYPE as settleType,
a.SETTLE_MONTH as settleMonth
from t_insurance_detail a
<if test="param.authSql != null and param.authSql.trim() != ''">
left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
</if>
where a.DELETE_FLAG = 0
<if test="param.deptNo != null and param.deptNo.trim() != ''">
and a.DEPT_NO = #{param.deptNo}
</if>
<if test="param.deptNo == null or param.deptNo.trim() == ''">
and a.DEPT_NO in
<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.buyHandleStatus != null">
and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
</if>
......@@ -205,6 +196,10 @@
<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
and a.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
</if>
<if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql}
</if>
GROUP BY a.id
ORDER BY a.BUY_HANDLE_STATUS,a.CREATE_TIME DESC
</select>
<!--投保办理分页查询-->
......@@ -226,7 +221,7 @@
a.SETTLE_MONTH as settleMonth
from t_insurance_detail a
<if test="param.authSql != null and param.authSql.trim() != ''">
left join t_insurance_area_res p on a.CREATE_BY=p.USER_ID
left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
</if>
where a.DELETE_FLAG = 0
<if test="param.deptNo != null and param.deptNo.trim() != ''">
......@@ -377,7 +372,7 @@
a.REMARK as remark
from t_insurance_detail a
<if test="param.authSql != null and param.authSql.trim() != ''">
left join t_insurance_area_res p on a.CREATE_BY=p.USER_ID
left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
</if>
where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = 1
<if test="param.empName != null and param.empName.trim() != ''">
......@@ -444,7 +439,7 @@
from
t_insurance_detail a
<if test="param.authSql != null and param.authSql.trim() != ''">
left join t_insurance_area_res p on a.CREATE_BY=p.USER_ID
left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
</if>
where
a.DELETE_FLAG = 0
......@@ -459,12 +454,6 @@
<if test="param.deptNo != null and param.deptNo.trim() != ''">
and a.DEPT_NO = #{param.deptNo}
</if>
<if test="param.deptNo == null or param.deptNo.trim() == ''">
and a.DEPT_NO in
<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
</if>
......@@ -550,12 +539,6 @@
<if test="param.deptNo != null and param.deptNo.trim() != ''">
and a.DEPT_NO = #{param.deptNo}
</if>
<if test="param.deptNo == null or param.deptNo.trim() == ''">
and a.DEPT_NO in
<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
</if>
......@@ -607,10 +590,10 @@
refund.CREATE_USER_DEPT_NAME as createUserDeptName,
refund.CREATE_TIME as refundCreateTime
from
t_insurance_detail a,
t_insurance_refund refund
(t_insurance_detail a,
t_insurance_refund refund)
<if test="param.authSql != null and param.authSql.trim() != ''">
left join t_insurance_area_res p on a.CREATE_BY=p.USER_ID
left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
</if>
where
a.DELETE_FLAG = 0
......@@ -627,12 +610,6 @@
<if test="param.deptNo != null and param.deptNo.trim() != ''">
and a.DEPT_NO = #{param.deptNo}
</if>
<if test="param.deptNo == null or param.deptNo.trim() == ''">
and a.DEPT_NO in
<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
</if>
......@@ -751,7 +728,7 @@
t_insurance_detail a,
t_insurance_refund refund
<if test="param.authSql != null and param.authSql.trim() != ''">
left join t_insurance_area_res p on a.CREATE_BY=p.USER_ID
left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
</if>
where
a.REFUND_ID = refund.ID
......@@ -895,7 +872,7 @@
from
t_insurance_detail a
<if test="param.authSql != null and param.authSql.trim() != ''">
left join t_insurance_area_res p on a.CREATE_BY=p.USER_ID
left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
</if>
where
a.DELETE_FLAG = 0 and a.REDUCE_HANDLE_STATUS = 1
......
yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/entity/TOrder.java
View file @ 84082289
......@@ -36,6 +36,12 @@ public class TOrder implements Serializable {
@Schema(description = "客户名称")
private String customerName;
/**
* 项目id
*/
@Schema(description = "项目id")
private String deptId;
/**
* 项目名称
*/
......
yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderListParam.java
View file @ 84082289
package com.yifu.cloud.plus.v1.yifu.order.vo;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
......@@ -13,8 +13,7 @@ import java.util.List;
*/
@Data
@Schema(description = "订单列表入参")
public class OrderListParam implements Serializable {
private static final long serialVersionUID = 2575913025864285604L;
public class OrderListParam extends BaseEntity {
/**
* 订单编号
*/
......
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @ 84082289
......@@ -4,11 +4,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpOrderUtil;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpOrderParam;
......@@ -59,6 +64,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
private OSSUtil ossUtil;
@Resource
private EkpOrderUtil ekpOrderUtil;
@Resource
private MenuUtil menuUtil;
@Resource
private ArchivesDaprUtil archivesDaprUtil;
/**
* 订单列表分页查询
......@@ -71,6 +80,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
@Override
public IPage<OrderListVO> getOrderPageList(Page<OrderListParam> page, OrderListParam param) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, param);
IPage<OrderListVO> orderList = baseMapper.getOrderPageList(page,param,user.getUsername());
return orderList;
}
......@@ -390,9 +400,26 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
}
if (CollectionUtils.isEmpty(vo.getHandleUserList())){
return R.failed(OrderConstants.HANDLE_USER_IS_EMPTY);
} TSettleDomain settleDomain = new TSettleDomain();
List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo;
listVo = archivesDaprUtil.selectSettleDomainSelectVoByNo(vo.getDeptNo());
if (Common.isNotNull(listVo)) {
TSettleDomainListVo tSettleDomainListVo = listVo.getData();
if (Common.isNotNull(tSettleDomainListVo) && Common.isNotEmpty(tSettleDomainListVo.getListSelectVO())) {
settleDomainR = tSettleDomainListVo.getListSelectVO();
for (TSettleDomainSelectVo vo1 :settleDomainR) {
BeanUtils.copyProperties(vo1,settleDomain);
}
}
}
TOrder order = new TOrder();
BeanUtils.copyProperties(vo,order);
if (Common.isNotNull(settleDomain) && Common.isNotNull(settleDomain.getId())) {
order.setDeptId(settleDomain.getId());
}
boolean save = this.save(order);
//处理指派人
if (save && CollectionUtils.isNotEmpty(vo.getHandleUserList())){
......
yifu-order/yifu-order-biz/src/main/resources/mapper/TOrderMapper.xml
View file @ 84082289
......@@ -29,39 +29,43 @@
</sql>
<select id="getOrderPageList" resultType="com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO">
select t.id as id,
t.ORDER_NO as orderNo,
t.CREATE_TIME as createTime,
t.CREATE_NAME as createName,
t.CUSTOMER_NAME as customerName,
t.DEPT_NAME as deptName,
t.DEPT_NO as deptNo,
t.ORDER_STATUS as orderStatus
from t_order t
where t.DELETE_FLAG = 0
and #{userName} in (SELECT HANDLE_USER FROM t_order_handler h WHERE h.ORDER_NO = t.ORDER_NO)
select a.id as id,
a.ORDER_NO as orderNo,
a.CREATE_TIME as createTime,
a.CREATE_NAME as createName,
a.CUSTOMER_NAME as customerName,
a.DEPT_NAME as deptName,
a.DEPT_NO as deptNo,
a.ORDER_STATUS as orderStatus
from t_order a
where a.DELETE_FLAG = 0
and #{userName} in (SELECT HANDLE_USER FROM t_order_handler h WHERE h.ORDER_NO = a.ORDER_NO)
<if test="param.orderNo != null and param.orderNo.trim() != ''">
and t.ORDER_NO = #{param.orderNo}
and a.ORDER_NO = #{param.orderNo}
</if>
<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
and t.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and t.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
and a.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
</if>
<if test="param.createName != null and param.createName.trim() != ''">
and t.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.customerName != null and param.customerName.trim() != ''">
and t.CUSTOMER_NAME = #{param.customerName}
and a.CUSTOMER_NAME = #{param.customerName}
</if>
<if test="param.deptName != null and param.deptName.trim() != ''">
and t.DEPT_NAME = #{param.deptName}
and a.DEPT_NAME = #{param.deptName}
</if>
<if test="param.deptNo != null and param.deptNo.trim() != ''">
and t.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
and a.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
</if>
<if test="param.orderStatus != null">
and t.ORDER_STATUS = #{param.orderStatus}
and a.ORDER_STATUS = #{param.orderStatus}
</if>
ORDER BY t.CREATE_TIME DESC
<if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql}
</if>
GROUP BY a.ID
ORDER BY a.CREATE_TIME DESC
</select>
<select id="getOrderListBySelect" resultType="com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO">
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TIncome.java
View file @ 84082289
......@@ -17,8 +17,10 @@
package com.yifu.cloud.plus.v1.yifu.social.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
......@@ -39,7 +41,7 @@ import java.util.Date;
@Data
@TableName("t_income")
@Schema(description = "收入明细表")
public class TIncome {
public class TIncome{
/**
* 主键
......@@ -196,5 +198,17 @@ public class TIncome {
@ExcelAttribute(name = "发送返回的EKPID")
@ExcelProperty("发送返回的EKPID")
private String ekpId;
/**
* 菜单ID 获取查询权限使用
*/
@ExcelIgnore
@TableField(exist = false)
private String mId;
/**
* 权限sql
*/
@TableField(exist = false)
@ExcelIgnore
private String authSql;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TIncomeSearchVo.java
View file @ 84082289
......@@ -17,11 +17,14 @@
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
/**
* 收入明细表
......@@ -30,7 +33,14 @@ import java.time.LocalDateTime;
* @date 2022-08-30 17:34:58
*/
@Data
public class TIncomeSearchVo extends TIncome {
public class TIncomeSearchVo extends BaseEntity implements Serializable {
private static final long serialVersionUID = -4692341622141432288L;
/**
* id
*/
@Schema(description = "id")
private String id;
/**
* 多选导出或删除等操作
......@@ -61,4 +71,106 @@ public class TIncomeSearchVo extends TIncome {
*/
@TableField(exist = false)
private String mId;
/**
* 员工姓名
*/
@Schema(description = "员工姓名")
private String empName;
/**
* 身份证号
*/
@Schema(description = "身份证号")
private String empIdcard;
/**
* 客户id
*/
@Schema(description = "客户id")
private String unitId;
/**
* 客户名称
*/
@Schema(description = "客户名称")
private String unitName;
/**
* 客户编码
*/
@Schema(description = "客户编码")
private String unitNo;
/**
* 项目id
*/
@Schema(description = "项目id")
private String deptId;
/**
* 项目名称
*/
@Schema(description = "项目名称")
private String deptName;
/**
* 项目编码
*/
@Schema(description = "项目编码")
private String deptNo;
/**
* 费用类型：1管理费2风险金
*/
@Schema(description = "费用类型：1管理费2风险金")
private String feeType;
/**
* 收费方式：1按比例2金额-人数3金额-人次
*/
@Schema(description = "收费方式：1按比例2金额-人数3金额-人次")
private String feeMode;
/**
* 收费标准
*/
@Schema(description = "收费标准")
private String charges;
/**
* 收入来源：1社保2公积金3商险4薪资
*/
@Schema(description = "收入来源")
private String sourceType;
/**
* 金额
*/
@Schema(description = "金额")
private BigDecimal money;
/**
* 生成月份
*/
@Schema(description = "生成月份")
private String createMonth;
/**
* 缴纳月份
*/
@Schema(description = "缴纳月份")
private String payMonth;
/**
* 数据生成月份
*/
@Schema(description = "数据生成月份")
private String dataCreateMonth;
/**
* 红冲：0否1是
*/
@Schema(description = "红冲：0否1是")
private String redData;
/**
* 推送状态：0未推送1已推送
*/
@Schema(description = "送状态：0未推送1已推送")
private String sendStatus;
@Schema(description = "发送月份")
private String sendMonth;
@Schema(description = "发送时间")
private Date sendTime;
@Schema(description = "发送返回的EKPID")
private String ekpId;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @ 84082289
......@@ -24,6 +24,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
......@@ -57,7 +58,8 @@ public class TDispatchInfoController {
private final TDispatchInfoService tDispatchInfoService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
* @param page 分页对象
......@@ -68,6 +70,12 @@ public class TDispatchInfoController {
@GetMapping("/page")
public R<IPage<TDispatchInfoPageVo>> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfo);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tDispatchInfo.setCreateBy(user.getId());
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
}
......@@ -98,7 +106,12 @@ public class TDispatchInfoController {
}
tDispatchInfo.setCreateBy(user.getId());
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
menuUtil.setAuthSql(user, tDispatchInfo);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
}
/**
......@@ -112,7 +125,13 @@ public class TDispatchInfoController {
public R<IPage<TDispatchInfoPageVo>> getTDispatchAuditPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
tDispatchInfo.setStatus(CommonConstants.ONE_STRING);
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfo);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tDispatchInfo.setCreateBy(user.getId());
return new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
}
/**
......@@ -124,12 +143,14 @@ public class TDispatchInfoController {
@Operation(description = "简单分页查询--社保办理列表")
@GetMapping("/pageSocialHandle")
public R<IPage<TDispatchInfo>> getTDispatchSocialHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
// 获取项目权限 TODO
List<String> settleDomains = null;
// 获取自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
return new R<>(tDispatchInfoService.getTDispatchSocialHandlePage(page,tDispatchInfo,settleDomains,sql));
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfo);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tDispatchInfo.setCreateBy(user.getId());
return new R<>(tDispatchInfoService.getTDispatchSocialHandlePage(page,tDispatchInfo));
}
/**
......@@ -141,12 +162,14 @@ public class TDispatchInfoController {
@Operation(description = "简单分页查询--公积金办理列表")
@GetMapping("/pageFundHandle")
public R<IPage<TDispatchInfo>> getTDispatchFundHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
// 获取项目权限 TODO
List<String> settleDomains = null;
// 获取自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
return new R<>(tDispatchInfoService.getTDispatchFundHandlePage(page,tDispatchInfo,settleDomains,sql));
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tDispatchInfo);
if (Common.isNotNull(tDispatchInfo.getAuthSql()) && tDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tDispatchInfo.setCreateBy(user.getId());
return new R<>(tDispatchInfoService.getTDispatchFundHandlePage(page,tDispatchInfo));
}
/**
* 通过id查询派单信息记录表
......@@ -237,7 +260,13 @@ public class TDispatchInfoController {
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('tdispatchinfo-export')")
public void export(HttpServletResponse response, @RequestBody TDispatchInfoSearchVo searchVo) {
tDispatchInfoService.listExport(response,searchVo);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
searchVo.setCreateBy(user.getId());
tDispatchInfoService.listExport(response,searchVo);
}
/**
......@@ -308,6 +337,12 @@ public class TDispatchInfoController {
//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportSocialRecordRoster')")
public void doexportSocialRecordRoster(HttpServletResponse response, HttpServletRequest request,
@RequestBody SocialHandleSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
searchVo.setCreateBy(user.getId());
tDispatchInfoService.doexportSocialRecordRoster(response,searchVo,searchVo.getIdStr(),null);
}
......@@ -324,11 +359,13 @@ public class TDispatchInfoController {
@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
public void doexportFundRecordChange(HttpServletResponse response, HttpServletRequest request,
@RequestBody SocialHandleSearchVo searchVo) {
// 获取项目权限 TODO
List<String> settleDomains = null;
// 获取自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
tDispatchInfoService.doexportFundRecordChange(response, searchVo.getIdStr(),searchVo,settleDomains,sql);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
searchVo.setCreateBy(user.getId());
tDispatchInfoService.doexportFundRecordChange(response, searchVo.getIdStr(),searchVo);
}
/**
* @Author fxj
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TForecastLibraryController.java
View file @ 84082289
......@@ -19,10 +19,14 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
......@@ -52,6 +56,7 @@ public class TForecastLibraryController {
private final TForecastLibraryService tForecastLibraryService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
......@@ -63,6 +68,11 @@ public class TForecastLibraryController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TForecastLibrary>> getTForecastLibraryPage(Page<TForecastLibrary> page, TForecastLibrary tForecastLibrary) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tForecastLibrary);
if (Common.isNotNull(tForecastLibrary.getAuthSql()) && tForecastLibrary.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tForecastLibrary.setAuthSql(tForecastLibrary.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
return new R<>(tForecastLibraryService.getTForecastLibraryPage(page, tForecastLibrary));
}
......@@ -130,6 +140,11 @@ public class TForecastLibraryController {
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('social_tforecastlibrary-export')")
public void export(HttpServletResponse response, @RequestBody TForecastLibrary searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
tForecastLibraryService.listExport(response, searchVo);
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TIncomeController.java
View file @ 84082289
......@@ -21,8 +21,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
......@@ -53,6 +56,7 @@ public class TIncomeController {
private final TIncomeService tIncomeService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
......@@ -64,6 +68,8 @@ public class TIncomeController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TIncome>> getTIncomePage(Page<TIncome> page, TIncomeSearchVo tIncome) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tIncome);
return new R<>(tIncomeService.getTIncomePage(page, tIncome));
}
......@@ -147,6 +153,8 @@ public class TIncomeController {
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('social_tincome-export')")
public void export(HttpServletResponse response, @RequestBody TIncomeSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
tIncomeService.listExport(response, searchVo);
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPreDispatchInfoController.java
View file @ 84082289
......@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants;
......@@ -64,6 +65,8 @@ public class TPreDispatchInfoController {
private final TPreDispatchInfoService tPreDispatchInfoService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
* @param page 分页对象
......@@ -73,6 +76,11 @@ public class TPreDispatchInfoController {
@Operation(summary = "简单分页查询", description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TPreDispatchInfo>> getTPreDispatchInfoPage(Page<TPreDispatchInfo> page, TPreDispatchInfo tPreDispatchInfo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tPreDispatchInfo);
if (Common.isNotNull(tPreDispatchInfo.getAuthSql()) && tPreDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
tPreDispatchInfo.setAuthSql(tPreDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.DEPART_ID_ADD"));
}
return new R<>(tPreDispatchInfoService.getTPreDispatchInfoPage(page,tPreDispatchInfo));
}
/**
......@@ -381,6 +389,11 @@ public class TPreDispatchInfoController {
@PreAuthorize("@pms.hasPermission('social:tpredispatchinfo_doexportPreDispatch')")
public void doexportPreDispatch(HttpServletResponse response,
@RequestBody(required = false) TPreDispatchInfo preDispatchInfo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, preDispatchInfo);
if (Common.isNotNull(preDispatchInfo.getAuthSql()) && preDispatchInfo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
preDispatchInfo.setAuthSql(preDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.DEPART_ID_ADD"));
}
tPreDispatchInfoService.doexportPreDispatch(response,preDispatchInfo);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialFundInfoController.java
View file @ 84082289
......@@ -19,10 +19,15 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
import com.yifu.cloud.plus.v1.yifu.social.service.TSocialFundInfoService;
......@@ -54,6 +59,8 @@ public class TSocialFundInfoController {
private final TSocialFundInfoService tSocialFundInfoService;
private final MenuUtil menuUtil;
/**
* 简单分页查询
......@@ -64,7 +71,9 @@ public class TSocialFundInfoController {
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TSocialFundInfo>> getTSocialFundInfoPage(Page<TSocialFundInfo> page, TSocialFundInfoSearchVo tSocialFundInfo) {
return new R<>(tSocialFundInfoService.getTSocialFundInfoPage(page,tSocialFundInfo));
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tSocialFundInfo);
return new R<>(tSocialFundInfoService.getTSocialFundInfoPage(page,tSocialFundInfo));
}
/**
* 不分页查询
......@@ -113,7 +122,12 @@ public class TSocialFundInfoController {
@PostMapping("/export")
@PreAuthorize("@pms.hasPermission('tsocialfundinfo-export')")
public void export(HttpServletResponse response, @RequestBody TSocialFundInfoSearchVo searchVo) {
tSocialFundInfoService.listExport(response,searchVo);
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tSocialFundInfoService.listExport(response,searchVo);
}
/**
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java
View file @ 84082289
......@@ -56,56 +56,42 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
* @Author fxj
* @Date 2019-10-12
* @param dispatchInfo
* @param settleDomainIds
* @param idsStr
* @return
**/
List<SocialHandleExportVo> getSocialRecordRosterList(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo,
@Param("settleDomainIds")List<String> settleDomainIds,
@Param("idsStr") List<String> idsStr,
@Param("sql") String sql);
@Param("idsStr") List<String> idsStr);
/**
* 导出社保花名册数据查询count
* @Author fxj
* @Date 2019-10-12
* @param dispatchInfo
* @param settleDomainIds
* @param idsStr
* @return
**/
int getSocialRecordRosterListCount(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo,
@Param("settleDomainIds")List<String> settleDomainIds,
@Param("idsStr") List<String> idsStr,
@Param("sql") String sql);
@Param("idsStr") List<String> idsStr);
/**
* 社保页面查询
* @Author fxj
* @Date 2019-10-12
* @param tDispatchInfo
* @param settleDomains
* @param sql
* @return
**/
IPage<TDispatchInfo> getTDispatchSocialHandlePage(Page<TDispatchInfo> page,
@Param("tDispatchInfo") SocialHandleSearchVo tDispatchInfo,
@Param("settleDomainIds")List<String> settleDomains,
@Param("idsStr") List<String> idsStr,
@Param("sql")String sql);
@Param("idsStr") List<String> idsStr);
/**
* 公积金办理页面查询
* @Author fxj
* @Date 2019-10-12
* @param tDispatchInfo
* @param settleDomains
* @param sql
* @return
**/
IPage<TDispatchInfo> getTDispatchFundHandlePage(Page<TDispatchInfo> page,
@Param("tDispatchInfo")SocialHandleSearchVo tDispatchInfo,
@Param("settleDomainIds")List<String> settleDomains,
@Param("idsStr") List<String> idsStr,
@Param("sql")String sql);
@Param("idsStr") List<String> idsStr);
/**
* @Author fxj
* @Description 公积金补交清册
......@@ -125,13 +111,9 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
* @return
**/
int getFundRecordCount(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo,
@Param("settleDomainIds")List<String> settleDomainIds,
@Param("idsStr") List<String> idsStr,
@Param("sql") String sql);
@Param("idsStr") List<String> idsStr);
List<FundHandleExportVo> getFundRecordList(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo,
@Param("settleDomainIds")List<String> settleDomainIds,
@Param("idsStr") List<String> idsStr,
@Param("sql") String sql);
@Param("idsStr") List<String> idsStr);
String getMaxDispatchCode();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TIncomeMapper.java
View file @ 84082289
......@@ -41,17 +41,13 @@ public interface TIncomeMapper extends BaseMapper<TIncome> {
* @param tIncome 收入明细表
* @return
*/
IPage<TIncome> getTIncomePage(Page<TIncome> page, @Param("tIncome") TIncome tIncome);
IPage<TIncome> getTIncomePage(Page<TIncome> page, @Param("tIncome") TIncomeSearchVo tIncome);
List<IncomeExportVo> noPageDiy(@Param("tIncome") TIncomeSearchVo searchVo,
@Param("settleDomainIds")List<String> settleDomains,
@Param("idsStr") List<String> idsStr,
@Param("sql")String sql);
@Param("idsStr") List<String> idsStr);
int noPageCountDiy(@Param("tIncome")TIncomeSearchVo searchVo,
@Param("settleDomainIds")List<String> settleDomains,
@Param("idsStr") List<String> idsStr,
@Param("sql")String sql);
@Param("idsStr") List<String> idsStr);
List<TIncome> getTIncomeList(@Param("tIncome") TIncome tIncome);
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @ 84082289
......@@ -76,11 +76,11 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
void doexportSocialRecordRoster(HttpServletResponse response, SocialHandleSearchVo searchVo, String idStr, String[] exportFields);
IPage<TDispatchInfo> getTDispatchSocialHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo, List<String> settleDomains, String sql);
IPage<TDispatchInfo> getTDispatchSocialHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo);
IPage<TDispatchInfo> getTDispatchFundHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo, List<String> settleDomains, String sql);
IPage<TDispatchInfo> getTDispatchFundHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo);
R<List<FundSupplementaryExportVo>> getFundSupplementaryRecords(String idStr,SocialHandleSearchVo dispatchInfo, List<String> settleDomains, String sql);
void doexportFundRecordChange(HttpServletResponse response,String idStr, SocialHandleSearchVo searchVo, List<String> settleDomains, String sql);
void doexportFundRecordChange(HttpServletResponse response,String idStr, SocialHandleSearchVo searchVo);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 84082289
......@@ -3150,9 +3150,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
Date minStartDate = this.getMinDate(sf);
// 再计算月份
monthDiff = DateUtil.getMonthDiff(minStartDate, new Date()) + 2;
List<TForecastLibrary> libraryFundInfoList;
for (int i = 0; i < monthDiff; i++) {
//获取所有的预估数据
List<TForecastLibrary> libraryFundInfoList = null;
List<TForecastLibrary> libraryFundInfoList1 = new ArrayList<>();
libraryFundInfoList = forecastLibraryService.list(Wrappers.<TForecastLibrary>query().lambda()
.eq(TForecastLibrary::getEmpIdcard, sf.getEmpIdcard())
......@@ -3806,11 +3806,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
String fileName = DispatchConstants.SOCIAL_RECORD_ROSTER_EXPORT + CommonConstants.XLSX;
//获取要导出的列表
List<SocialHandleExportVo> list = new ArrayList<>();
// 项目权限 TODO
List<String> settleDomains = null;
// 自定义sql TODO
String sql = CommonConstants.EMPTY_STRING;
long count = getRecordRosterCount(searchVo,idStr,settleDomains,sql);
long count = getRecordRosterCount(searchVo,idStr);
ServletOutputStream out = null;
try {
out = response.getOutputStream();
......@@ -3824,7 +3820,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 获取实际记录
searchVo.setLimitStart(i);
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
list = getRecordRosterList(searchVo,idStr,settleDomains,sql);
list = getRecordRosterList(searchVo,idStr);
if (Common.isNotNull(list)){
ExcelUtil<SocialHandleExportVo> util = new ExcelUtil<>(SocialHandleExportVo.class);
for (SocialHandleExportVo vo:list){
......@@ -3871,12 +3867,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Param
* @return
**/
private int getRecordRosterCount(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) {
private int getRecordRosterCount(SocialHandleSearchVo searchVo, String idStr) {
List<String> ids = new ArrayList<>();
if (Common.isNotNull(idStr)){
ids = Common.initStrToList(idStr,CommonConstants.COMMA_STRING);
}
return baseMapper.getSocialRecordRosterListCount(searchVo,settleDomains,ids,sql);
return baseMapper.getSocialRecordRosterListCount(searchVo,ids);
}
/**
* @Author fxj
......@@ -3885,18 +3881,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Param
* @return
**/
private List<SocialHandleExportVo> getRecordRosterList(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) {
return baseMapper.getSocialRecordRosterList(searchVo,settleDomains,Common.getList(idStr),sql);
private List<SocialHandleExportVo> getRecordRosterList(SocialHandleSearchVo searchVo, String idStr) {
return baseMapper.getSocialRecordRosterList(searchVo,Common.getList(idStr));
}
@Override
public IPage<TDispatchInfo> getTDispatchSocialHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo, List<String> settleDomains, String sql) {
return baseMapper.getTDispatchSocialHandlePage(page,tDispatchInfo,settleDomains,null,sql);
public IPage<TDispatchInfo> getTDispatchSocialHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
return baseMapper.getTDispatchSocialHandlePage(page,tDispatchInfo,null);
}
@Override
public IPage<TDispatchInfo> getTDispatchFundHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo,List<String> settleDomains, String sql) {
return baseMapper.getTDispatchFundHandlePage(page,tDispatchInfo,settleDomains,null,sql);
public IPage<TDispatchInfo> getTDispatchFundHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo) {
return baseMapper.getTDispatchFundHandlePage(page,tDispatchInfo,null);
}
/**
* 导出公积金补缴清册
......@@ -3918,11 +3914,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @return
**/
@Override
public void doexportFundRecordChange(HttpServletResponse response,String idStr, SocialHandleSearchVo searchVo, List<String> settleDomains, String sql) {
public void doexportFundRecordChange(HttpServletResponse response,String idStr, SocialHandleSearchVo searchVo) {
String fileName = DispatchConstants.SOCIAL_RECORD_EXPORT + LocalDateTime.now() + CommonConstants.XLSX;
//获取要导出的列表
List<FundHandleExportVo> list = new ArrayList<>();
long count = getFundRecordCount(searchVo,idStr,settleDomains,sql);
long count = getFundRecordCount(searchVo,idStr);
ServletOutputStream out = null;
try {
out = response.getOutputStream();
......@@ -3936,7 +3932,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 获取实际记录
searchVo.setLimitStart(i);
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
list = getFundRecordList(searchVo,idStr,settleDomains,sql);
list = getFundRecordList(searchVo,idStr);
if (Common.isNotNull(list)){
ExcelUtil<FundHandleExportVo> util = new ExcelUtil<>(FundHandleExportVo.class);
for (FundHandleExportVo vo:list){
......@@ -3976,12 +3972,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
private List<FundHandleExportVo> getFundRecordList(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) {
return baseMapper.getFundRecordList(searchVo,settleDomains,Common.getList(idStr),sql);
private List<FundHandleExportVo> getFundRecordList(SocialHandleSearchVo searchVo, String idStr) {
return baseMapper.getFundRecordList(searchVo,Common.getList(idStr));
}
private long getFundRecordCount(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) {
return baseMapper.getFundRecordCount(searchVo,settleDomains,Common.getList(idStr),sql);
private long getFundRecordCount(SocialHandleSearchVo searchVo, String idStr) {
return baseMapper.getFundRecordCount(searchVo,Common.getList(idStr));
}
/**
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java
View file @ 84082289
......@@ -100,7 +100,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
String fileName = "收入明细批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<IncomeExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo, null, Common.getList(searchVo.getIds()), "");
long count = noPageCountDiy(searchVo, Common.getList(searchVo.getIds()));
ServletOutputStream out = null;
try {
out = response.getOutputStream();
......@@ -115,7 +115,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
// 获取实际记录
searchVo.setLimitStart(i);
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
list = noPageDiy(searchVo, null, Common.getList(searchVo.getIds()), CommonConstants.EMPTY_STRING);
list = noPageDiy(searchVo, Common.getList(searchVo.getIds()));
if (Common.isNotNull(list)) {
ExcelUtil<IncomeExportVo> util = new ExcelUtil<>(IncomeExportVo.class);
for (IncomeExportVo vo : list) {
......@@ -154,17 +154,13 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
}
private List<IncomeExportVo> noPageDiy(TIncomeSearchVo searchVo,
List<String> settleDomainIds,
List<String> ids,
String sql) {
return baseMapper.noPageDiy(searchVo, settleDomainIds, ids, sql);
List<String> ids) {
return baseMapper.noPageDiy(searchVo, ids);
}
private int noPageCountDiy(TIncomeSearchVo searchVo,
List<String> settleDomainIds,
List<String> ids,
String sql) {
return baseMapper.noPageCountDiy(searchVo, settleDomainIds, ids, sql);
List<String> ids) {
return baseMapper.noPageCountDiy(searchVo, ids);
}
@Override
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @ 84082289
......@@ -347,7 +347,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
return R.failed(PreDispatchConstants.PRESTATUS_ERROR);
}
List<ErrorMessage> errorMessageList = new ArrayList<>();
R<Boolean> errorMessage = null;
R<Boolean> errorMessage;
HashMap<String,SysArea> areaMap = new HashMap<>();
HashMap<String,SysArea> areaIdMap = new HashMap<>();
// 派单派增处理
......@@ -499,9 +499,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
tPreDispatchInfo.setPensionAddress(tPreDispatchInfo.getPensionAddressReduce());
tPreDispatchInfo.setFundAddress(tPreDispatchInfo.getFundAddressReduce());
}
// 合同开始截止时间 同步更新派单的合同时间
// tPreDispatchInfo.setContractEndAdd(tPreDispatchInfo.getContractEnd());
// tPreDispatchInfo.setContractStartAdd(tPreDispatchInfo.getContractStart());
// 没问题重置异常状态，有问题 在前面就返回了
tPreDispatchInfo.setExceptionContent(CommonConstants.EMPTY_STRING);
tPreDispatchInfo.setPreStatus(CommonConstants.ZERO_STRING);
......@@ -523,7 +520,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
return R.failed(CommonConstants.USER_FAIL);
}
List<TSettleDomainSelectVo> settleDomainR = null;
R<TSettleDomainListVo> listVo = null;
R<TSettleDomainListVo> listVo;
//项目名称map key:项目id value:项目编码
Map<String, String> settleDomainNameMap = new HashMap<>();
//客户名称map key:客户id value:客户名称
......@@ -581,12 +578,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
continue;
}
// 派单派增处理
batchDispatchAdd(settleDomainNameMap, customerNameMap, settleIdAndCustomerIdMap, user, errorMsgList, i, pre,
areaMap, areaIdMap);
batchDispatchAdd(settleDomainNameMap, user, errorMsgList, i, pre, areaMap, areaIdMap);
// 派单派减处理
if (CommonConstants.ONE_STRING.equals(pre.getType())) {
// 当月创建的大于 限制日期的不派单 放在次月派单 本月之前的数据正常派单
if (null != pre.getDayLimit() && pre.getCreateTime().getDayOfMonth() > pre.getDayLimit().intValue() &&
if (null != pre.getDayLimit() && pre.getCreateTime().getDayOfMonth() > pre.getDayLimit() &&
LocalDateTime.now().getMonthValue() == pre.getCreateTime().getMonthValue()) {
errorMessageList.add(new ErrorMessage(i+1,"当月创建的大于限制日期的不派单,放在次月派单！"));
//重新组装数据
......@@ -864,7 +860,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
String fileName = "导出预派单" + DateUtil.getThisTime() + CommonConstants.XLSX;
//获取要导出的列表
List<TPreDispatchExportVo> list = new ArrayList<>();
List<TPreDispatchExportVo> list;
//获取记录
list = baseMapper.getListForExport(tPreDispatchInfo);
......@@ -1473,7 +1469,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
SysArea areaTemp;
if (null != area) {
// 处理省数据
if (null == area.getParentId() || CommonConstants.ZERO_INT == area.getParentId().intValue()) {
if (null == area.getParentId() || CommonConstants.ZERO_INT == area.getParentId()) {
entity.setFundProvince(area.getId().toString());
entity.setFundCity(null);
entity.setFundTown(null);
......@@ -2285,12 +2281,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
TDispatchImportVo importVo,
List<ErrorMessage> errorMessageList) {
SysArea area = areaMap.get(pre.getPayAddress());
if (null == area || null == area.getParentId() || 0 == area.getParentId().intValue()){
if (null == area || null == area.getParentId() || 0 == area.getParentId()){
errorMessageList = new ArrayList<>();
errorMessageList.add(new ErrorMessage(i+1,"缴费地址不存在或缴费地址不可为省！"));
}else {
SysArea areaParent = areaIdMap.get(area.getParentId());
if (null != areaParent && null != areaParent.getParentId() && 0 != areaParent.getParentId().intValue()) {
if (null != areaParent && null != areaParent.getParentId() && 0 != areaParent.getParentId()) {
importVo.setFileProvince(areaParent.getParentId().toString());
importVo.setFileCity(areaParent.getId().toString());
importVo.setFileTown(area.getId().toString());
......@@ -2406,8 +2402,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
* @Author huyc
* @Date 2022-07-18
* @param settleDomainNameMap
* @param customerNameMap
* @param settleIdAndCustomerIdMap
* @param user
* @param errorMsgList
* @param i
......@@ -2416,11 +2410,9 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
* @param areaIdMap
* @return
**/
private void batchDispatchAdd(Map<String, String> settleDomainNameMap, Map<String, String> customerNameMap,
Map<String, String> settleIdAndCustomerIdMap, YifuUser user,
private void batchDispatchAdd(Map<String, String> settleDomainNameMap, YifuUser user,
List<ErrorMessage> errorMsgList, int i, TPreDispatchInfo pre,
HashMap<String, SysArea> areaMap,
HashMap<String, SysArea> areaIdMap) {
HashMap<String, SysArea> areaMap, HashMap<String, SysArea> areaIdMap) {
TDispatchImportVo importVo;
List<ErrorMessage> errorMessageList = new ArrayList<>();
if (null != pre && CommonConstants.ZERO_STRING.equals(pre.getType())){
......@@ -2434,7 +2426,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
List<TDispatchImportVo> importVoList = new ArrayList<>();
importVoList.add(importVo);
// 当月创建的大于 限制日期的不派单 放在次月派单 本月之前的数据正常派单
if (null != pre.getDayLimit() && pre.getCreateTime().getDayOfMonth() > pre.getDayLimit().intValue() &&
if (null != pre.getDayLimit() && pre.getCreateTime().getDayOfMonth() > pre.getDayLimit() &&
LocalDateTime.now().getMonthValue() == pre.getCreateTime().getMonthValue()) {
errorMessageList.add(new ErrorMessage(i+1,"当月创建的大于限制日期的不派单,放在次月派单！"));
}
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
View file @ 84082289
......@@ -495,6 +495,9 @@
<if test="tForecastLibrary.createTimeEnd != null">
AND a.CREATE_TIME <![CDATA[ <= ]]> #{tForecastLibrary.createTimeEnd}
</if>
<if test="tForecastLibrary.authSql != null and tForecastLibrary.authSql.trim() != ''">
${tForecastLibrary.authSql}
</if>
</if>
</sql>
<!--tForecastLibrary简单分页查询-->
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TIncomeMapper.xml
View file @ 84082289
......@@ -139,9 +139,6 @@
<if test="tIncome.payMonth != null and tIncome.payMonth.trim() != ''">
AND a.PAY_MONTH = #{tIncome.payMonth}
</if>
<if test="tIncome.createTime != null">
AND a.CREATE_TIME = #{tIncome.createTime}
</if>
<if test="tIncome.dataCreateMonth != null and tIncome.dataCreateMonth.trim() != ''">
AND a.DATA_CREATE_MONTH = #{tIncome.dataCreateMonth}
</if>
......@@ -151,6 +148,9 @@
<if test="tIncome.redData != null and tIncome.redData.trim() != ''">
AND a.RED_DATA = #{tIncome.redData}
</if>
<if test="tIncome.authSql != null and tIncome.authSql.trim() != ''">
${tIncome.authSql}
</if>
</if>
</sql>
<!--tIncome简单分页查询-->
......@@ -161,6 +161,7 @@
<where>
1=1
<include refid="tIncome_where"/>
group by a.id
order by a.CREATE_TIME DESC
</where>
</select>
......@@ -173,6 +174,7 @@
<where>
1=1
<include refid="export_sql"/>
group by a.id
order by a.CREATE_TIME DESC
<if test="tIncome != null">
<if test="tIncome.limitStart != null">
......@@ -185,12 +187,16 @@
<!--noPageCountDiy查询-->
<select id="noPageCountDiy" resultType="java.lang.Integer">
SELECT
count(1)
count(1) from(
SELECT
a.id
FROM t_income a
<where>
1=1
<include refid="export_sql"/>
group by a.id
</where>
) b
</select>
<!-- 列表 -->
......@@ -211,24 +217,6 @@
#{items}
</foreach>
</if>
<!--数据权限判断-->
<if test="settleDomainIds != null">
<if test="settleDomainIds.size() > 0">
and a.DEPT_ID in
<foreach collection="settleDomainIds" item="param" index="index" open="(" close=")" separator=",">
#{param}
</foreach>
</if>
<if test="settleDomainIds.size() == 0">
and 1=2
</if>
</if>
<if test="settleDomainIds == null">
and 1=1
</if>
<if test='sql != null and sql != ""'>
and <![CDATA[sql]]>
</if>
</sql>
<update id="updateIncomeById" parameterType="java.util.List">
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TPreDispatchInfoMapper.xml
View file @ 84082289
......@@ -549,6 +549,9 @@
<if test="tPreDispatchInfo.updateTime != null">
AND a.UPDATE_TIME = #{tPreDispatchInfo.updateTime}
</if>
<if test="tPreDispatchInfo.authSql != null and tPreDispatchInfo.authSql.trim() != ''">
${tPreDispatchInfo.authSql}
</if>
</if>
</if>
</sql>
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @ 84082289
......@@ -386,7 +386,7 @@
a.PERSONAL_INTEREST_FEE,
a.SOCIAL_STATUS,
a.FUND_STATUS,
a.DISPATCH_ID,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
a.DISPATCH_ID
</sql>
<!-- 其他地方查询，不需要拼接项目名称 -->
......@@ -875,6 +875,9 @@
<if test="tSocialFundInfo.fundStatus != null and tSocialFundInfo.fundStatus.trim() != ''">
AND a.FUND_STATUS = #{tSocialFundInfo.fundStatus}
</if>
<if test="tSocialFundInfo.authSql != null and tSocialFundInfo.authSql.trim() != ''">
${tSocialFundInfo.authSql}
</if>
</if>
</sql>
<!--tSocialFundInfo简单分页查询-->
......@@ -886,6 +889,7 @@
1=1
<include refid="tSocialFundInfo_where"/>
</where>
group by a.id
order by a.CREATE_TIME desc
</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