Commit cb2eb69c authored by fangxinjiang's avatar fangxinjiang

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

parents 2b17e686 a56ab8f2
...@@ -245,6 +245,10 @@ public interface CommonConstants { ...@@ -245,6 +245,10 @@ public interface CommonConstants {
public static final String SPOT = "."; public static final String SPOT = ".";
int FIFTY_INT = 50;
int BYTE = 1024;
/** /**
* 员工初始序列 * 员工初始序列
* @Author pwang * @Author pwang
......
...@@ -471,4 +471,28 @@ public class Common { ...@@ -471,4 +471,28 @@ public class Common {
} }
return obj; return obj;
} }
/**
* 商险附件允许上传的文件类型
*
* @Author pwang
* @Date 2020-01-07 15:52
* @param null
* @return
**/
private static final String insuranceSuffixList = "pdf|png|jpg|doc|docx|xls|xlsx|rar|zip";
/**
* 判断是否为允许的上传文件类型,true表示允许
*/
public static boolean checkInsuranceFile(String fileName) {
// 获取文件后缀
String suffix = getSuffix(fileName);
if (null != suffix) {
if (insuranceSuffixList.contains(suffix.trim().toLowerCase())) {
return true;
}
}
return false;
}
} }
...@@ -10,7 +10,7 @@ public class InsurancesConstants { ...@@ -10,7 +10,7 @@ public class InsurancesConstants {
/** /**
* 新增 * 新增
*/ */
public static final String ADD = "新增"; public static final String ADD = "“新增”提交申请";
/** /**
* 离职 * 离职
*/ */
...@@ -18,11 +18,11 @@ public class InsurancesConstants { ...@@ -18,11 +18,11 @@ public class InsurancesConstants {
/** /**
* 批增 * 批增
*/ */
public static final String BATCH = "批增"; public static final String BATCH = "“批增”提交申请";
/** /**
* 替换 * 替换
*/ */
public static final String REPLACE = "替换"; public static final String REPLACE = "“替换”提交申请";
/** /**
* 删除 * 删除
*/ */
...@@ -38,15 +38,15 @@ public class InsurancesConstants { ...@@ -38,15 +38,15 @@ public class InsurancesConstants {
/** /**
* 投保导出办理 * 投保导出办理
*/ */
public static final String EXPORT = "投保导出办理"; public static final String EXPORT = "投保";
/** /**
* 投保退回 * 投保退回
*/ */
public static final String ROLLBACK = "投保退回"; public static final String ROLLBACK = "投保退回";
/** /**
* 投保办理成功 * 投保成功
*/ */
public static final String SUCCESSFUL = "投保办理成功"; public static final String SUCCESSFUL = "投保成功";
/** /**
* 登记保单保费 * 登记保单保费
*/ */
...@@ -701,23 +701,23 @@ public class InsurancesConstants { ...@@ -701,23 +701,23 @@ public class InsurancesConstants {
/** /**
* 导入减员数据 * 导入减员数据
*/ */
public static final String INSURANCE_REFUND_IMPORT = "减员提交申请"; public static final String INSURANCE_REFUND_IMPORT = "“减员”提交申请";
/** /**
* 减员导出办理 * 减员导出办理
*/ */
public static final String INSURANCE_REFUND_EXPORT = "减员办理中"; public static final String INSURANCE_REFUND_EXPORT = "减员中";
/** /**
* 减员办理成功 * 减员成功
*/ */
public static final String INSURANCE_REFUND_SUCCESS = "减员办理成功"; public static final String INSURANCE_REFUND_SUCCESS = "减员成功";
/** /**
* 减员退回成功 * 减员退回
*/ */
public static final String INSURANCE_REFUND_FAILED = "减员办理退回"; public static final String INSURANCE_REFUND_FAILED = "减员退回";
/** /**
* 变更所属项目 * 变更所属项目
......
...@@ -42,6 +42,12 @@ public class TInsuranceOperate implements Serializable { ...@@ -42,6 +42,12 @@ public class TInsuranceOperate implements Serializable {
@Schema(description = "备注(审核意见)") @Schema(description = "备注(审核意见)")
private String remark; private String remark;
/**
* 是否显示 0不显示/1显示
*/
@Schema(description = "是否显示 0不显示/1显示")
private Integer displayFlag;
/** /**
* 创建者 * 创建者
*/ */
......
...@@ -51,4 +51,28 @@ public class InsuranceExportListParam implements Serializable { ...@@ -51,4 +51,28 @@ public class InsuranceExportListParam implements Serializable {
*/ */
@Schema(description = "办理地分流sql") @Schema(description = "办理地分流sql")
private String regionSql; private String regionSql;
/**
* 购买类型, 1新增、3批增、4替换
*/
@Schema(description = " 购买类型(派单类型), 1新增、3批增、4替换")
private Integer buyType;
/**
* 创建者-姓名
*/
@Schema(description = "派单人")
private String createName;
/**
* 派单开始时间
*/
@Schema(description = "派单开始时间")
private String startDate;
/**
* 派单结束时间
*/
@Schema(description = "派单结束时间")
private String endDate;
} }
package com.yifu.cloud.plus.v1.yifu.insurances.vo; package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
...@@ -93,14 +91,12 @@ public class InsuranceListParam implements Serializable { ...@@ -93,14 +91,12 @@ public class InsuranceListParam implements Serializable {
/** /**
* 派单开始时间 * 派单开始时间
*/ */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
@Schema(description = "派单开始时间") @Schema(description = "派单开始时间")
private LocalDate startDate; private String startDate;
/** /**
* 派单结束时间 * 派单结束时间
*/ */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
@Schema(description = "派单结束时间") @Schema(description = "派单结束时间")
private LocalDate endDate; private String endDate;
} }
...@@ -89,6 +89,12 @@ public class InsuranceRefundHandlingParam implements Serializable { ...@@ -89,6 +89,12 @@ public class InsuranceRefundHandlingParam implements Serializable {
@Schema(description = "办理人") @Schema(description = "办理人")
private String updateBy; private String updateBy;
/**
* 派单类型
*/
@Schema(description = "派单类型")
private String buyType;
/** /**
* 派单人 * 派单人
*/ */
...@@ -99,13 +105,13 @@ public class InsuranceRefundHandlingParam implements Serializable { ...@@ -99,13 +105,13 @@ public class InsuranceRefundHandlingParam implements Serializable {
* 派单开始时间 * 派单开始时间
*/ */
@Schema(description = "派单开始时间") @Schema(description = "派单开始时间")
private String createStartTime; private String startDate;
/** /**
* 派单结束时间 * 派单结束时间
*/ */
@Schema(description = "派单结束时间") @Schema(description = "派单结束时间")
private String createEndTime; private String endDate;
} }
...@@ -55,32 +55,19 @@ public class TInsuranceDetailController { ...@@ -55,32 +55,19 @@ public class TInsuranceDetailController {
} }
/** /**
* EKP2INSURANCES 更新结算状态 * EKP2INSURANCES 更新结算状态(已弃用)
* *
* @author licancan * @author licancan
* @param param * @param param
* @return {@link R<String>} * @return {@link R<String>}
*/ */
@Deprecated
@Operation(summary = "更新结算状态", description = "更新结算状态") @Operation(summary = "更新结算状态", description = "更新结算状态")
@PostMapping("/updateInsuranceSettle") @PostMapping("/updateInsuranceSettle")
public R<String> updateInsuranceSettle(@RequestBody UpdateInsuranceSettleParam param) { public R<String> updateInsuranceSettle(@RequestBody UpdateInsuranceSettleParam param) {
return tInsuranceDetailService.updateInsuranceSettle(param); return tInsuranceDetailService.updateInsuranceSettle(param);
} }
/**
* 投保办理分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link R<IPage<InsuranceListVO>>}
*/
@Operation(summary = "投保办理分页查询", description = "投保办理分页查询")
@PostMapping("/getInsuranceHandleListPage")
public R<IPage<InsuranceListVO>> getInsuranceHandleListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, param));
}
/** /**
* 投保分页查询 * 投保分页查询
* *
...@@ -108,6 +95,20 @@ public class TInsuranceDetailController { ...@@ -108,6 +95,20 @@ public class TInsuranceDetailController {
return R.ok(tInsuranceDetailService.getInsuranceList(param)); return R.ok(tInsuranceDetailService.getInsuranceList(param));
} }
/**
* 投保办理分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link R<IPage<InsuranceListVO>>}
*/
@Operation(summary = "投保办理分页查询", description = "投保办理分页查询")
@PostMapping("/getInsuranceHandleListPage")
public R<IPage<InsuranceListVO>> getInsuranceHandleListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, param));
}
/** /**
* 商险新增 * 商险新增
* *
......
...@@ -39,8 +39,6 @@ public class TInsuranceEnclosureController { ...@@ -39,8 +39,6 @@ public class TInsuranceEnclosureController {
@Resource @Resource
TInsuranceEnclosureService tInsuranceEnclosureService; TInsuranceEnclosureService tInsuranceEnclosureService;
private final OSSUtil ossUtil;
/** /**
* 商险文件上传 * 商险文件上传
* *
......
...@@ -50,24 +50,23 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> { ...@@ -50,24 +50,23 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param); IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param);
/** /**
* 投保办理分页查询 * 投保分页查询
* *
* @author licancan * @author licancan
* @param page
* @param param * @param param
* @return {@link IPage<InsuranceListVO>} * @return {@link List<InsuranceListVO>}
*/ */
IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param); List<InsuranceListVO> getInsuranceList(InsuranceListParam param);
/** /**
* 投保分页查询 * 投保办理分页查询
* *
* @author licancan * @author licancan
* @param page
* @param param * @param param
* @return {@link List<InsuranceListVO>} * @return {@link IPage<InsuranceListVO>}
*/ */
List<InsuranceListVO> getInsuranceList(InsuranceListParam param); IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param);
/** /**
* 商险新增 * 商险新增
......
...@@ -13,14 +13,17 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; ...@@ -13,14 +13,17 @@ import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEnclosure; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEnclosure;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceEnclosureMapper; import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceEnclosureMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEnclosureService; import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEnclosureService;
import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceEnclosureParam; import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceEnclosureParam;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Objects;
/** /**
* @author Administrator * @author Administrator
...@@ -50,10 +53,19 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos ...@@ -50,10 +53,19 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
*/ */
@Override @Override
public R uploadInsuranceEnclosure(MultipartFile file, String filePath, String remark) throws IOException { public R uploadInsuranceEnclosure(MultipartFile file, String filePath, String remark) throws IOException {
String enclosureName = file.getOriginalFilename().substring(0, file.getOriginalFilename().lastIndexOf(".")); if(Common.isEmpty(file)){
return R.failed("商险附件为空");
}
if(!Common.checkInsuranceFile(file.getOriginalFilename())){
return R.failed("非法的文件类型");
}
if (file.getSize() > (CommonConstants.FIFTY_INT*CommonConstants.BYTE*CommonConstants.BYTE)){
return R.failed("文件超出上传上限");
}
String enclosureName = Objects.requireNonNull(file.getOriginalFilename()).substring(0,file.getOriginalFilename().lastIndexOf("."));
String fileName = System.currentTimeMillis() + "_" + file.getOriginalFilename(); String fileName = System.currentTimeMillis() + "_" + file.getOriginalFilename();
//filePath不传默认存储空间的根目录 //filePath不传默认存储空间的根目录
//jpg,jpeg,png,bmp //支持的附件格式
String key = ""; String key = "";
if (!Common.isNotNull(filePath)) { if (!Common.isNotNull(filePath)) {
key = fileName; key = fileName;
...@@ -61,13 +73,17 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos ...@@ -61,13 +73,17 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
key = filePath + "/" + fileName; key = filePath + "/" + fileName;
} }
boolean flag = ossUtil.uploadFileByStream(file.getInputStream(), key, null); boolean flag = ossUtil.uploadFileByStream(file.getInputStream(), key, null);
FileVo fileVo;
TInsuranceEnclosure insuranceEnclosure = new TInsuranceEnclosure();
URL url = null;
if (flag) { if (flag) {
TInsuranceEnclosure insuranceEnclosure = new TInsuranceEnclosure();
log.info("文件:" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功!"); log.info("文件:" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功!");
insuranceEnclosure.setDeleteFlag(CommonConstants.ZERO_INT); insuranceEnclosure.setDeleteFlag(CommonConstants.ZERO_INT);
insuranceEnclosure.setRemark(remark); if(StringUtils.isNotBlank(remark)){
if(!ValidityUtil.validate50(remark)){
return R.failed("备注字段不能超过50");
}else{
insuranceEnclosure.setRemark(remark);
}
}
insuranceEnclosure.setEnclosureName(enclosureName); insuranceEnclosure.setEnclosureName(enclosureName);
insuranceEnclosure.setEnclosureAddress(key); insuranceEnclosure.setEnclosureAddress(key);
try { try {
...@@ -77,9 +93,7 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos ...@@ -77,9 +93,7 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
ossUtil.deleteObject(null, key); ossUtil.deleteObject(null, key);
return R.failed("failed:" + e.getMessage()); return R.failed("failed:" + e.getMessage());
} }
url = ossUtil.getObjectUrl(null, insuranceEnclosure.getEnclosureAddress()); return R.ok("商险附件上传成功");
fileVo = new FileVo(insuranceEnclosure.getId().toString(), insuranceEnclosure.getEnclosureName(), url.toString());
return R.ok(fileVo);
} else { } else {
return R.failed("failed:上传至存储空间失败"); return R.failed("failed:上传至存储空间失败");
} }
......
...@@ -131,8 +131,8 @@ ...@@ -131,8 +131,8 @@
ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
</select> </select>
<!--投保办理分页查询--> <!--投保分页查询-->
<select id="getInsuranceHandleListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO"> <select id="getInsuranceList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
select detail.id as id, select detail.id as id,
detail.EMP_NAME as empName, detail.EMP_NAME as empName,
detail.EMP_IDCARD_NO as empIdcardNo, detail.EMP_IDCARD_NO as empIdcardNo,
...@@ -144,6 +144,7 @@ ...@@ -144,6 +144,7 @@
detail.INSURANCE_COMPANY_NAME as insuranceCompanyName, detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
detail.INSURANCE_TYPE_NAME as insuranceTypeName, detail.INSURANCE_TYPE_NAME as insuranceTypeName,
detail.BUY_STANDARD as buyStandard, detail.BUY_STANDARD as buyStandard,
detail.CREATE_BY as createBy,
detail.CREATE_NAME as createName, detail.CREATE_NAME as createName,
detail.BUY_HANDLE_STATUS as buyHandleStatus, detail.BUY_HANDLE_STATUS as buyHandleStatus,
detail.SETTLE_TYPE as settleType, detail.SETTLE_TYPE as settleType,
...@@ -153,6 +154,12 @@ ...@@ -153,6 +154,12 @@
<if test="param.deptNo != null and param.deptNo.trim() != ''"> <if test="param.deptNo != null and param.deptNo.trim() != ''">
and detail.DEPT_NO = #{param.deptNo} and detail.DEPT_NO = #{param.deptNo}
</if> </if>
<if test="param.deptNo == null or param.deptNo.trim() == ''">
and detail.DEPT_NO in
<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.buyHandleStatus != null"> <if test="param.buyHandleStatus != null">
and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus} and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
</if> </if>
...@@ -174,12 +181,6 @@ ...@@ -174,12 +181,6 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="param.regionSql != null and param.regionSql.trim() != ''">
and ${param.regionSql}
</if>
<if test="param.updateBy != null and param.updateBy.trim() != ''">
and detail.HANDLED_BY = #{param.updateBy}
</if>
<if test="param.buyType != null"> <if test="param.buyType != null">
and detail.BUY_TYPE = #{param.buyType} and detail.BUY_TYPE = #{param.buyType}
</if> </if>
...@@ -192,8 +193,8 @@ ...@@ -192,8 +193,8 @@
ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
</select> </select>
<!--投保分页查询--> <!--投保办理分页查询-->
<select id="getInsuranceList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO"> <select id="getInsuranceHandleListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
select detail.id as id, select detail.id as id,
detail.EMP_NAME as empName, detail.EMP_NAME as empName,
detail.EMP_IDCARD_NO as empIdcardNo, detail.EMP_IDCARD_NO as empIdcardNo,
...@@ -205,7 +206,6 @@ ...@@ -205,7 +206,6 @@
detail.INSURANCE_COMPANY_NAME as insuranceCompanyName, detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
detail.INSURANCE_TYPE_NAME as insuranceTypeName, detail.INSURANCE_TYPE_NAME as insuranceTypeName,
detail.BUY_STANDARD as buyStandard, detail.BUY_STANDARD as buyStandard,
detail.CREATE_BY as createBy,
detail.CREATE_NAME as createName, detail.CREATE_NAME as createName,
detail.BUY_HANDLE_STATUS as buyHandleStatus, detail.BUY_HANDLE_STATUS as buyHandleStatus,
detail.SETTLE_TYPE as settleType, detail.SETTLE_TYPE as settleType,
...@@ -215,12 +215,6 @@ ...@@ -215,12 +215,6 @@
<if test="param.deptNo != null and param.deptNo.trim() != ''"> <if test="param.deptNo != null and param.deptNo.trim() != ''">
and detail.DEPT_NO = #{param.deptNo} and detail.DEPT_NO = #{param.deptNo}
</if> </if>
<if test="param.deptNo == null or param.deptNo.trim() == ''">
and detail.DEPT_NO in
<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.buyHandleStatus != null"> <if test="param.buyHandleStatus != null">
and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus} and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
</if> </if>
...@@ -242,6 +236,12 @@ ...@@ -242,6 +236,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="param.regionSql != null and param.regionSql.trim() != ''">
and ${param.regionSql}
</if>
<if test="param.updateBy != null and param.updateBy.trim() != ''">
and detail.HANDLED_BY = #{param.updateBy}
</if>
<if test="param.buyType != null"> <if test="param.buyType != null">
and detail.BUY_TYPE = #{param.buyType} and detail.BUY_TYPE = #{param.buyType}
</if> </if>
...@@ -374,6 +374,15 @@ ...@@ -374,6 +374,15 @@
<if test="param.regionSql != null and param.regionSql.trim() != ''"> <if test="param.regionSql != null and param.regionSql.trim() != ''">
and ${param.regionSql} and ${param.regionSql}
</if> </if>
<if test="param.buyType != null">
and detail.BUY_TYPE = #{param.buyType}
</if>
<if test="param.createName != null and param.createName.trim() != ''">
and detail.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
and detail.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and detail.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
</if>
ORDER BY detail.CREATE_TIME DESC ORDER BY detail.CREATE_TIME DESC
</select> </select>
...@@ -720,11 +729,11 @@ ...@@ -720,11 +729,11 @@
<if test="param.createName != null and param.createName.trim() != ''"> <if test="param.createName != null and param.createName.trim() != ''">
and refund.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%') and refund.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
</if> </if>
<if test="param.createStartTime != null and param.createStartTime.trim() != ''"> <if test="param.startDate != null and param.startDate.trim() != ''">
AND refund.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.createStartTime}, ' 00:00:00') AND refund.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00')
</if> </if>
<if test="param.createEndTime != null and param.createEndTime.trim() != ''"> <if test="param.endDate != null and param.endDate.trim() != ''">
AND refund.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.createEndTime}, ' 23:59:59') AND refund.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
</if> </if>
ORDER BY refund.CREATE_TIME DESC,detail.ID ASC ORDER BY refund.CREATE_TIME DESC,detail.ID ASC
</select> </select>
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<result property="insuranceDetailId" column="INSURANCE_DETAIL_ID" jdbcType="VARCHAR"/> <result property="insuranceDetailId" column="INSURANCE_DETAIL_ID" jdbcType="VARCHAR"/>
<result property="operateDesc" column="OPERATE_DESC" jdbcType="VARCHAR"/> <result property="operateDesc" column="OPERATE_DESC" jdbcType="VARCHAR"/>
<result property="remark" column="REMARK" jdbcType="VARCHAR"/> <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
<result property="displayFlag" column="DISPLAY_FLAG" jdbcType="TINYINT"/>
<result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/> <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
<result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/> <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
<result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/> <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
......
...@@ -1878,7 +1878,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper, ...@@ -1878,7 +1878,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
salary.setOwnMoney(ownMoney); salary.setOwnMoney(ownMoney);
for (TSalaryAccount account : aList) { for (TSalaryAccount account : aList) {
relaySalarySum = relaySalarySum.add(account.getRelaySalaryUnit()); relaySalarySum = relaySalarySum.add(account.getRelaySalary());
} }
TSalaryDetailVo salaryDetailVo = new TSalaryDetailVo(); TSalaryDetailVo salaryDetailVo = new TSalaryDetailVo();
......
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
<result property="repeatMoney" column="REPEAT_MONEY"/> <result property="repeatMoney" column="REPEAT_MONEY"/>
<result property="repeatNums" column="REPEAT_NUMS"/> <result property="repeatNums" column="REPEAT_NUMS"/>
<result property="isRepeat" column="IS_REPEAT"/> <result property="isRepeat" column="IS_REPEAT"/>
<result property="repeatRemark" column="REPEAT_REMARK"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -120,6 +121,7 @@ ...@@ -120,6 +121,7 @@
a.REPEAT_MONEY, a.REPEAT_MONEY,
a.REPEAT_NUMS, a.REPEAT_NUMS,
a.IS_REPEAT, a.IS_REPEAT,
a.REPEAT_REMARK,
a.INVOICE_TITLE a.INVOICE_TITLE
</sql> </sql>
<sql id="tSalaryStandard_where"> <sql id="tSalaryStandard_where">
......
...@@ -90,16 +90,41 @@ public class TPaymentInfo extends BaseEntity { ...@@ -90,16 +90,41 @@ public class TPaymentInfo extends BaseEntity {
@ExcelAttribute(name = "客户名称" ) @ExcelAttribute(name = "客户名称" )
@Schema(description ="客户名称") @Schema(description ="客户名称")
@ExcelProperty("客户名称") @ExcelProperty("客户名称")
private String unitId; private String unitName;
/**
* 客户Id
*/
@ExcelAttribute(name = "客户Id" )
@Schema(description ="客户Id")
@ExcelProperty("客户Id")
private String unitId;
/** /**
* 项目名称 * 项目id
*/ */
@ExcelAttribute(name = "项目名称" ) @ExcelAttribute(name = "项目id" )
@Schema(description ="项目名称") @Schema(description ="项目id")
@ExcelProperty("项目名称") @ExcelProperty("项目id")
private String settleDomainId; private String settleDomainId;
/**
* 项目名称
*/
@ExcelAttribute(name = "项目名称" )
@Schema(description ="项目名称")
@ExcelProperty("项目名称")
private String settleDomainName;
/**
* 项目编码
*/
@Length(max = 50, message = "项目编码不能超过50个字符" )
@ExcelAttribute(name = "项目编码", maxLength = 50)
@Schema(description = "项目编码" )
@ExcelProperty("项目编码" )
private String settleDomainCode;
/** /**
* 社保户 * 社保户
*/ */
......
...@@ -81,21 +81,43 @@ public class TPaymentInfoVo extends RowIndex implements Serializable { ...@@ -81,21 +81,43 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
@ExcelProperty("身份证号") @ExcelProperty("身份证号")
private String empIdcard; private String empIdcard;
/** /**
* 客户名称 * 项目id
*/ */
@Length(max = 50, message = "客户名称 不能超过50 个字符") @ExcelAttribute(name = "项目id")
@ExcelAttribute(name = "客户名称", maxLength = 50) @Schema(description ="项目id")
@Schema(description = "客户名称") @ExcelProperty("项目id")
@ExcelProperty("客户名称") private String settleDomainId;
private String unitId;
/** /**
* 项目名称 * 项目名称
*/ */
@Length(max = 50, message = "项目名称 不能超过50 个字符")
@ExcelAttribute(name = "项目名称", maxLength = 50) @ExcelAttribute(name = "项目名称", maxLength = 50)
@Schema(description = "项目名称") @Schema(description ="项目名称")
@ExcelProperty("项目名称") @ExcelProperty("项目名称")
private String settleDomainId; private String settleDomainName;
/**
* 项目编码
*/
@ExcelAttribute(name = "项目编码", maxLength = 50)
@Schema(description = "项目编码" )
@ExcelProperty("项目编码" )
private String settleDomainCode;
/**
* 客户名称
*/
@ExcelAttribute(name = "客户名称", maxLength = 50)
@Schema(description ="客户名称")
@ExcelProperty("客户名称")
private String unitName;
/**
* 客户Id
*/
@ExcelAttribute(name = "客户Id" )
@Schema(description ="客户Id")
@ExcelProperty("客户Id")
private String unitId;
/** /**
* 社保户 * 社保户
*/ */
......
...@@ -925,8 +925,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -925,8 +925,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo.setEmpId(socialInfo.getEmpId()); paymentInfo.setEmpId(socialInfo.getEmpId());
paymentInfo.setEmpIdcard(socialInfo.getEmpIdcard()); paymentInfo.setEmpIdcard(socialInfo.getEmpIdcard());
paymentInfo.setEmpName(socialInfo.getEmpName()); paymentInfo.setEmpName(socialInfo.getEmpName());
paymentInfo.setSettleDomainId(socialInfo.getSettleDomainName()); paymentInfo.setSettleDomainId(socialInfo.getSettleDomain());
paymentInfo.setUnitId(socialInfo.getUnitName()); paymentInfo.setSettleDomainName(socialInfo.getSettleDomainName());
paymentInfo.setSettleDomainCode(socialInfo.getSettleDomainCode());
paymentInfo.setUnitId(socialInfo.getUnitId());
paymentInfo.setUnitName(socialInfo.getUnitName());
if (Common.isNotNull(tSocialInfo)) { if (Common.isNotNull(tSocialInfo)) {
paymentInfo.setInauguralTeam(tSocialInfo.getInauguralTeam()); paymentInfo.setInauguralTeam(tSocialInfo.getInauguralTeam());
paymentInfo.setEmpNo(tSocialInfo.getEmpNo()); paymentInfo.setEmpNo(tSocialInfo.getEmpNo());
...@@ -1362,7 +1365,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1362,7 +1365,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo.setEmpIdcard(fund.getEmpIdcard()); paymentInfo.setEmpIdcard(fund.getEmpIdcard());
paymentInfo.setEmpName(fund.getEmpName()); paymentInfo.setEmpName(fund.getEmpName());
paymentInfo.setSettleDomainId(fund.getSettleDomainNameFund()); paymentInfo.setSettleDomainId(fund.getSettleDomainNameFund());
paymentInfo.setUnitId(fund.getUnitNameFund()); paymentInfo.setSettleDomainName(fund.getSettleDomainNameFund());
paymentInfo.setSettleDomainCode(fund.getSettleDomainCodeFund());
paymentInfo.setUnitId(fund.getUnitIdFund());
paymentInfo.setUnitName(fund.getUnitNameFund());
if (Common.isNotNull(tProvidentFund)) { if (Common.isNotNull(tProvidentFund)) {
paymentInfo.setInauguralTeam(tProvidentFund.getInauguralTeam()); paymentInfo.setInauguralTeam(tProvidentFund.getInauguralTeam());
paymentInfo.setEmpNo(tProvidentFund.getEmpNo()); paymentInfo.setEmpNo(tProvidentFund.getEmpNo());
...@@ -1902,8 +1909,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1902,8 +1909,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists.setEmpId(socialInfo.getEmpId()); payExists.setEmpId(socialInfo.getEmpId());
payExists.setEmpIdcard(socialInfo.getEmpIdcard()); payExists.setEmpIdcard(socialInfo.getEmpIdcard());
payExists.setEmpName(socialInfo.getEmpName()); payExists.setEmpName(socialInfo.getEmpName());
payExists.setSettleDomainId(socialInfo.getSettleDomainName()); payExists.setSettleDomainId(socialInfo.getSettleDomain());
payExists.setUnitId(socialInfo.getUnitName()); payExists.setSettleDomainName(socialInfo.getSettleDomainName());
payExists.setSettleDomainCode(socialInfo.getSettleDomainCode());
payExists.setUnitId(socialInfo.getUnitId());
payExists.setUnitName(socialInfo.getUnitName());
if (Common.isNotNull(tSocialInfo)) { if (Common.isNotNull(tSocialInfo)) {
payExists.setInauguralTeam(tSocialInfo.getInauguralTeam()); payExists.setInauguralTeam(tSocialInfo.getInauguralTeam());
payExists.setEmpNo(tSocialInfo.getEmpNo()); payExists.setEmpNo(tSocialInfo.getEmpNo());
......
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
<result property="empId" column="EMP_ID"/> <result property="empId" column="EMP_ID"/>
<result property="empIdcard" column="EMP_IDCARD"/> <result property="empIdcard" column="EMP_IDCARD"/>
<result property="unitId" column="UNIT_ID"/> <result property="unitId" column="UNIT_ID"/>
<result property="unitName" column="UNIT_NAME"/>
<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
<result property="settleDomainId" column="SETTLE_DOMAIN_ID"/> <result property="settleDomainId" column="SETTLE_DOMAIN_ID"/>
<result property="socialHousehold" column="SOCIAL_HOUSEHOLD"/> <result property="socialHousehold" column="SOCIAL_HOUSEHOLD"/>
<result property="socialSecurityNo" column="SOCIAL_SECURITY_NO"/> <result property="socialSecurityNo" column="SOCIAL_SECURITY_NO"/>
...@@ -109,6 +112,9 @@ ...@@ -109,6 +112,9 @@
a.EMP_ID, a.EMP_ID,
a.EMP_IDCARD, a.EMP_IDCARD,
a.UNIT_ID, a.UNIT_ID,
a.UNIT_NAME,
a.SETTLE_DOMAIN_CODE,
a.SETTLE_DOMAIN_NAME,
a.SETTLE_DOMAIN_ID, a.SETTLE_DOMAIN_ID,
a.SOCIAL_HOUSEHOLD, a.SOCIAL_HOUSEHOLD,
a.SOCIAL_SECURITY_NO, a.SOCIAL_SECURITY_NO,
...@@ -192,6 +198,9 @@ ...@@ -192,6 +198,9 @@
a.EMP_ID, a.EMP_ID,
a.EMP_IDCARD, a.EMP_IDCARD,
a.UNIT_ID, a.UNIT_ID,
a.UNIT_NAME,
a.SETTLE_DOMAIN_CODE,
a.SETTLE_DOMAIN_NAME,
a.SETTLE_DOMAIN_ID, a.SETTLE_DOMAIN_ID,
a.SOCIAL_HOUSEHOLD, a.SOCIAL_HOUSEHOLD,
a.SOCIAL_SECURITY_NO, a.SOCIAL_SECURITY_NO,
...@@ -283,6 +292,15 @@ ...@@ -283,6 +292,15 @@
<if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''"> <if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''">
AND a.UNIT_ID = #{tPaymentInfo.unitId} AND a.UNIT_ID = #{tPaymentInfo.unitId}
</if> </if>
<if test="tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''">
AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName}
</if>
<if test="tPaymentInfo.settleDomainCode != null and tPaymentInfo.settleDomainCode.trim() != ''">
AND a.SETTLE_DOMAIN_CODE = #{tPaymentInfo.settleDomainCode}
</if>
<if test="tPaymentInfo.unitName != null and tPaymentInfo.unitName.trim() != ''">
AND a.UNIT_NAME = #{tPaymentInfo.unitName}
</if>
<if test="tPaymentInfo.settleDomainId != null and tPaymentInfo.settleDomainId.trim() != ''"> <if test="tPaymentInfo.settleDomainId != null and tPaymentInfo.settleDomainId.trim() != ''">
AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId} AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
</if> </if>
...@@ -296,10 +314,10 @@ ...@@ -296,10 +314,10 @@
AND a.SOCIAL_PAY_ADDR = #{tPaymentInfo.socialPayAddr} AND a.SOCIAL_PAY_ADDR = #{tPaymentInfo.socialPayAddr}
</if> </if>
<if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''"> <if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''">
AND a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth} AND (a.SOCIAL_PAY_MONTH = '${tPaymentInfo.socialPayMonth}' or a.PROVIDENT_PAY_MONTH = '${tPaymentInfo.socialPayMonth}')
</if> </if>
<if test="tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''"> <if test="tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''">
AND a.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth} AND (a.SOCIAL_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}' or a.PROVIDENT_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}')
</if> </if>
<if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''"> <if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus} AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
...@@ -310,12 +328,6 @@ ...@@ -310,12 +328,6 @@
<if test="tPaymentInfo.sumAll != null"> <if test="tPaymentInfo.sumAll != null">
AND a.SUM_ALL = #{tPaymentInfo.sumAll} AND a.SUM_ALL = #{tPaymentInfo.sumAll}
</if> </if>
<if test="tPaymentInfo.providentPayMonth != null and tPaymentInfo.providentPayMonth.trim() != ''">
AND a.PROVIDENT_PAY_MONTH = #{tPaymentInfo.providentPayMonth}
</if>
<if test="tPaymentInfo.providentCreateMonth != null and tPaymentInfo.providentCreateMonth.trim() != ''">
AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth}
</if>
<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"> <if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%') AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
</if> </if>
...@@ -524,6 +536,15 @@ ...@@ -524,6 +536,15 @@
<if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''"> <if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''">
AND a.UNIT_ID = #{tPaymentInfo.unitId} AND a.UNIT_ID = #{tPaymentInfo.unitId}
</if> </if>
<if test="tPaymentInfo.settleDomainName != null and tPaymentInfo.settleDomainName.trim() != ''">
AND a.SETTLE_DOMAIN_NAME = #{tPaymentInfo.settleDomainName}
</if>
<if test="tPaymentInfo.settleDomainCode != null and tPaymentInfo.settleDomainCode.trim() != ''">
AND a.SETTLE_DOMAIN_CODE = #{tPaymentInfo.settleDomainCode}
</if>
<if test="tPaymentInfo.unitName != null and tPaymentInfo.unitName.trim() != ''">
AND a.UNIT_NAME = #{tPaymentInfo.unitName}
</if>
<if test="tPaymentInfo.settleDomainId != null and tPaymentInfo.settleDomainId.trim() != ''"> <if test="tPaymentInfo.settleDomainId != null and tPaymentInfo.settleDomainId.trim() != ''">
AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId} AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
</if> </if>
...@@ -537,10 +558,10 @@ ...@@ -537,10 +558,10 @@
AND a.SOCIAL_PAY_ADDR = #{tPaymentInfo.socialPayAddr} AND a.SOCIAL_PAY_ADDR = #{tPaymentInfo.socialPayAddr}
</if> </if>
<if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''"> <if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''">
AND a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth} AND (a.SOCIAL_PAY_MONTH = '${tPaymentInfo.socialPayMonth}' or a.PROVIDENT_PAY_MONTH = '${tPaymentInfo.socialPayMonth}')
</if> </if>
<if test="tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''"> <if test="tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''">
AND a.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth} AND (a.SOCIAL_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}' or a.PROVIDENT_CREATE_MONTH = '${tPaymentInfo.socialCreateMonth}')
</if> </if>
<if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''"> <if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus} AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
...@@ -548,12 +569,6 @@ ...@@ -548,12 +569,6 @@
<if test="tPaymentInfo.sumAll != null"> <if test="tPaymentInfo.sumAll != null">
AND a.SUM_ALL = #{tPaymentInfo.sumAll} AND a.SUM_ALL = #{tPaymentInfo.sumAll}
</if> </if>
<if test="tPaymentInfo.providentPayMonth != null and tPaymentInfo.providentPayMonth.trim() != ''">
AND a.PROVIDENT_PAY_MONTH = #{tPaymentInfo.providentPayMonth}
</if>
<if test="tPaymentInfo.providentCreateMonth != null and tPaymentInfo.providentCreateMonth.trim() != ''">
AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth}
</if>
<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"> <if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%') AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
</if> </if>
...@@ -753,6 +768,9 @@ ...@@ -753,6 +768,9 @@
<result property="empId" column="EMP_ID"/> <result property="empId" column="EMP_ID"/>
<result property="empIdcard" column="EMP_IDCARD"/> <result property="empIdcard" column="EMP_IDCARD"/>
<result property="unitId" column="UNIT_ID"/> <result property="unitId" column="UNIT_ID"/>
<result property="unitName" column="UNIT_NAME"/>
<result property="settleDomainName" column="SETTLE_DOMAIN_NAME"/>
<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
<result property="settleDomainId" column="SETTLE_DOMAIN_ID"/> <result property="settleDomainId" column="SETTLE_DOMAIN_ID"/>
<result property="socialHousehold" column="SOCIAL_HOUSEHOLD"/> <result property="socialHousehold" column="SOCIAL_HOUSEHOLD"/>
<result property="socialSecurityNo" column="SOCIAL_SECURITY_NO"/> <result property="socialSecurityNo" column="SOCIAL_SECURITY_NO"/>
......
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