Commit d310f868 authored by hongguangwu's avatar hongguangwu

1.7.22-权限

parent 8448aaf7
...@@ -346,6 +346,8 @@ public class TEmpContractAlertController { ...@@ -346,6 +346,8 @@ public class TEmpContractAlertController {
@Operation(description = "导出自动化续签待办") @Operation(description = "导出自动化续签待办")
@PostMapping("/autoExport") @PostMapping("/autoExport")
public void autoExport(HttpServletResponse response, @RequestBody ContractAlertSearchVo searchVo) { public void autoExport(HttpServletResponse response, @RequestBody ContractAlertSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
searchVo.setAutoFlag(CommonConstants.ZERO_STRING); searchVo.setAutoFlag(CommonConstants.ZERO_STRING);
tEmpContractAlertService.listAutoExport(response,searchVo); tEmpContractAlertService.listAutoExport(response,searchVo);
} }
......
...@@ -233,6 +233,12 @@ public class TInsuranceAlert extends BaseEntity { ...@@ -233,6 +233,12 @@ public class TInsuranceAlert extends BaseEntity {
@Schema(description = "商险续签待办ID") @Schema(description = "商险续签待办ID")
private String insurancesPreRenewDetailId; private String insurancesPreRenewDetailId;
/**
* 项目id
*/
@Schema(description = "项目id")
private String deptId;
//@Schema(description = "本表的ID就是商险ID") //@Schema(description = "本表的ID就是商险ID")
@TableField(exist = false) @TableField(exist = false)
......
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
<result property="policyEffectNew" column="POLICY_EFFECT_NEW" jdbcType="DATE"/> <result property="policyEffectNew" column="POLICY_EFFECT_NEW" jdbcType="DATE"/>
<result property="customerUsername" column="CUSTOMER_USERNAME" jdbcType="VARCHAR"/> <result property="customerUsername" column="CUSTOMER_USERNAME" jdbcType="VARCHAR"/>
<result property="replaceTag" column="REPLACE_TAG" jdbcType="VARCHAR"/> <result property="replaceTag" column="REPLACE_TAG" jdbcType="VARCHAR"/>
<result property="deptId" column="DEPT_ID" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<!-- 商险续签待办专用 --> <!-- 商险续签待办专用 -->
...@@ -107,6 +108,7 @@ ...@@ -107,6 +108,7 @@
a.ALERT_ID, a.ALERT_ID,
a.HAVE_WORK_DAY, a.HAVE_WORK_DAY,
a.INSURANCES_PRE_RENEW_DETAIL_ID, a.INSURANCES_PRE_RENEW_DETAIL_ID,
a.DEPT_ID,
b.BUY_TYPE, b.BUY_TYPE,
b.process_status, b.process_status,
b.error_info, b.error_info,
...@@ -255,6 +257,9 @@ ...@@ -255,6 +257,9 @@
<if test="tInsuranceAlert.customerUsername != null and tInsuranceAlert.customerUsername.trim() != ''"> <if test="tInsuranceAlert.customerUsername != null and tInsuranceAlert.customerUsername.trim() != ''">
AND b.CUSTOMER_USERNAME like CONCAT('%',#{tInsuranceAlert.customerUsername},'%') AND b.CUSTOMER_USERNAME like CONCAT('%',#{tInsuranceAlert.customerUsername},'%')
</if> </if>
<if test="tInsuranceAlert.authSql != null and tInsuranceAlert.authSql.trim() != ''">
${tInsuranceAlert.authSql}
</if>
<if test="tInsuranceAlert.deptNoList != null and tInsuranceAlert.deptNoList.size > 0"> <if test="tInsuranceAlert.deptNoList != null and tInsuranceAlert.deptNoList.size > 0">
AND a.DEPT_NO in AND a.DEPT_NO in
<foreach item="idStr" index="index" collection="tInsuranceAlert.deptNoList" open="(" separator="," <foreach item="idStr" index="index" collection="tInsuranceAlert.deptNoList" open="(" separator=","
......
...@@ -200,7 +200,9 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -200,7 +200,9 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
@Override @Override
public long getDispatchInfoFundCount(TDispatchInfoPreSearchVo searchVo) { public long getDispatchInfoFundCount(TDispatchInfoPreSearchVo searchVo) {
if (Common.isEmpty(searchVo.getType())) {
searchVo.setType(CommonConstants.ONE_STRING); searchVo.setType(CommonConstants.ONE_STRING);
}
initSearchVo(searchVo); initSearchVo(searchVo);
return baseMapper.selectFundCount(searchVo); return baseMapper.selectFundCount(searchVo);
} }
......
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