Commit 2e62e6ea authored by zhaji's avatar zhaji

Merge branch 'develop' into feature-zhaji

parents 35e2ccae 6913034d
...@@ -36,12 +36,12 @@ import java.util.List; ...@@ -36,12 +36,12 @@ import java.util.List;
public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> { public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
/** /**
* @param id * @param departNo
* @Author: wangan * @Author: wangan
* @Date: 2019/10/18 * @Date: 2019/10/18
* @Description: 通过id获取项目及单位部分信息 * @Description: 通过id获取项目及单位部分信息
**/ **/
TSettleDomainSelectVo selectSettleDomainSelectVosById(@Param("id") String id); TSettleDomainSelectVo selectSettleDomainSelectVosById(@Param("departNo") String departNo);
/** /**
* 获取所有客户单位的项目信息 * 获取所有客户单位的项目信息
......
...@@ -95,7 +95,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T ...@@ -95,7 +95,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
**/ **/
@Override @Override
public TSettleDomainSelectVo selectSettleDomainSelectVosById(TSettleDomainSelectVo settleDomainSelectVo) { public TSettleDomainSelectVo selectSettleDomainSelectVosById(TSettleDomainSelectVo settleDomainSelectVo) {
return baseMapper.selectSettleDomainSelectVosById(settleDomainSelectVo.getId()); return baseMapper.selectSettleDomainSelectVosById(settleDomainSelectVo.getDepartNo());
} }
@Override @Override
......
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
INDUSTRY_BELONG, INDUSTRY_BELONG,
CUSTOMER_CODE from t_customer_info CUSTOMER_CODE from t_customer_info
) c ON a.CUSTOMER_ID = c.customerId ) c ON a.CUSTOMER_ID = c.customerId
WHERE a.id=#{id} GROUP BY a.id WHERE a.DEPART_NO=#{departNo} GROUP BY a.DEPART_NO
</select> </select>
<select id="selectAllSettleDomainSelectVos" resultMap="tSettleDomainSelectVoMap"> <select id="selectAllSettleDomainSelectVos" resultMap="tSettleDomainSelectVoMap">
......
...@@ -69,4 +69,6 @@ public class ValidityConstants { ...@@ -69,4 +69,6 @@ public class ValidityConstants {
/** 不超过两位小数的正数 */ /** 不超过两位小数的正数 */
public static final String POSITIVE_INTEGER_PATTERN_TWO_FLOAT = "^[+]?([0-9]+(.[0-9]{1,2})?)$"; public static final String POSITIVE_INTEGER_PATTERN_TWO_FLOAT = "^[+]?([0-9]+(.[0-9]{1,2})?)$";
/** 身份证规则(x只能大写) */
public static final String IDCARD_UPPERCASE_PATTERN = "(^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9X]$)|(^[1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}$)" ;
} }
...@@ -84,7 +84,7 @@ public class ArchivesDaprUtil { ...@@ -84,7 +84,7 @@ public class ArchivesDaprUtil {
**/ **/
public R<TSettleDomainSelectVo> getSettleDomainSelectVoById(String departId){ public R<TSettleDomainSelectVo> getSettleDomainSelectVoById(String departId){
TSettleDomainSelectVo settleDomainSelectVo = new TSettleDomainSelectVo(); TSettleDomainSelectVo settleDomainSelectVo = new TSettleDomainSelectVo();
settleDomainSelectVo.setId(departId); settleDomainSelectVo.setDepartNo(departId);
R<TSettleDomainSelectVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainSelectVoById",settleDomainSelectVo, TSettleDomainSelectVo.class, SecurityConstants.FROM_IN); R<TSettleDomainSelectVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tsettledomain/getSettleDomainSelectVoById",settleDomainSelectVo, TSettleDomainSelectVo.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){ if (Common.isEmpty(res)){
return R.failed("获取派单校验需要的档案信息失败!"); return R.failed("获取派单校验需要的档案信息失败!");
......
...@@ -12,6 +12,6 @@ dapr.check.appId=yifu-check ...@@ -12,6 +12,6 @@ dapr.check.appId=yifu-check
dapr.archives.appUrl=http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/ dapr.archives.appUrl=http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.archives.appId=yifu-archives dapr.archives.appId=yifu-archives
dapr.insurances.appUrl=http://yifu-insurances.qas-mvp.svc.cluster.local:3500/v1.0/invoke/ dapr.insurances.appUrl=http://yifu-auth.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.insurances.appId=yifu-insurances dapr.insurances.appId=yifu-insurances
...@@ -190,9 +190,9 @@ public class InsurancesConstants { ...@@ -190,9 +190,9 @@ public class InsurancesConstants {
*/ */
public static final String REPLACE_EMP_INFO_SAME = "替换信息和被替换信息一致,无法替换"; public static final String REPLACE_EMP_INFO_SAME = "替换信息和被替换信息一致,无法替换";
/** /**
* 替换员工身份证号格式 * 替换员工身份证号格式
*/ */
public static final String REPLACE_EMP_IDCARD_NO_NOT_LEGITIMATE = "替换员工身份证号格式误"; public static final String REPLACE_EMP_IDCARD_NO_NOT_LEGITIMATE = "替换员工身份证号格式误";
/** /**
* 项目编码不能为空 * 项目编码不能为空
*/ */
......
...@@ -150,7 +150,7 @@ public class ValidityUtil { ...@@ -150,7 +150,7 @@ public class ValidityUtil {
if(Common.isEmpty(idCard)){ if(Common.isEmpty(idCard)){
return Boolean.FALSE ; return Boolean.FALSE ;
} }
return idCard.matches(ValidityConstants.IDCARD_PATTERN) ; return idCard.matches(ValidityConstants.IDCARD_UPPERCASE_PATTERN) ;
} }
/** /**
......
...@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
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;
...@@ -60,33 +61,38 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -60,33 +61,38 @@ public class TPreDispatchInfo extends BaseEntity {
@Schema(description ="派单类型:0 派增 1 派减") @Schema(description ="派单类型:0 派增 1 派减")
@NotNull(message = "派单类型不可为空") @NotNull(message = "派单类型不可为空")
@Size(max = 2, message = "派单类型不可超过2位") @Size(max = 2, message = "派单类型不可超过2位")
private String type; @ExcelAttribute(name = "派单类型", maxLength = 2)
private String type;
/** /**
* 日期,格式:2020-12-25 * 日期,格式:2020-12-25
*/ */
@Schema(description ="日期,格式:2020-12-25") @Schema(description ="日期,格式:2020-12-25")
private String date; @ExcelAttribute(name = "日期")
private String date;
/** /**
* 接单分公司 * 接单分公司
*/ */
@Schema(description ="接单分公司") @Schema(description ="接单分公司")
@Size(max = 50, message = "接单分公司不可超过50位") @Size(max = 50, message = "接单分公司不可超过50位")
private String company; @ExcelAttribute(name = "接单分公司", maxLength = 50)
private String company;
/** /**
* 缴费地 * 缴费地
*/ */
@Schema(description ="缴费地") @Schema(description ="缴费地")
@Size(max = 20, message = "接单分公司不可超过20位") @Size(max = 20, message = "缴费地不可超过20位")
private String payAddress; @ExcelAttribute(name = "缴费地", isNotEmpty = true,errorInfo = "缴费地不能为空", maxLength = 20)
private String payAddress;
/** /**
* 客户名称 * 客户名称
*/ */
@Schema(description ="客户名称") @Schema(description ="客户名称")
@Size(max = 50, message = "客户名称不可超过50位") @Size(max = 50, message = "客户名称不可超过50位")
@ExcelAttribute(name = "客户名称", errorInfo = "客户名称不能为空", maxLength = 50)
private String customerName; private String customerName;
/** /**
...@@ -95,7 +101,8 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -95,7 +101,8 @@ public class TPreDispatchInfo extends BaseEntity {
@Schema(description ="身份证号") @Schema(description ="身份证号")
@NotNull(message = "身份证号码不可为空") @NotNull(message = "身份证号码不可为空")
@Size(max = 20, message = "身份证号码不可超过20位") @Size(max = 20, message = "身份证号码不可超过20位")
private String empIdcard; @ExcelAttribute(name = "身份证号", isNotEmpty = true,errorInfo = "身份证号不能为空", maxLength = 20, isIdCard = true)
private String empIdcard;
/** /**
* 员工姓名 * 员工姓名
...@@ -103,39 +110,45 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -103,39 +110,45 @@ public class TPreDispatchInfo extends BaseEntity {
@Schema(description ="员工姓名") @Schema(description ="员工姓名")
@NotNull(message = "员工姓名不可为空") @NotNull(message = "员工姓名不可为空")
@Size(max = 20, message = "员工姓名不可超过20位") @Size(max = 20, message = "员工姓名不可超过20位")
private String empName; @ExcelAttribute(name = "员工姓名", isNotEmpty = true, maxLength = 20)
private String empName;
/** /**
* 联系电话1 * 联系电话1
*/ */
@Schema(description ="联系电话1") @Schema(description ="联系电话1")
private String telOne; @ExcelAttribute(name = "联系电话1", maxLength = 20)
private String telOne;
/** /**
* 联系电话2 * 联系电话2
*/ */
@Schema(description ="联系电话2") @Schema(description ="联系电话2")
private String telTwo; @ExcelAttribute(name = "联系电话2", maxLength = 20)
private String telTwo;
/** /**
* 入职日期 * 入职日期
*/ */
@Schema(description ="入职日期") @Schema(description ="入职日期")
@Size(max = 20, message = "入职日期不可超过20位") @Size(max = 20, message = "入职日期不可超过20位")
private String entryDate; @ExcelAttribute(name = "入职日期",isDate = true,dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT)
private String entryDate;
/** /**
* 正式工资 * 正式工资
*/ */
@Schema(description ="正式工资") @Schema(description ="正式工资")
private String formalSalary; @ExcelAttribute(name = "正式工资")
private String formalSalary;
/** /**
* 派遣开始日期 * 派遣开始日期
*/ */
@Schema(description ="派遣开始日期") @Schema(description ="派遣开始日期")
@Size(max = 20, message = "派遣开始日期不可超过20位") @Size(max = 20, message = "派遣开始日期不可超过20位")
private String dispatchStart; @ExcelAttribute(name = "派遣开始日期", maxLength = 20)
private String dispatchStart;
/** /**
* 派遣结束日期 * 派遣结束日期
...@@ -149,40 +162,46 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -149,40 +162,46 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="合同开始日期") @Schema(description ="合同开始日期")
@Size(max = 20, message = "合同开始日期不可超过20位") @Size(max = 20, message = "合同开始日期不可超过20位")
private String contractStart; @ExcelAttribute(name = "派遣结束日期", maxLength = 20)
private String contractStart;
/** /**
* 合同终止日期 * 合同终止日期
*/ */
@Schema(description ="合同终止日期") @Schema(description ="合同终止日期")
@Size(max = 20, message = "合同终止日期不可超过20位") @Size(max = 20, message = "合同终止日期不可超过20位")
private String contractEnd; @ExcelAttribute(name = "合同终止日期", isDate = true, dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT)
private String contractEnd;
/** /**
* 使用开始日期 * 用开始日期
*/ */
@Schema(description ="使用开始日期") @Schema(description ="试用开始日期")
@Size(max = 20, message = "使用开始日期不可超过20位") @Size(max = 20, message = "试用开始日期不可超过20位")
private String trialStart; @ExcelAttribute(name = "试用开始日期", maxLength = 20)
private String trialStart;
/** /**
* 试用结束日期 * 试用结束日期
*/ */
@Schema(description ="试用结束日期") @Schema(description ="试用结束日期")
@Size(max = 20, message = "试用结束日期不可超过20位") @Size(max = 20, message = "试用结束日期不可超过20位")
@ExcelAttribute(name = "试用结束日期", maxLength = 20)
private String trialEnd; private String trialEnd;
/** /**
* 试用期工资 * 试用期工资
*/ */
@Schema(description ="试用期工资") @Schema(description ="试用期工资")
private String trialSalary; @ExcelAttribute(name = "试用期工资")
private String trialSalary;
/** /**
* 工作制 * 工作制
*/ */
@Schema(description ="工作制") @Schema(description ="工作制")
@Size(max = 20, message = "工作制不可超过20位") @Size(max = 20, message = "工作制不可超过20位")
@ExcelAttribute(name = "工作制", maxLength = 20)
private String workingSystem; private String workingSystem;
/** /**
...@@ -190,280 +209,326 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -190,280 +209,326 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="合同版本") @Schema(description ="合同版本")
@Size(max = 20, message = "合同版本不可超过20位") @Size(max = 20, message = "合同版本不可超过20位")
@ExcelAttribute(name = "合同版本", maxLength = 20)
private String contractVersion; private String contractVersion;
/** /**
* 是否电话通知 * 是否电话通知
*/ */
@Schema(description ="是否电话通知") @Schema(description ="是否电话通知")
private String telNotice; @ExcelAttribute(name = "是否电话通知")
private String telNotice;
/** /**
* 实际工作地 * 实际工作地
*/ */
@Schema(description ="实际工作地") @Schema(description ="实际工作地")
@ExcelAttribute(name = "实际工作地")
private String workingAddress; private String workingAddress;
/** /**
* 备注说明1 * 备注说明1
*/ */
@Schema(description ="备注说明1") @Schema(description ="备注说明1")
@ExcelAttribute(name = "备注说明1", maxLength = 255)
private String remarkOne; private String remarkOne;
/** /**
* 备注说明2 * 备注说明2
*/ */
@Schema(description ="备注说明2") @Schema(description ="备注说明2")
private String remarkTwo; @ExcelAttribute(name = "备注说明2", maxLength = 255)
private String remarkTwo;
/** /**
* 养老城市 * 养老城市
*/ */
@Schema(description ="养老城市") @Schema(description ="养老城市")
@ExcelAttribute(name = "养老城市")
private String pensionAddress; private String pensionAddress;
/** /**
* 养老基数 * 养老基数
*/ */
@Schema(description ="养老基数") @Schema(description ="养老基数")
private BigDecimal pensionBase; @ExcelAttribute(name = "养老基数")
private BigDecimal pensionBase;
/** /**
* 养老起缴月 * 养老起缴月
*/ */
@Schema(description ="养老起缴月") @Schema(description ="养老起缴月")
@ExcelAttribute(name = "养老起缴月")
private String pensionStart; private String pensionStart;
/** /**
* 医疗城市 * 医疗城市
*/ */
@Schema(description ="医疗城市") @Schema(description ="医疗城市")
@ExcelAttribute(name = "医疗城市")
private String medicalAddress; private String medicalAddress;
/** /**
* 医疗基数 * 医疗基数
*/ */
@Schema(description ="医疗基数") @Schema(description ="医疗基数")
private BigDecimal medicalBase; @ExcelAttribute(name = "医疗基数")
private BigDecimal medicalBase;
/** /**
* 医疗起缴月 * 医疗起缴月
*/ */
@Schema(description ="医疗起缴月") @Schema(description ="医疗起缴月")
private String medicalStart; @ExcelAttribute(name = "医疗起缴月")
private String medicalStart;
/** /**
* 工伤城市 * 工伤城市
*/ */
@Schema(description ="工伤城市") @Schema(description ="工伤城市")
private String injuryAddress; @ExcelAttribute(name = "工伤城市")
private String injuryAddress;
/** /**
* 工伤基数 * 工伤基数
*/ */
@Schema(description ="工伤基数") @Schema(description ="工伤基数")
private BigDecimal injuryBase; @ExcelAttribute(name = "工伤基数")
private BigDecimal injuryBase;
/** /**
* 工伤起缴月 * 工伤起缴月
*/ */
@Schema(description ="工伤起缴月") @Schema(description ="工伤起缴月")
private String injuryStart; @ExcelAttribute(name = "工伤起缴月")
private String injuryStart;
/** /**
* 生育城市 * 生育城市
*/ */
@Schema(description ="生育城市") @Schema(description ="生育城市")
private String birthAddress; @ExcelAttribute(name = "生育城市", maxLength = 15)
private String birthAddress;
/** /**
* 生育基数 * 生育基数
*/ */
@Schema(description ="生育基数") @Schema(description ="生育基数")
private BigDecimal birthBase; @ExcelAttribute(name = "生育基数")
private BigDecimal birthBase;
/** /**
* 生育起缴月 * 生育起缴月
*/ */
@Schema(description ="生育起缴月") @Schema(description ="生育起缴月")
private String birthStart; @ExcelAttribute(name = "生育起缴月", maxLength = 6)
private String birthStart;
/** /**
* 失业城市 * 失业城市
*/ */
@Schema(description ="失业城市") @Schema(description ="失业城市")
private String unemploymentAddress; @ExcelAttribute(name = "失业城市", maxLength = 15)
private String unemploymentAddress;
/** /**
* 失业基数 * 失业基数
*/ */
@Schema(description ="失业基数") @Schema(description ="失业基数")
private BigDecimal unemploymentBase; @ExcelAttribute(name = "失业基数")
private BigDecimal unemploymentBase;
/** /**
* 失业起缴月 * 失业起缴月
*/ */
@Schema(description ="失业起缴月") @Schema(description ="失业起缴月")
private String unemploymentStart; @ExcelAttribute(name = "失业起缴月", maxLength = 6)
private String unemploymentStart;
/** /**
* 公积金城市 * 公积金城市
*/ */
@Schema(description ="公积金城市") @Schema(description ="公积金城市")
private String fundAddress; @ExcelAttribute(name = "公积金城市", maxLength = 15)
private String fundAddress;
/** /**
* 公积金基数 * 公积金基数
*/ */
@Schema(description ="公积金基数") @Schema(description ="公积金基数")
private BigDecimal fundBase; @ExcelAttribute(name = "公积金基数", isFloat = true)
private BigDecimal fundBase;
/** /**
* 公积金起缴月 * 公积金起缴月
*/ */
@Schema(description ="公积金起缴月") @Schema(description ="公积金起缴月")
private String fundStart; @ExcelAttribute(name = "公积金起缴月", maxLength = 6)
private String fundStart;
/** /**
* 公积金个人比例 * 公积金个人比例
*/ */
@Schema(description ="公积金个人比例") @Schema(description ="公积金个人比例")
private BigDecimal fundPersonalPer; @ExcelAttribute(name = "公积金个人比例", isFloat = true)
private BigDecimal fundPersonalPer;
/** /**
* 公积金企业比例 * 公积金企业比例
*/ */
@Schema(description ="公积金企业比例") @Schema(description ="公积金企业比例")
private BigDecimal fundCompanyPer; @ExcelAttribute(name = "公积金企业比例", isFloat = true)
private BigDecimal fundCompanyPer;
/** /**
* 派单分公司 * 派单分公司
*/ */
@Schema(description ="派单分公司") @Schema(description ="派单分公司")
private String dispatchCompany; @ExcelAttribute(name = "派单分公司", maxLength = 50)
private String dispatchCompany;
/** /**
* 派单客服 * 派单客服
*/ */
@Schema(description ="派单客服") @Schema(description ="派单客服")
@Size(max = 20, message = "派单客服不可超过20位") @Size(max = 20, message = "派单客服不可超过20位")
private String customerService; @ExcelAttribute(name = "派单客服", maxLength = 20)
private String customerService;
/** /**
* 小合同名称 * 小合同名称
*/ */
@Schema(description ="小合同名称") @Schema(description ="小合同名称")
private String contractMinorName; @ExcelAttribute(name = "小合同名称", maxLength = 150)
private String contractMinorName;
/** /**
* 唯一号 * 唯一号
*/ */
@Schema(description ="唯一号") @Schema(description ="唯一号")
@Size(max = 20, message = "唯一号不可超过20位") @Size(max = 20, message = "唯一号不可超过20位")
private String uniqueNumber; @ExcelAttribute(name = "唯一号", maxLength = 20)
private String uniqueNumber;
/** /**
* 客户编号 * 客户编号
*/ */
@Schema(description ="客户编号") @Schema(description ="客户编号")
private String customerNumber; @ExcelAttribute(name = "客户编号", maxLength = 20)
private String customerNumber;
/** /**
* 服务类别 * 服务类别
*/ */
@Schema(description ="服务类别") @Schema(description ="服务类别")
@Size(max = 20, message = "服务类别不可超过20位") @Size(max = 20, message = "服务类别不可超过20位")
private String serviceType; @ExcelAttribute(name = "服务类别", maxLength = 20)
private String serviceType;
/** /**
* 养老城市 * 养老城市
*/ */
@Schema(description ="养老城市") @Schema(description ="养老城市")
private String pensionAddressReduce; @ExcelAttribute(name = "养老城市", maxLength = 15)
private String pensionAddressReduce;
/** /**
* 养老截止时间 * 养老截止时间
*/ */
@Schema(description ="养老截止时间") @Schema(description ="养老截止时间")
private String pensionEndReduce; @ExcelAttribute(name = "养老时间")
private String pensionEndReduce;
/** /**
* 医疗城市 * 医疗城市
*/ */
@Schema(description ="医疗城市") @Schema(description ="医疗城市")
private String medicalAddressReduce; @ExcelAttribute(name = "医疗城市", maxLength = 15)
private String medicalAddressReduce;
/** /**
* 医疗截止时间 * 医疗截止时间
*/ */
@Schema(description ="医疗截止时间") @Schema(description ="医疗截止时间")
private String medicalEndReduce; @ExcelAttribute(name = "医疗时间")
private String medicalEndReduce;
/** /**
* 工伤城市 * 工伤城市
*/ */
@Schema(description ="工伤城市") @Schema(description ="工伤城市")
private String injuryAddressReduce; @ExcelAttribute(name = "工伤城市", maxLength = 15)
private String injuryAddressReduce;
/** /**
* 工伤截止时间 * 工伤截止时间
*/ */
@Schema(description ="工伤截止时间") @Schema(description ="工伤时间")
private String injuryEndReduce; @ExcelAttribute(name = "工伤时间")
private String injuryEndReduce;
/** /**
* 生育城市 * 生育城市
*/ */
@Schema(description ="生育城市") @Schema(description ="生育城市")
private String birthAddressReduce; @ExcelAttribute(name = "生育城市", maxLength = 15)
private String birthAddressReduce;
/** /**
* 生育截止时间 * 生育截止时间
*/ */
@Schema(description ="生育截止时间") @Schema(description ="生育时间")
private String birthEndReduce; @ExcelAttribute(name = "生育时间")
private String birthEndReduce;
/** /**
* 失业城市 * 失业城市
*/ */
@Schema(description ="失业城市") @Schema(description ="失业城市")
private String unemploymentAddressReduce; @ExcelAttribute(name = "失业城市", maxLength = 15)
private String unemploymentAddressReduce;
/** /**
* 失业截止时间 * 失业截止时间
*/ */
@Schema(description ="失业截止时间") @Schema(description ="失业时间")
private String unemploymentEndReduce; @ExcelAttribute(name = "失业时间", maxLength = 6, isInteger = true)
private String unemploymentEndReduce;
/** /**
* 公积金城市 * 公积金城市
*/ */
@Schema(description ="公积金城市") @Schema(description ="公积金城市")
private String fundAddressReduce; @ExcelAttribute(name = "公积金城市", maxLength = 15)
private String fundAddressReduce;
/** /**
* 公积金截止时间 * 公积金截止时间
*/ */
@Schema(description ="公积金截止时间") @Schema(description ="公积金时间")
private String fundEndReduce; @ExcelAttribute(name = "公积金时间", maxLength = 6, isInteger = true)
private String fundEndReduce;
/** /**
* 离职日期 * 离职日期
*/ */
@Schema(description ="离职日期") @Schema(description ="离职日期")
private Date leaveDate; @ExcelAttribute(name = "离职日期")
private Date leaveDate;
/** /**
* 离职原因 * 离职原因
*/ */
@Schema(description ="离职原因") @Schema(description ="离职原因")
private String leaveReason; @ExcelAttribute(name = "离职原因")
private String leaveReason;
/** /**
* 合同类型 * 合同类型
*/ */
@Schema(description ="合同类型") @Schema(description ="合同类型")
private String contractType; @ExcelAttribute(name = "合同类型")
private String contractType;
/** /**
* 员工类型 * 员工类型
...@@ -471,109 +536,127 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -471,109 +536,127 @@ public class TPreDispatchInfo extends BaseEntity {
@Schema(description ="员工类型") @Schema(description ="员工类型")
@Size(max = 20, message = "员工类型不可超过20位") @Size(max = 20, message = "员工类型不可超过20位")
@NotNull(message = "员工类型不可为空") @NotNull(message = "员工类型不可为空")
private String empTypeAdd; @ExcelAttribute(name = "员工类型")
private String empTypeAdd;
/** /**
* 所属单位ID * 所属单位ID
*/ */
@Schema(description ="所属单位ID") @Schema(description ="所属单位ID")
private String unitIdAdd; @ExcelAttribute(name = "所属单位ID", maxLength = 32)
private String unitIdAdd;
/** /**
* 所属项目ID * 所属项目ID
*/ */
@Schema(description ="所属项目ID") @Schema(description ="所属项目ID")
private String departIdAdd; @ExcelAttribute(name = "所属项目ID", maxLength = 32)
private String departIdAdd;
/** /**
* 所属单位名称 * 所属单位名称
*/ */
@Schema(description ="所属单位名称") @Schema(description ="所属单位名称")
private String unitNameAdd; @ExcelAttribute(name = "所属单位名称", maxLength = 50)
private String unitNameAdd;
/** /**
* 所属项目名称 * 所属项目名称
*/ */
@Schema(description ="所属项目名称") @Schema(description ="所属项目名称")
private String departNameAdd; @ExcelAttribute(name = "所属项目名称", maxLength = 50)
private String departNameAdd;
/** /**
* 社保户 * 社保户
*/ */
@Schema(description ="社保户") @Schema(description ="社保户")
private String socialHouseAdd; @ExcelAttribute(name = "社保户")
private String socialHouseAdd;
/** /**
* 公积金户 * 公积金户
*/ */
@Schema(description ="公积金户") @Schema(description ="公积金户")
private String fundHouseAdd; @ExcelAttribute(name = "公积金户", maxLength = 50)
private String fundHouseAdd;
/** /**
* 备案基数 * 备案基数
*/ */
@Schema(description ="备案基数") @Schema(description ="备案基数")
private BigDecimal filingBaseAdd; @ExcelAttribute(name = "备案基数", isFloat = true)
private BigDecimal filingBaseAdd;
/** /**
* 0:正常未派单1:异常未派单2:已派单 * 0:正常未派单1:异常未派单2:已派单
*/ */
@Schema(description ="0:正常未派单1:异常未派单2:已派单") @Schema(description ="0:正常未派单1:异常未派单2:已派单")
private String preStatus; @ExcelAttribute(name = "派单状态")
private String preStatus;
/** /**
* 0:正常1:作废 * 0:正常1:作废
*/ */
@Schema(description ="0:正常1:作废") @Schema(description ="0:正常1:作废")
private String status; @ExcelAttribute(name = "预派单状态", maxLength = 1)
private String status;
/** /**
* 异常内容 * 异常内容
*/ */
@Schema(description ="异常内容") @Schema(description ="异常内容")
private String exceptionContent; @ExcelAttribute(name = "异常内容")
private String exceptionContent;
/** /**
* 社保-省 * 社保-省
*/ */
@Schema(description ="社保-省") @Schema(description ="社保-省")
private String socialProvince; @ExcelAttribute(name = "社保-省")
private String socialProvince;
/** /**
* 社保-市 * 社保-市
*/ */
@Schema(description ="社保-市") @Schema(description ="社保-市")
@ExcelAttribute(name = "社保-市")
private String socialCity; private String socialCity;
/** /**
* 社保-县 * 社保-县
*/ */
@Schema(description ="社保-县") @Schema(description ="社保-县")
private String socialTown; @ExcelAttribute(name = "社保-县")
private String socialTown;
/** /**
* 公积金-省 * 公积金-省
*/ */
@Schema(description ="公积金-省") @Schema(description ="公积金-省")
private String fundProvince; @ExcelAttribute(name = "公积金-省")
private String fundProvince;
/** /**
* 公积金-市 * 公积金-市
*/ */
@Schema(description ="公积金-市") @Schema(description ="公积金-市")
private String fundCity; @ExcelAttribute(name = "公积金-市")
private String fundCity;
/** /**
* 公积金-县 * 公积金-县
*/ */
@Schema(description ="公积金-县") @Schema(description ="公积金-县")
private String fundTown; @ExcelAttribute(name = "公积金-县")
private String fundTown;
/** /**
* 派单日期限制 在15日前可派单 15日及15后次月派单 * 派单日期限制 在15日前可派单 15日及15后次月派单
*/ */
@Schema(description ="派单日期限制 在15日前可派单 15日及15后次月派单") @Schema(description ="派单日期限制 在15日前可派单 15日及15后次月派单")
private Integer dayLimit; @ExcelAttribute(name = "派单日期限制", isInteger = true)
private Integer dayLimit;
/** /**
* 资料是否提交: 0 已提交 1 未提交 * 资料是否提交: 0 已提交 1 未提交
...@@ -581,7 +664,8 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -581,7 +664,8 @@ public class TPreDispatchInfo extends BaseEntity {
@Schema(description ="资料是否提交: 0 已提交 1 未提交") @Schema(description ="资料是否提交: 0 已提交 1 未提交")
@NotNull(message = "资料是否提交不可为空") @NotNull(message = "资料是否提交不可为空")
@Size(max = 2, message = "资料是否提交不可超过2位") @Size(max = 2, message = "资料是否提交不可超过2位")
private String dataSubStatus; @ExcelAttribute(name = "资料是否提交", maxLength = 2)
private String dataSubStatus;
/** /**
* 岗位 * 岗位
...@@ -589,43 +673,49 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -589,43 +673,49 @@ public class TPreDispatchInfo extends BaseEntity {
@Schema(description ="岗位") @Schema(description ="岗位")
@NotNull(message = "岗位不可为空") @NotNull(message = "岗位不可为空")
@Size(max = 50, message = "岗位不可超过50位") @Size(max = 50, message = "岗位不可超过50位")
private String positionAdd; @ExcelAttribute(name = "岗位")
private String positionAdd;
/** /**
* 派单的合同名称 * 派单的合同名称
*/ */
@Schema(description ="派单的合同名称") @Schema(description ="派单的合同名称")
private String contractNameAdd; @ExcelAttribute(name = "派单合同名称")
private String contractNameAdd;
/** /**
* 派单的合同类型 * 派单的合同类型
*/ */
@Schema(description ="派单的合同类型") @Schema(description ="派单的合同类型")
private String contractTypeAdd; @ExcelAttribute(name = "派单合同类型")
private String contractTypeAdd;
/** /**
* 合同开始时间 * 合同开始时间
*/ */
@Schema(description ="合同开始时间") @Schema(description ="合同开始时间")
private String contractStartAdd; @ExcelAttribute(name = "合同开始时间")
private String contractStartAdd;
/** /**
* 合同截止时间 * 合同截止时间
*/ */
@Schema(description ="合同截止时间") @Schema(description ="合同截止时间")
private String contractEndAdd; @ExcelAttribute(name = "合同截止时间")
private String contractEndAdd;
/** /**
* 合同期限:默认两年 * 合同期限:默认两年
*/ */
@Schema(description ="合同期限:默认两年") @Schema(description ="合同期限:默认两年")
private String contractTermAdd; @ExcelAttribute(name = "合同期限")
private String contractTermAdd;
/** /**
* 工时制:默认综合工时制 * 工时制:默认综合工时制
*/ */
@Schema(description ="工时制:默认综合工时制") @Schema(description ="工时制:默认综合工时制")
private String workingHoursAdd; private String workingHoursAdd;
/** /**
* 离职原因(转换后的) * 离职原因(转换后的)
...@@ -637,25 +727,29 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -637,25 +727,29 @@ public class TPreDispatchInfo extends BaseEntity {
* 备注 * 备注
*/ */
@Schema(description ="备注") @Schema(description ="备注")
private String remark; @ExcelAttribute(name = "备注")
private String remark;
/** /**
* 是否派单:0 是 1 否 * 是否派单:0 是 1 否
*/ */
@Schema(description ="是否派单:0 是 1 否 ") @Schema(description ="是否派单:0 是 1 否 ")
private String dispatchFlag; @ExcelAttribute(name = "是否派单")
private String dispatchFlag;
/** /**
* 取消原因:不派单时填写 * 取消原因:不派单时填写
*/ */
@Schema(description ="取消原因:不派单时填写") @Schema(description ="取消原因:不派单时填写")
private String cancelRemark; @ExcelAttribute(name = "取消原因")
private String cancelRemark;
/** /**
* 创建人部门名称 * 创建人部门名称
*/ */
@Schema(description ="创建人部门名称") @Schema(description ="创建人部门名称")
private String userDeptName; @ExcelAttribute(name = "创建人部门名称")
private String userDeptName;
/** /**
* 开始时间(查询专用) * 开始时间(查询专用)
......
...@@ -88,6 +88,7 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg ...@@ -88,6 +88,7 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg
if (Common.isNotNull(count)) { if (Common.isNotNull(count)) {
return R.failed("同一城市,年度的政策不能重复新增"); return R.failed("同一城市,年度的政策不能重复新增");
} }
baseMapper.insert(tAgentConfig);
return R.ok(); return R.ok();
} }
} }
...@@ -1825,6 +1825,33 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1825,6 +1825,33 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
} }
} }
/**
* map数据封装
*
* @param settleDomainList
* @param settleDomainNameMap
* @param customerNameMap
* @param settleIdAndCustomerIdMap
* @return
* @Author huyc
* @Date 2022-07-18
**/
private void initSettleDomainMaps(List<TSettleDomainSelectVo> settleDomainList,
Map<String, String> settleDomainNameMap,
Map<String, String> customerNameMap,
Map<String, String> settleIdAndCustomerIdMap) {
//map数据封装
if (Common.isNotNull(settleDomainList)) {
for (TSettleDomainSelectVo settleDomainSelectVo : settleDomainList) {
settleDomainNameMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getDepartName());
settleIdAndCustomerIdMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getCustomerId());
if (!customerNameMap.containsKey(settleDomainSelectVo.getCustomerName())) {
customerNameMap.put(settleDomainSelectVo.getCustomerId(), settleDomainSelectVo.getCustomerName());
}
}
}
}
/** /**
* 初始化社保公积金基数 * 初始化社保公积金基数
* *
...@@ -1858,33 +1885,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1858,33 +1885,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
initBaseSetMap(baseSocialTimeMap, baseFundTimeMap, baseSocialSetMap, baseFundSetMap); initBaseSetMap(baseSocialTimeMap, baseFundTimeMap, baseSocialSetMap, baseFundSetMap);
} }
/**
* map数据封装
*
* @param settleDomainList
* @param settleDomainNameMap
* @param customerNameMap
* @param settleIdAndCustomerIdMap
* @return
* @Author huyc
* @Date 2022-07-18
**/
private void initSettleDomainMaps(List<TSettleDomainSelectVo> settleDomainList,
Map<String, String> settleDomainNameMap,
Map<String, String> customerNameMap,
Map<String, String> settleIdAndCustomerIdMap) {
//map数据封装
if (Common.isNotNull(settleDomainList)) {
for (TSettleDomainSelectVo settleDomainSelectVo : settleDomainList) {
settleDomainNameMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getDepartName());
settleIdAndCustomerIdMap.put(settleDomainSelectVo.getId(), settleDomainSelectVo.getCustomerId());
if (!customerNameMap.containsKey(settleDomainSelectVo.getCustomerName())) {
customerNameMap.put(settleDomainSelectVo.getCustomerId(), settleDomainSelectVo.getCustomerName());
}
}
}
}
/** /**
* 初始化派减的相关状态及数据 * 初始化派减的相关状态及数据
* *
......
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