Commit ef4956c8 authored by fangxinjiang's avatar fangxinjiang

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

parents b0194926 805ec640
...@@ -67,18 +67,16 @@ public class EkpSalaryUtil { ...@@ -67,18 +67,16 @@ public class EkpSalaryUtil {
} }
// 推送主表到ekp // 推送主表到ekp
public String sendStandardToEKP(EkpSalaryStandardParam param){ public String sendStandardToEKP(String loginName, EkpSalaryStandardParam param){
log.info("推送EKP开始--薪资主表数据"); log.info("推送EKP开始--薪资主表数据");
RestTemplate yourRestTemplate = new RestTemplate(); RestTemplate yourRestTemplate = new RestTemplate();
try{ try{
//指向EKP的接口url //指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap //把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject loginName = new JSONObject();
String formValues = new ObjectMapper().writeValueAsString(param); String formValues = new ObjectMapper().writeValueAsString(param);
loginName.append("LoginName",ekpProperties.getLoginName());
MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>(); MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
wholeForm.add("docSubject",ekpProperties.getDocSubject()); wholeForm.add("docSubject",ekpProperties.getDocSubject());
wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}"); wholeForm.add("docCreator", "{\"LoginName\":\"" + loginName+ "\"}");
wholeForm.add("docStatus", ekpProperties.getDocStatus()); wholeForm.add("docStatus", ekpProperties.getDocStatus());
wholeForm.add("formValues", formValues); wholeForm.add("formValues", formValues);
wholeForm.add("fdModelId", ekpProperties.getStandardFdModelId()); wholeForm.add("fdModelId", ekpProperties.getStandardFdModelId());
...@@ -106,17 +104,15 @@ public class EkpSalaryUtil { ...@@ -106,17 +104,15 @@ public class EkpSalaryUtil {
} }
// 退表到ekp // 退表到ekp
public String backStandardToEKP(EkpSalaryBackParam param){ public String backStandardToEKP(String loginName, EkpSalaryBackParam param){
log.info("推送EKP开始--薪资退表"); log.info("推送EKP开始--薪资退表");
RestTemplate yourRestTemplate = new RestTemplate(); RestTemplate yourRestTemplate = new RestTemplate();
try{ try{
//指向EKP的接口url //指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap //把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject loginName = new JSONObject();
loginName.append("LoginName",ekpProperties.getLoginName());
MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>(); MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
wholeForm.add("docSubject",ekpProperties.getDocSubject()); wholeForm.add("docSubject",ekpProperties.getDocSubject());
wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}"); wholeForm.add("docCreator", "{\"LoginName\":\"" + loginName+ "\"}");
wholeForm.add("docStatus", ekpProperties.getDocStatus()); wholeForm.add("docStatus", ekpProperties.getDocStatus());
String formValues = new ObjectMapper().writeValueAsString(param); String formValues = new ObjectMapper().writeValueAsString(param);
wholeForm.add("formValues", formValues); wholeForm.add("formValues", formValues);
......
...@@ -27,6 +27,10 @@ public class InsurancesConstants { ...@@ -27,6 +27,10 @@ public class InsurancesConstants {
* 替换 * 替换
*/ */
public static final String REPLACE = "“替换”提交申请"; public static final String REPLACE = "“替换”提交申请";
/**
* 被替换成功
*/
public static final String SOURCE_REPLACE = "被替换成功";
/** /**
* 删除 * 删除
*/ */
...@@ -277,10 +281,6 @@ public class InsurancesConstants { ...@@ -277,10 +281,6 @@ public class InsurancesConstants {
* 购买标准不存在 * 购买标准不存在
*/ */
public static final String BUY_STANDARD_NOT_EXIST = "购买标准不存在"; public static final String BUY_STANDARD_NOT_EXIST = "购买标准不存在";
/**
* 购买标准格式错误
*/
public static final String BUY_STANDARD_PARSE_ERROR = "购买标准格式错误";
/** /**
* 商险购买地省名称不能为空 * 商险购买地省名称不能为空
*/ */
......
...@@ -12,6 +12,7 @@ import org.checkerframework.common.value.qual.StringVal; ...@@ -12,6 +12,7 @@ import org.checkerframework.common.value.qual.StringVal;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/** /**
...@@ -74,24 +75,28 @@ public class TInsuranceCompany extends BaseEntity { ...@@ -74,24 +75,28 @@ public class TInsuranceCompany extends BaseEntity {
* 商险办理省code * 商险办理省code
*/ */
@Schema(description = "商险办理省code") @Schema(description = "商险办理省code")
@NotNull(message = "商险办理省code不能为空")
private Integer insuranceHandleProvince; private Integer insuranceHandleProvince;
/** /**
* 商险办理省 * 商险办理省
*/ */
@Schema(description = "商险办理省") @Schema(description = "商险办理省")
@NotBlank(message = "商险办理省不能为空")
private String insuranceHandleProvinceName; private String insuranceHandleProvinceName;
/** /**
* 商险办理城市code * 商险办理城市code
*/ */
@Schema(description = "商险办理城市code") @Schema(description = "商险办理城市code")
@NotNull(message = "商险办理城市code不能为空")
private Integer insuranceHandleCity; private Integer insuranceHandleCity;
/** /**
* 商险办理城市 * 商险办理城市
*/ */
@Schema(description = "商险办理城市") @Schema(description = "商险办理城市")
@NotBlank(message = "商险办理城市不能为空")
private String insuranceHandleCityName; private String insuranceHandleCityName;
} }
\ No newline at end of file
...@@ -317,26 +317,50 @@ public class InsuranceDetailVO implements Serializable { ...@@ -317,26 +317,50 @@ public class InsuranceDetailVO implements Serializable {
/** /**
* 被替换人姓名 * 被替换人姓名
*/ */
@Schema(description = "被替换人姓名(替换类型专用字段)") @Schema(description = "被替换人姓名")
private String coverEmpName; private String coverEmpName;
/** /**
* 被替换人身份证号 * 被替换人身份证号
*/ */
@Schema(description = "被替换人身份证号(替换类型专用字段)") @Schema(description = "被替换人身份证号)")
private String coverEmpIdcardNo; private String coverEmpIdcardNo;
/** /**
* 被替换人项目名称 * 被替换人项目名称
*/ */
@Schema(description = "被替换人项目名称(替换类型专用字段)") @Schema(description = "被替换人项目名称")
private String coverProjectName; private String coverProjectName;
/** /**
* 被替换人封面抬头 * 被替换人封面抬头
*/ */
@Schema(description = "被替换人封面抬头") @Schema(description = "被替换人封面抬头")
private String coveInvoiceTitle; private String coverInvoiceTitle;
/**
* 替换人姓名
*/
@Schema(description = "替换人姓名")
private String replaceEmpName;
/**
* 替换人身份证号
*/
@Schema(description = "替换人身份证号")
private String replaceEmpIdcardNo;
/**
* 替换人项目名称
*/
@Schema(description = "被替换人项目名称")
private String replaceProjectName;
/**
* 替换人封面抬头
*/
@Schema(description = "替换人封面抬头")
private String replaceInvoiceTitle;
/** /**
* 退保金额 todo 数据库暂时没有 * 退保金额 todo 数据库暂时没有
......
...@@ -3,7 +3,9 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo; ...@@ -3,7 +3,9 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.checkerframework.common.value.qual.IntVal;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
...@@ -17,6 +19,14 @@ import java.util.List; ...@@ -17,6 +19,14 @@ import java.util.List;
public class InsuranceExportListParam extends BaseEntity implements Serializable { public class InsuranceExportListParam extends BaseEntity implements Serializable {
private static final long serialVersionUID = 3623027153213352936L; private static final long serialVersionUID = 3623027153213352936L;
/**
* 投保状态 1待投保 2投保中 3已投保 (4投保退回 5 已减员)不在此列表展示4,5
*/
@Schema(description = "投保状态 1待投保 2投保中 3已投保")
@NotNull(message = "投保状态不能为空")
@IntVal({1,2,3})
private Integer buyHandleStatus;
/** /**
* 员工姓名 * 员工姓名
*/ */
......
...@@ -115,6 +115,13 @@ public class InsuranceExportListVO implements Serializable { ...@@ -115,6 +115,13 @@ public class InsuranceExportListVO implements Serializable {
@Schema(description = "保单结束时间") @Schema(description = "保单结束时间")
private LocalDate policyEnd; private LocalDate policyEnd;
/**
* 保单生效时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
@JsonIgnore
private LocalDate policyEffect;
/** /**
* 保险公司名称(冗余字段) * 保险公司名称(冗余字段)
*/ */
......
...@@ -71,6 +71,12 @@ public class InsuranceRefundListVo implements Serializable { ...@@ -71,6 +71,12 @@ public class InsuranceRefundListVo implements Serializable {
@Schema(description = "保单编号") @Schema(description = "保单编号")
private String policyNo; private String policyNo;
/**
* 实际保费
*/
@Schema(description = "实际保费")
private String actualPremium;
/** /**
* 商险购买地省code * 商险购买地省code
*/ */
......
...@@ -64,6 +64,12 @@ public class InsuranceReplaceParam implements Serializable { ...@@ -64,6 +64,12 @@ public class InsuranceReplaceParam implements Serializable {
@Schema(description = "保单结束时间") @Schema(description = "保单结束时间")
private String policyEnd; private String policyEnd;
/**
* 购买标准
*/
@Schema(description = "购买标准")
private String buyStandard;
/** /**
* 替换员工姓名 * 替换员工姓名
*/ */
......
...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo; ...@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -18,6 +19,7 @@ public class InsuranceTypeVo extends TInsuranceType { ...@@ -18,6 +19,7 @@ public class InsuranceTypeVo extends TInsuranceType {
/** /**
* 所属保险公司名称 * 所属保险公司名称
*/ */
@Schema(description = "所属保险公司名称")
private String insuranceCompanyName; private String insuranceCompanyName;
/** /**
......
...@@ -3,7 +3,10 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo; ...@@ -3,7 +3,10 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.checkerframework.common.value.qual.IntVal;
import org.checkerframework.common.value.qual.StringVal;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
...@@ -17,6 +20,14 @@ import java.util.List; ...@@ -17,6 +20,14 @@ import java.util.List;
public class RefundExportListParam extends BaseEntity implements Serializable { public class RefundExportListParam extends BaseEntity implements Serializable {
private static final long serialVersionUID = 3623027153213352936L; private static final long serialVersionUID = 3623027153213352936L;
/**
* 减员状态 1待减员 2减员中 3减员退回 4减员成功
*/
@Schema(description = "减员状态 1待减员 2减员中 4减员成功")
@NotNull(message = "减员状态不能为空")
@IntVal({1,2,4})
private Integer reduceHandleStatus;
/** /**
* 员工姓名 * 员工姓名
*/ */
......
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 com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
/** /**
* @author zhaji * @author zhaji
...@@ -129,6 +131,13 @@ public class RefundExportListVo implements Serializable { ...@@ -129,6 +131,13 @@ public class RefundExportListVo implements Serializable {
@Schema(description = "保单结束时间") @Schema(description = "保单结束时间")
private LocalDate policyEnd; private LocalDate policyEnd;
/**
* 保单生效时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
@JsonIgnore
private LocalDate policyEffect;
/** /**
* 保险公司名称(冗余字段) * 保险公司名称(冗余字段)
*/ */
...@@ -193,7 +202,7 @@ public class RefundExportListVo implements Serializable { ...@@ -193,7 +202,7 @@ public class RefundExportListVo implements Serializable {
* 购买天数 * 购买天数
*/ */
@Schema(description = "购买天数") @Schema(description = "购买天数")
private long buyDay; private Long buyDay;
/** /**
* 封面抬头 * 封面抬头
...@@ -206,4 +215,11 @@ public class RefundExportListVo implements Serializable { ...@@ -206,4 +215,11 @@ public class RefundExportListVo implements Serializable {
*/ */
@Schema(description = "保单号") @Schema(description = "保单号")
private String policyNo; private String policyNo;
/**
* 派单日期
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
@Schema(description = "派单日期")
private LocalDateTime createTime;
} }
...@@ -39,7 +39,7 @@ public class TInsuranceTypeController { ...@@ -39,7 +39,7 @@ public class TInsuranceTypeController {
*/ */
@Operation(summary = "分页查询", description = "分页查询") @Operation(summary = "分页查询", description = "分页查询")
@GetMapping("/page" ) @GetMapping("/page" )
public R<IPage<InsuranceTypeVo>> getInsuranceTypePage(Page<TInsuranceType> page,TInsuranceType insuranceType) { public R<IPage<InsuranceTypeVo>> getInsuranceTypePage(Page<InsuranceTypeVo> page,InsuranceTypeVo insuranceType) {
return R.ok(insuranceTypeService.pageDiy(page, insuranceType)); return R.ok(insuranceTypeService.pageDiy(page, insuranceType));
} }
......
package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances; package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/** /**
* @author Administrator * @author Administrator
...@@ -14,4 +17,13 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -14,4 +17,13 @@ import org.apache.ibatis.annotations.Mapper;
public interface TInsuranceCompanyMapper extends BaseMapper<TInsuranceCompany> { public interface TInsuranceCompanyMapper extends BaseMapper<TInsuranceCompany> {
/**
* 分页查询保险公司
*
* @author licancan
* @param page
* @param param
* @return {@link IPage<TInsuranceCompany>}
*/
IPage<TInsuranceCompany> getInsuranceCompanyListPage(Page<TInsuranceCompany> page, @Param("param") TInsuranceCompany param);
} }
...@@ -44,9 +44,9 @@ public interface TInsuranceTypeMapper extends BaseMapper<TInsuranceType> { ...@@ -44,9 +44,9 @@ public interface TInsuranceTypeMapper extends BaseMapper<TInsuranceType> {
* @author zhaji * @author zhaji
* @param page 分页参数 * @param page 分页参数
* @param insuranceType 查询参数 * @param insuranceType 查询参数
* @return {@link IPage< InsuranceTypeVo>} * @return {@link IPage<InsuranceTypeVo>}
*/ */
IPage<InsuranceTypeVo> selectInsuranceTypePage(Page page, @Param("insuranceType") TInsuranceType insuranceType); IPage<InsuranceTypeVo> selectInsuranceTypePage(Page page, @Param("insuranceType") InsuranceTypeVo insuranceType);
InsuranceTypeVo getInsuranceTypeDetailById(String id); InsuranceTypeVo getInsuranceTypeDetailById(String id);
......
...@@ -22,9 +22,9 @@ public interface TInsuranceTypeService extends IService<TInsuranceType> { ...@@ -22,9 +22,9 @@ public interface TInsuranceTypeService extends IService<TInsuranceType> {
* @author zhaji * @author zhaji
* @param page 分页参数 * @param page 分页参数
* @param insuranceType 分页查询参数 * @param insuranceType 分页查询参数
* @return {@link IPage< TInsuranceType>} * @return {@link IPage<InsuranceTypeVo>}
*/ */
IPage<InsuranceTypeVo> pageDiy(Page<TInsuranceType> page,TInsuranceType insuranceType); IPage<InsuranceTypeVo> pageDiy(Page<InsuranceTypeVo> page,InsuranceTypeVo insuranceType);
/** /**
* 新增险种信息 * 新增险种信息
......
...@@ -48,13 +48,11 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM ...@@ -48,13 +48,11 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
* @author zhaji * @author zhaji
* @param page 分页参数 * @param page 分页参数
* @param insuranceCompany 查询类 * @param insuranceCompany 查询类
* @return {@link IPage< TInsuranceCompany>} * @return {@link IPage<TInsuranceCompany>}
*/ */
@Override @Override
public IPage<TInsuranceCompany> pageDiy(Page page, TInsuranceCompany insuranceCompany) { public IPage<TInsuranceCompany> pageDiy(Page page, TInsuranceCompany insuranceCompany) {
LambdaQueryWrapper<TInsuranceCompany> wrapper = new LambdaQueryWrapper<>(); IPage<TInsuranceCompany> list = this.baseMapper.getInsuranceCompanyListPage(page, insuranceCompany);
wrapper.orderByDesc(TInsuranceCompany::getCreateTime);
IPage<TInsuranceCompany> list = this.baseMapper.selectPage(page, wrapper);
return list; return list;
} }
......
...@@ -46,10 +46,10 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper, ...@@ -46,10 +46,10 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
* @author zhaji * @author zhaji
* @param page 分页参数 * @param page 分页参数
* @param insuranceType 分页查询参数 * @param insuranceType 分页查询参数
* @return {@link IPage< TInsuranceType>} * @return {@link IPage<InsuranceTypeVo>}
*/ */
@Override @Override
public IPage<InsuranceTypeVo> pageDiy(Page<TInsuranceType> page, TInsuranceType insuranceType) { public IPage<InsuranceTypeVo> pageDiy(Page<InsuranceTypeVo> page, InsuranceTypeVo insuranceType) {
return this.baseMapper.selectInsuranceTypePage(page,insuranceType); return this.baseMapper.selectInsuranceTypePage(page,insuranceType);
} }
......
...@@ -28,4 +28,17 @@ ...@@ -28,4 +28,17 @@
DELETE_FLAG, DELETE_FLAG,
INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME INSURANCE_HANDLE_PROVINCE,INSURANCE_HANDLE_PROVINCE_NAME,INSURANCE_HANDLE_CITY,INSURANCE_HANDLE_CITY_NAME
</sql> </sql>
<select id="getInsuranceCompanyListPage" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"></include>
FROM t_insurance_company
where DELETE_FLAG = 0
<if test="param.companyName != null and param.companyName.trim() != ''">
and COMPANY_NAME = #{param.companyName}
</if>
<if test="param.insuranceHandleCity != null">
and INSURANCE_HANDLE_CITY = #{param.insuranceHandleCity}
</if>
ORDER BY CREATE_TIME DESC
</select>
</mapper> </mapper>
...@@ -226,6 +226,7 @@ ...@@ -226,6 +226,7 @@
a.INSURANCE_COMPANY_NAME as insuranceCompanyName, a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
a.INSURANCE_TYPE_NAME as insuranceTypeName, a.INSURANCE_TYPE_NAME as insuranceTypeName,
a.BUY_STANDARD as buyStandard, a.BUY_STANDARD as buyStandard,
a.CREATE_TIME as createTime,
a.CREATE_NAME as createName, a.CREATE_NAME as createName,
a.BUY_HANDLE_STATUS as buyHandleStatus, a.BUY_HANDLE_STATUS as buyHandleStatus,
a.SETTLE_TYPE as settleType, a.SETTLE_TYPE as settleType,
...@@ -339,6 +340,7 @@ ...@@ -339,6 +340,7 @@
a.INSURANCE_HANDLE_CITY_NAME as insuranceHandleCityName, a.INSURANCE_HANDLE_CITY_NAME as insuranceHandleCityName,
a.POLICY_START as policyStart, a.POLICY_START as policyStart,
a.POLICY_END as policyEnd, a.POLICY_END as policyEnd,
a.POLICY_EFFECT as policyEffect,
a.INSURANCE_COMPANY_NAME as insuranceCompanyName, a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
a.INSURANCE_TYPE_NAME as insuranceTypeName, a.INSURANCE_TYPE_NAME as insuranceTypeName,
a.BUY_STANDARD as buyStandard, a.BUY_STANDARD as buyStandard,
...@@ -371,6 +373,7 @@ ...@@ -371,6 +373,7 @@
a.INSURANCE_HANDLE_CITY_NAME as insuranceHandleCityName, a.INSURANCE_HANDLE_CITY_NAME as insuranceHandleCityName,
a.POLICY_START as policyStart, a.POLICY_START as policyStart,
a.POLICY_END as policyEnd, a.POLICY_END as policyEnd,
a.POLICY_EFFECT as policyEffect,
a.INSURANCE_COMPANY_NAME as insuranceCompanyName, a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
a.INSURANCE_TYPE_NAME as insuranceTypeName, a.INSURANCE_TYPE_NAME as insuranceTypeName,
a.BUY_STANDARD as buyStandard, a.BUY_STANDARD as buyStandard,
...@@ -382,7 +385,7 @@ ...@@ -382,7 +385,7 @@
a.POLICY_NO as policyNo, a.POLICY_NO as policyNo,
a.REMARK as remark a.REMARK as remark
from t_insurance_detail a from t_insurance_detail a
where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = 1 where a.DELETE_FLAG = 0 and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
<if test="param.empName != null and param.empName.trim() != ''"> <if test="param.empName != null and param.empName.trim() != ''">
and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%') and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
</if> </if>
...@@ -687,6 +690,8 @@ ...@@ -687,6 +690,8 @@
a.INSURANCE_HANDLE_CITY_NAME as insuranceHandleCityName, a.INSURANCE_HANDLE_CITY_NAME as insuranceHandleCityName,
a.POLICY_START as policyStart, a.POLICY_START as policyStart,
a.POLICY_END as policyEnd, a.POLICY_END as policyEnd,
a.POLICY_NO as policyNo,
a.ACTUAL_PREMIUM as actualPremium,
a.INSURANCE_COMPANY_NAME as insuranceCompanyName, a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
a.INSURANCE_TYPE_NAME as insuranceTypeName, a.INSURANCE_TYPE_NAME as insuranceTypeName,
a.BUY_STANDARD as buyStandard, a.BUY_STANDARD as buyStandard,
...@@ -767,6 +772,7 @@ ...@@ -767,6 +772,7 @@
a.BUY_STANDARD as buyStandard, a.BUY_STANDARD as buyStandard,
a.MEDICAL_QUOTA as medicalQuota, a.MEDICAL_QUOTA as medicalQuota,
a.DIE_DISABLE_QUOTA as dieDisableQuota, a.DIE_DISABLE_QUOTA as dieDisableQuota,
a.CREATE_TIME as createTime,
refund.CREATE_NAME as createName, refund.CREATE_NAME as createName,
a.REDUCE_HANDLE_STATUS as reduceHandleStatus a.REDUCE_HANDLE_STATUS as reduceHandleStatus
from from
...@@ -921,7 +927,7 @@ ...@@ -921,7 +927,7 @@
t_insurance_refund refund t_insurance_refund refund
where where
a.REFUND_ID = refund.ID and a.REFUND_ID = refund.ID and
a.DELETE_FLAG = 0 and a.REDUCE_HANDLE_STATUS = 1 a.DELETE_FLAG = 0 and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
<if test="param.empName != null and param.empName.trim() != ''"> <if test="param.empName != null and param.empName.trim() != ''">
and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%') and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
</if> </if>
......
...@@ -71,6 +71,12 @@ ...@@ -71,6 +71,12 @@
a.INSURANCE_COMPANY_ID = b.ID a.INSURANCE_COMPANY_ID = b.ID
and and
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
<if test="insuranceType.insuranceCompanyName != null and insuranceType.insuranceCompanyName.trim() != ''">
and b.COMPANY_NAME = #{insuranceType.insuranceCompanyName}
</if>
<if test="insuranceType.name != null and insuranceType.name.trim() != ''">
and a.NAME like concat('%',replace(replace(#{insuranceType.name},'_','\_'),'%','\%'),'%')
</if>
ORDER BY a.CREATE_TIME DESC ORDER BY a.CREATE_TIME DESC
</select> </select>
<select id="getInsuranceTypeDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo"> <select id="getInsuranceTypeDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo">
......
...@@ -26,7 +26,7 @@ public class TSalaryStandardExportVo implements Serializable { ...@@ -26,7 +26,7 @@ public class TSalaryStandardExportVo implements Serializable {
/** /**
* 状态0待提交 1待审核 2审核通过 3发送成功 5审核不通过 10 发送失败 * 状态0待提交 1待审核 2审核通过 3发送成功 5审核不通过 10 发送失败
*/ */
@ExcelAttribute(name = "状态", isDataId = true, readConverterExp = "0=待提交,1=待审核,2=审核通过,3=发送成功,5=审核不通过,10=发送失败") @ExcelAttribute(name = "状态", isDataId = true, readConverterExp = "0=待提交,1=待审核,2=审核通过,3=发送成功,5=审核不通过,6=确认不通过,10=发送失败")
@NotBlank(message = "状态(0待提交 1待审核 2审核通过 3发送成功 5审核不通过 10 发送失败)不能为空") @NotBlank(message = "状态(0待提交 1待审核 2审核通过 3发送成功 5审核不通过 10 发送失败)不能为空")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("薪酬状态") @ExcelProperty("薪酬状态")
......
...@@ -120,4 +120,13 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> { ...@@ -120,4 +120,13 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
int noPageCountDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo, int noPageCountDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo,
@Param("idList") List<String> idList); @Param("idList") List<String> idList);
/**
* @param salaryId 工资表id
* @Description: 退表回退状态
* @Author: hgw
* @Date: 2022/11/8 15:41
* @return: void
**/
void backSalaryBySalaryId(@Param("salaryId") String salaryId);
} }
...@@ -114,4 +114,13 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> { ...@@ -114,4 +114,13 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam> * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpSalaryParam>
**/ **/
List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId); List<EkpSalaryParamVo> getEkpSalaryParamList(String salaryId);
/**
* @param salaryId 工资表id
* @Description: 退表回退状态
* @Author: hgw
* @Date: 2022/11/8 15:41
* @return: void
**/
void backSalaryBySalaryId(String salaryId);
} }
...@@ -229,4 +229,9 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, ...@@ -229,4 +229,9 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
return baseMapper.getEkpSalaryParamList(salaryId); return baseMapper.getEkpSalaryParamList(salaryId);
} }
@Override
public void backSalaryBySalaryId(String salaryId) {
baseMapper.backSalaryBySalaryId(salaryId);
}
} }
...@@ -594,9 +594,9 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -594,9 +594,9 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
standardParam.setFd_3b3d3ec85bfeb0(s.getSalaryMonth().substring(0,4) standardParam.setFd_3b3d3ec85bfeb0(s.getSalaryMonth().substring(0,4)
+ CommonConstants.CENTER_SPLIT_LINE_STRING + s.getSalaryMonth().substring(4,6)); + CommonConstants.CENTER_SPLIT_LINE_STRING + s.getSalaryMonth().substring(4,6));
// 推送主表信息 // 推送主表信息
sendBack = ekpSalaryUtil.sendStandardToEKP(standardParam); sendBack = ekpSalaryUtil.sendStandardToEKP(s.getCreateName(), standardParam);
if (Common.isEmpty(sendBack) || sendBack.length() != 32) { if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
sendBack = ekpSalaryUtil.sendStandardToEKP(standardParam); sendBack = ekpSalaryUtil.sendStandardToEKP(s.getCreateName(), standardParam);
} }
s.setSendTime(new Date()); s.setSendTime(new Date());
s.setSendMonth(nowMonth); s.setSendMonth(nowMonth);
...@@ -901,16 +901,20 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -901,16 +901,20 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
param.setFd_3b3c293745e7b4(ss.getDeptName()); param.setFd_3b3c293745e7b4(ss.getDeptName());
param.setFd_3b3c2935c13056(ss.getDeptNo()); param.setFd_3b3c2935c13056(ss.getDeptNo());
param.setFd_3b3c293811c0ee(ss.getApplyNo()); param.setFd_3b3c293811c0ee(ss.getApplyNo());
String sendBack = ekpSalaryUtil.backStandardToEKP(param); String sendBack = ekpSalaryUtil.backStandardToEKP(ss.getCreateName(), param);
if (Common.isEmpty(sendBack) || sendBack.length() != 32) { if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
sendBack = ekpSalaryUtil.backStandardToEKP(param); sendBack = ekpSalaryUtil.backStandardToEKP(ss.getCreateName(), param);
} }
if (Common.isNotNull(sendBack) && sendBack.length() == 32) { if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
// 更新薪资为确认不通过 // 更新薪资为确认不通过
ss.setStatus(SalaryConstants.STATUS[6]); ss.setStatus(SalaryConstants.STATUS[6]);
ss.setSendMonth(null);
ss.setSendTime(null);
ss.setBackTime(new Date()); ss.setBackTime(new Date());
ss.setBackEkpId(sendBack); ss.setBackEkpId(sendBack);
this.updateById(ss); this.updateById(ss);
// 更新报账表
salaryAccountService.backSalaryBySalaryId(ss.getId());
TIncome income = new TIncome(); TIncome income = new TIncome();
income.setApplyNo(applyNo); income.setApplyNo(applyNo);
// 删除收入对应编号的明细 // 删除收入对应编号的明细
......
...@@ -167,6 +167,7 @@ ...@@ -167,6 +167,7 @@
<result property="socialSum" column="social_sum"/> <result property="socialSum" column="social_sum"/>
<result property="fundSum" column="fund_sum"/> <result property="fundSum" column="fund_sum"/>
<result property="fd_3b178f0ded2114" column="fd_3b178f0ded2114"/> <result property="fd_3b178f0ded2114" column="fd_3b178f0ded2114"/>
<result property="fd_3b3bef19b61c38" column="fd_3b3bef19b61c38"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -548,14 +549,14 @@ ...@@ -548,14 +549,14 @@
,if(a.OWN_FLAG='1','是','否') fd_3adfee0009d070 ,if(a.OWN_FLAG='1','是','否') fd_3adfee0009d070
,if(a.ANNUAL_BONUS_TYPE='1','单独','合并') fd_3adfee01dea2fa ,if(a.ANNUAL_BONUS_TYPE='1','单独','合并') fd_3adfee01dea2fa
,ifnull(a.RELAY_SALARY,'0') fd_3adfee12cb8840 ,ifnull(a.RELAY_SALARY,'0') fd_3adfee12cb8840
,ifnull(pdeduction.SALARY_MONEY,'0') fd_3adfee1374ed7a ,sum(ifnull(pdeduction.SALARY_MONEY,'0')) fd_3adfee1374ed7a
,ifnull(ifnull(withholidingUnitSocial.SALARY_MONEY,unitSocial.SALARY_MONEY),'') fd_3adfee1e2b2f78 ,ifnull(ifnull(withholidingUnitSocial.SALARY_MONEY,unitSocial.SALARY_MONEY),'') fd_3adfee1e2b2f78
,ifnull(ifnull(withholidingPersonSocial.SALARY_MONEY,personalSocial.SALARY_MONEY),'') fd_3adfee1e88723e ,ifnull(ifnull(withholidingPersonSocial.SALARY_MONEY,personalSocial.SALARY_MONEY),'') fd_3adfee1e88723e
,ifnull(ifnull(withholidingUnitFund.SALARY_MONEY,unitFund.SALARY_MONEY),'') fd_3adfee1ee24680 ,ifnull(ifnull(withholidingUnitFund.SALARY_MONEY,unitFund.SALARY_MONEY),'') fd_3adfee1ee24680
,ifnull(ifnull(withholidingPersonFund.SALARY_MONEY,personalFund.SALARY_MONEY),'') fd_3adfee1f32fa24 ,ifnull(ifnull(withholidingPersonFund.SALARY_MONEY,personalFund.SALARY_MONEY),'') fd_3adfee1f32fa24
,ifnull(a.SALARY_TAX,'0') + ifnull(a.SALARY_TAX_UNIT,'0') + ifnull(a.ANNUAL_BONUS_TAX,'0') fd_3adfee1f901c46 ,ifnull(a.SALARY_TAX,'0') + ifnull(a.SALARY_TAX_UNIT,'0') + ifnull(a.ANNUAL_BONUS_TAX,'0') fd_3adfee1f901c46
,'' fd_3adfee1ff1ca6a ,ifnull(enterpriseAnnuityUnit.SALARY_MONEY,'0') fd_3adfee1ff1ca6a
,'' fd_3adfee203f86b2 ,ifnull(enterpriseAnnuity.SALARY_MONEY,'0') fd_3adfee203f86b2
,ifnull(a.ACTUAL_SALARY,'0') fd_3adfee20fe5ba4 ,ifnull(a.ACTUAL_SALARY,'0') fd_3adfee20fe5ba4
,ifnull(a.RELAY_SALARY,'0') - ifnull(ifnull(withholidingPersonSocial.SALARY_MONEY,personalSocial.SALARY_MONEY),'0') - ifnull(ifnull(withholidingPersonFund.SALARY_MONEY,personalFund.SALARY_MONEY),'') fd_3adfee21802434 ,ifnull(a.RELAY_SALARY,'0') - ifnull(ifnull(withholidingPersonSocial.SALARY_MONEY,personalSocial.SALARY_MONEY),'0') - ifnull(ifnull(withholidingPersonFund.SALARY_MONEY,personalFund.SALARY_MONEY),'') fd_3adfee21802434
,'' fd_3adfee4ba5ad36 ,'' fd_3adfee4ba5ad36
...@@ -611,7 +612,10 @@ ...@@ -611,7 +612,10 @@
left join t_salary_account_item withholidingUnitSocial on withholidingUnitSocial.SALARY_ACCOUNT_ID = a.id and withholidingUnitSocial.JAVA_FIED_NAME='withholidingUnitSocial' left join t_salary_account_item withholidingUnitSocial on withholidingUnitSocial.SALARY_ACCOUNT_ID = a.id and withholidingUnitSocial.JAVA_FIED_NAME='withholidingUnitSocial'
left join t_salary_account_item withholidingUnitFund on withholidingUnitFund.SALARY_ACCOUNT_ID = a.id and withholidingUnitFund.JAVA_FIED_NAME='withholidingUnitFund' left join t_salary_account_item withholidingUnitFund on withholidingUnitFund.SALARY_ACCOUNT_ID = a.id and withholidingUnitFund.JAVA_FIED_NAME='withholidingUnitFund'
left join t_salary_account_item pdeduction on pdeduction.SALARY_ACCOUNT_ID = a.id and pdeduction.JAVA_FIED_NAME='pdeduction' left join t_salary_account_item pdeduction on pdeduction.SALARY_ACCOUNT_ID = a.id and pdeduction.JAVA_FIED_NAME='pdeduction'
left join t_salary_account_item enterpriseAnnuity on enterpriseAnnuity.SALARY_ACCOUNT_ID = a.id and enterpriseAnnuity.JAVA_FIED_NAME='enterpriseAnnuity'
left join t_salary_account_item enterpriseAnnuityUnit on enterpriseAnnuityUnit.SALARY_ACCOUNT_ID = a.id and enterpriseAnnuityUnit.JAVA_FIED_NAME='enterpriseAnnuityUnit'
where a.DELETE_FLAG = 0 and a.SALARY_FORM_ID = #{salaryId} and a.SEND_STATUS = '0' where a.DELETE_FLAG = 0 and a.SALARY_FORM_ID = #{salaryId} and a.SEND_STATUS = '0'
GROUP BY a.id
</select> </select>
...@@ -834,4 +838,9 @@ ...@@ -834,4 +838,9 @@
</if> </if>
</if> </if>
</sql> </sql>
<!-- 退表回退状态 -->
<update id="backSalaryBySalaryId" >
update t_salary_account a set a.SEND_STATUS = '0' where a.SALARY_FORM_ID = #{salaryId}
</update>
</mapper> </mapper>
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