Commit 234bf0fe authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21

parents b9873253 c038fc55
...@@ -24,9 +24,12 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; ...@@ -24,9 +24,12 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; 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.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.util.bean.BeanCopyUtils; import com.yifu.cloud.plus.v1.yifu.common.core.util.bean.BeanCopyUtils;
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.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner; 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.SysBaseSetInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion; import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
import com.yifu.cloud.plus.v1.yifu.social.service.SysBaseSetInfoService; import com.yifu.cloud.plus.v1.yifu.social.service.SysBaseSetInfoService;
...@@ -59,6 +62,7 @@ public class SysBaseSetInfoController { ...@@ -59,6 +62,7 @@ public class SysBaseSetInfoController {
private final SysBaseSetInfoService sysBaseSetInfoService; private final SysBaseSetInfoService sysBaseSetInfoService;
private final SysPayProportionService sysPayProportionService; private final SysPayProportionService sysPayProportionService;
private final MenuUtil menuUtil;
/** /**
...@@ -71,6 +75,8 @@ public class SysBaseSetInfoController { ...@@ -71,6 +75,8 @@ public class SysBaseSetInfoController {
@Operation(summary = "分页查询", description = "分页查询") @Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/page") @GetMapping("/page")
public R<IPage<SysBaseSetInfo>> getSysBaseSetInfoPage(Page<SysBaseSetInfo> page, SysBaseSetInfo sysBaseSetInfo) { public R<IPage<SysBaseSetInfo>> getSysBaseSetInfoPage(Page<SysBaseSetInfo> page, SysBaseSetInfo sysBaseSetInfo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, sysBaseSetInfo);
return new R<>(sysBaseSetInfoService.getSysBaseSetInfoPage(page, sysBaseSetInfo)); return new R<>(sysBaseSetInfoService.getSysBaseSetInfoPage(page, sysBaseSetInfo));
} }
...@@ -236,6 +242,8 @@ public class SysBaseSetInfoController { ...@@ -236,6 +242,8 @@ public class SysBaseSetInfoController {
@PostMapping("/exportSocial") @PostMapping("/exportSocial")
@PreAuthorize("@pms.hasPermission('social_sysbasesetinfo_export')") @PreAuthorize("@pms.hasPermission('social_sysbasesetinfo_export')")
public void exportSocial(HttpServletResponse response, @RequestBody SysBaseSetInfo searchVo) { public void exportSocial(HttpServletResponse response, @RequestBody SysBaseSetInfo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
sysBaseSetInfoService.listSocialExport(response,searchVo); sysBaseSetInfoService.listSocialExport(response,searchVo);
} }
...@@ -263,6 +271,8 @@ public class SysBaseSetInfoController { ...@@ -263,6 +271,8 @@ public class SysBaseSetInfoController {
@PostMapping("/exportFund") @PostMapping("/exportFund")
@PreAuthorize("@pms.hasPermission('fund_sysbasesetinfo_export')") @PreAuthorize("@pms.hasPermission('fund_sysbasesetinfo_export')")
public void exportFund(HttpServletResponse response, @RequestBody SysBaseSetInfo searchVo) { public void exportFund(HttpServletResponse response, @RequestBody SysBaseSetInfo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
sysBaseSetInfoService.listFundExport(response,searchVo); sysBaseSetInfoService.listFundExport(response,searchVo);
} }
} }
...@@ -25,7 +25,10 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; ...@@ -25,7 +25,10 @@ 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.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; 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.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.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
import com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService; import com.yifu.cloud.plus.v1.yifu.social.service.SysHouseHoldInfoService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
...@@ -53,6 +56,7 @@ import java.util.List; ...@@ -53,6 +56,7 @@ import java.util.List;
public class SysHouseHoldInfoController { public class SysHouseHoldInfoController {
private final SysHouseHoldInfoService sysHouseHoldInfoService; private final SysHouseHoldInfoService sysHouseHoldInfoService;
private final MenuUtil menuUtil;
/** /**
* 简单分页查询 * 简单分页查询
...@@ -63,7 +67,9 @@ public class SysHouseHoldInfoController { ...@@ -63,7 +67,9 @@ public class SysHouseHoldInfoController {
@Operation(summary = "简单分页查询", description = "简单分页查询") @Operation(summary = "简单分页查询", description = "简单分页查询")
@GetMapping("/page") @GetMapping("/page")
public R<IPage<SysHouseHoldInfo>> getSysHouseHoldInfoPage(Page<SysHouseHoldInfo> page, SysHouseHoldInfo sysHouseHoldInfo) { public R<IPage<SysHouseHoldInfo>> getSysHouseHoldInfoPage(Page<SysHouseHoldInfo> page, SysHouseHoldInfo sysHouseHoldInfo) {
return new R<>(sysHouseHoldInfoService.getSysHouseHoldInfoPage(page,sysHouseHoldInfo)); YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, sysHouseHoldInfo);
return new R<>(sysHouseHoldInfoService.getSysHouseHoldInfoPage(page,sysHouseHoldInfo));
} }
...@@ -280,6 +286,8 @@ public class SysHouseHoldInfoController { ...@@ -280,6 +286,8 @@ public class SysHouseHoldInfoController {
@PostMapping("/export") @PostMapping("/export")
@PreAuthorize("@pms.hasPermission('syshouseholdinfo_export')") @PreAuthorize("@pms.hasPermission('syshouseholdinfo_export')")
public void export(HttpServletResponse response, @RequestBody SysHouseHoldInfo sysHouseHoldInfo) { public void export(HttpServletResponse response, @RequestBody SysHouseHoldInfo sysHouseHoldInfo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, sysHouseHoldInfo);
sysHouseHoldInfoService.listExport(response,sysHouseHoldInfo); sysHouseHoldInfoService.listExport(response,sysHouseHoldInfo);
} }
......
...@@ -74,41 +74,62 @@ public class TPaymentInfoController { ...@@ -74,41 +74,62 @@ public class TPaymentInfoController {
* 简单分页查询 * 简单分页查询
* *
* @param page 分页对象 * @param page 分页对象
* @param tPaymentInfo 缴费库 * @param searchVo 缴费库
* @return * @return
*/ */
@Operation(description = "简单分页查询") @Operation(description = "简单分页查询")
@GetMapping("/page") @GetMapping("/page")
public R<IPage<TPaymentInfo>> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfoSearchVo tPaymentInfo) { public R<IPage<TPaymentInfo>> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfoSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(user)){ if (Common.isEmpty(user)){
return R.failed(CommonConstants.USER_FAIL); return R.failed(CommonConstants.USER_FAIL);
} }
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql())) {
if (searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
if (searchVo.getAuthSql().contains("1=2 EXISTS")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
}
}
//特殊条件如社保户、缴纳地的查询做限制处理,限制到所用用户,因为此部分数据量较大 //特殊条件如社保户、缴纳地的查询做限制处理,限制到所用用户,因为此部分数据量较大
R<IPage<TPaymentInfo>> res = tPaymentInfoService.specialHandle(page,tPaymentInfo); R<IPage<TPaymentInfo>> res = tPaymentInfoService.specialHandle(page,searchVo);
if (null != res){ if (null != res){
return res; return res;
} }
//查询数据 //查询数据
return new R<>(tPaymentInfoService.getTPaymentInfoPage(page, tPaymentInfo)); return new R<>(tPaymentInfoService.getTPaymentInfoPage(page, searchVo));
} }
/** /**
* 简单分页查询 * 简单分页查询
* *
* @param page 分页对象 * @param page 分页对象
* @param tPaymentInfo 缴费库 * @param searchVo 缴费库
* @return * @return
*/ */
@Operation(description = "简单分页查询") @Operation(description = "简单分页查询")
@GetMapping("/newPage") @GetMapping("/newPage")
public R<IPage<TPaymentInfoNewVo>> getTPaymentInfoNewPage(Page<TPaymentInfo> page, TPaymentInfoSearchVo tPaymentInfo) { public R<IPage<TPaymentInfoNewVo>> getTPaymentInfoNewPage(Page<TPaymentInfo> page, TPaymentInfoSearchVo searchVo) {YifuUser user = SecurityUtils.getUser();
if (Common.isEmpty(user)){
return R.failed(CommonConstants.USER_FAIL);
}
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql())) {
if (searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
if (searchVo.getAuthSql().contains("1=2 EXISTS")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
}
}
//特殊条件如社保户、缴纳地的查询做限制处理,限制到所用用户,因为此部分数据量较大 //特殊条件如社保户、缴纳地的查询做限制处理,限制到所用用户,因为此部分数据量较大
R<IPage<TPaymentInfoNewVo>> res = tPaymentInfoService.specialHandleNew(page,tPaymentInfo); R<IPage<TPaymentInfoNewVo>> res = tPaymentInfoService.specialHandleNew(page,searchVo);
if (null != res){ if (null != res){
return res; return res;
} }
return tPaymentInfoService.getTPaymentInfoNewPage(page, tPaymentInfo); return tPaymentInfoService.getTPaymentInfoNewPage(page, searchVo);
} }
/** /**
* 实缴查询详情 * 实缴查询详情
...@@ -350,6 +371,16 @@ public class TPaymentInfoController { ...@@ -350,6 +371,16 @@ public class TPaymentInfoController {
@PostMapping("/export") @PostMapping("/export")
@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_export')") @PreAuthorize("@pms.hasPermission('social_tpaymentinfo_export')")
public void export(HttpServletResponse response, @RequestBody TPaymentInfoSearchVo searchVo) { public void export(HttpServletResponse response, @RequestBody TPaymentInfoSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql())) {
if (searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
if (searchVo.getAuthSql().contains("1=2 EXISTS")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
}
}
tPaymentInfoService.exportAsso(response, searchVo, CommonConstants.ZERO_INT); tPaymentInfoService.exportAsso(response, searchVo, CommonConstants.ZERO_INT);
} }
...@@ -368,6 +399,15 @@ public class TPaymentInfoController { ...@@ -368,6 +399,15 @@ public class TPaymentInfoController {
if (Common.isEmpty(user)){ if (Common.isEmpty(user)){
return R.failed(CommonConstants.USER_FAIL); return R.failed(CommonConstants.USER_FAIL);
} }
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql())) {
if (searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
if (searchVo.getAuthSql().contains("1=2 EXISTS")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
}
}
// 获取redis分布式事务锁 // 获取redis分布式事务锁
String key = CacheConstants.PAYMENT_EXPORT_REPEAT + CommonConstants.DOWN_LINE_STRING + user.getId(); String key = CacheConstants.PAYMENT_EXPORT_REPEAT + CommonConstants.DOWN_LINE_STRING + user.getId();
String requestId; String requestId;
...@@ -401,6 +441,16 @@ public class TPaymentInfoController { ...@@ -401,6 +441,16 @@ public class TPaymentInfoController {
@PostMapping("/sumExport") @PostMapping("/sumExport")
@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_export')") @PreAuthorize("@pms.hasPermission('social_tpaymentinfo_export')")
public void sumExport(HttpServletResponse response, @RequestBody TPaymentInfoSearchVo searchVo) { public void sumExport(HttpServletResponse response, @RequestBody TPaymentInfoSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql())) {
if (searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
if (searchVo.getAuthSql().contains("1=2 EXISTS")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
}
}
tPaymentInfoService.exportAsso(response, searchVo, CommonConstants.ONE_INT); tPaymentInfoService.exportAsso(response, searchVo, CommonConstants.ONE_INT);
} }
...@@ -419,6 +469,15 @@ public class TPaymentInfoController { ...@@ -419,6 +469,15 @@ public class TPaymentInfoController {
if (Common.isEmpty(user)){ if (Common.isEmpty(user)){
return R.failed(CommonConstants.USER_FAIL); return R.failed(CommonConstants.USER_FAIL);
} }
menuUtil.setAuthSql(user, searchVo);
if (Common.isNotNull(searchVo.getAuthSql())) {
if (searchVo.getAuthSql().contains(CommonConstants.A_DEPT_ID)) {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN_ID"));
}
if (searchVo.getAuthSql().contains("1=2 EXISTS")) {
searchVo.setAuthSql(searchVo.getAuthSql().replace("1=2 EXISTS", "EXISTS"));
}
}
// 获取redis分布式事务锁 // 获取redis分布式事务锁
String key = CacheConstants.PAYMENT_EXPORT_REPEAT + CommonConstants.DOWN_LINE_STRING+user.getId(); String key = CacheConstants.PAYMENT_EXPORT_REPEAT + CommonConstants.DOWN_LINE_STRING+user.getId();
String requestId; String requestId;
......
...@@ -407,6 +407,9 @@ ...@@ -407,6 +407,9 @@
<if test="sysBaseSetInfo.updateTime != null"> <if test="sysBaseSetInfo.updateTime != null">
AND a.UPDATE_TIME = #{sysBaseSetInfo.updateTime} AND a.UPDATE_TIME = #{sysBaseSetInfo.updateTime}
</if> </if>
<if test="sysBaseSetInfo.authSql != null and sysBaseSetInfo.authSql.trim() != ''">
${sysBaseSetInfo.authSql}
</if>
</if> </if>
</sql> </sql>
<!--sysBaseSetInfo简单分页查询--> <!--sysBaseSetInfo简单分页查询-->
......
...@@ -197,6 +197,9 @@ ...@@ -197,6 +197,9 @@
<if test="sysHouseHoldInfo.isYsdOkPushYgs != null and sysHouseHoldInfo.isYsdOkPushYgs.trim() != ''"> <if test="sysHouseHoldInfo.isYsdOkPushYgs != null and sysHouseHoldInfo.isYsdOkPushYgs.trim() != ''">
AND a.IS_YSD_OK_PUSH_YGS = #{sysHouseHoldInfo.isYsdOkPushYgs} AND a.IS_YSD_OK_PUSH_YGS = #{sysHouseHoldInfo.isYsdOkPushYgs}
</if> </if>
<if test="sysHouseHoldInfo.authSql != null and sysHouseHoldInfo.authSql.trim() != ''">
${sysHouseHoldInfo.authSql}
</if>
</if> </if>
</sql> </sql>
<!--sysHouseHoldInfo简单分页查询--> <!--sysHouseHoldInfo简单分页查询-->
......
...@@ -747,6 +747,9 @@ ...@@ -747,6 +747,9 @@
<if test="tPaymentInfo.createTimeStart != null and tPaymentInfo.createTimeEnd != null"> <if test="tPaymentInfo.createTimeStart != null and tPaymentInfo.createTimeEnd != null">
AND a.CREATE_TIME BETWEEN #{tPaymentInfo.createTimeStart} AND #{tPaymentInfo.createTimeEnd} AND a.CREATE_TIME BETWEEN #{tPaymentInfo.createTimeStart} AND #{tPaymentInfo.createTimeEnd}
</if> </if>
<if test="tPaymentInfo.authSql != null and tPaymentInfo.authSql.trim() != ''">
${tPaymentInfo.authSql}
</if>
</if> </if>
</sql> </sql>
...@@ -865,6 +868,9 @@ ...@@ -865,6 +868,9 @@
<if test="tPaymentInfo.createBy != null and tPaymentInfo.createBy.trim() != ''"> <if test="tPaymentInfo.createBy != null and tPaymentInfo.createBy.trim() != ''">
AND a.CREATE_BY = #{tPaymentInfo.createBy} AND a.CREATE_BY = #{tPaymentInfo.createBy}
</if> </if>
<if test="tPaymentInfo.authSql != null and tPaymentInfo.authSql.trim() != ''">
${tPaymentInfo.authSql}
</if>
</if> </if>
</if> </if>
</sql> </sql>
...@@ -1031,6 +1037,9 @@ ...@@ -1031,6 +1037,9 @@
<sql id="tPaymentInfo_export_social_where_diy"> <sql id="tPaymentInfo_export_social_where_diy">
<if test="tPaymentInfo != null"> <if test="tPaymentInfo != null">
<if test="tPaymentInfo.idList == null"> <if test="tPaymentInfo.idList == null">
<if test="tPaymentInfo.authSql != null and tPaymentInfo.authSql.trim() != ''">
${tPaymentInfo.authSql}
</if>
<if test="tPaymentInfo.empName != null and tPaymentInfo.empName.trim() != ''"> <if test="tPaymentInfo.empName != null and tPaymentInfo.empName.trim() != ''">
AND a.EMP_NAME like concat('',#{tPaymentInfo.empName},'') AND a.EMP_NAME like concat('',#{tPaymentInfo.empName},'')
</if> </if>
......
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