Commit c92d1552 authored by hongguangwu's avatar hongguangwu

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

parents 2c8763a3 89a9d0d5
...@@ -722,9 +722,16 @@ ...@@ -722,9 +722,16 @@
t_employee_contract_info x t_employee_contract_info x
WHERE WHERE
x.DELETE_FLAG = '0' x.DELETE_FLAG = '0'
AND x.AUDIT_STATUS != '3' AND (
AND x.IS_OBSOLETE = '0' (
x.AUDIT_STATUS = '2'
AND x.IN_USE = '0' AND x.IN_USE = '0'
)
OR (
x.AUDIT_STATUS = '1'
AND x.IN_USE = '1'
)
)
<if test="checkVo != null"> <if test="checkVo != null">
<if test="checkVo.idCards != null"> <if test="checkVo.idCards != null">
AND x.EMP_IDCARD in AND x.EMP_IDCARD in
......
...@@ -18,6 +18,7 @@ import java.time.LocalDate; ...@@ -18,6 +18,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.regex.Pattern;
/** /**
* @Author fxj * @Author fxj
...@@ -689,13 +690,21 @@ public class ExcelUtil <T> implements Serializable { ...@@ -689,13 +690,21 @@ public class ExcelUtil <T> implements Serializable {
return errorInfo(attr, "_小于最小值", i); return errorInfo(attr, "_小于最小值", i);
} }
}else{ }else{
if (Float.valueOf(c).intValue() < attr.min()) { if (String.valueOf(Float.valueOf(c).intValue()).length() < attr.min()) {
return errorInfo(attr, "_小于最小值", i); return errorInfo(attr, "_长度小于" + Float.valueOf(attr.min()).intValue() + "位", i);
} }
} }
} else { } else {
return errorInfo(attr, "_必须为数字且最多两位小数", i); return errorInfo(attr, "_必须为数字且最多两位小数", i);
} }
} else if (attr.min() == 0) {
if (Common.isNumber(c)) {
if (attr.isFloat()){
if (Float.valueOf(c).compareTo(attr.min()) < CommonConstants.ZERO_INT) {
return errorInfo(attr, "_小于最小值", i);
}
}
}
} }
} }
return null; return null;
...@@ -821,6 +830,17 @@ public class ExcelUtil <T> implements Serializable { ...@@ -821,6 +830,17 @@ public class ExcelUtil <T> implements Serializable {
} }
//校验字段是否符合要求 返回错误信息 //校验字段是否符合要求 返回错误信息
error = validateUtil(c, attr, i + 2); error = validateUtil(c, attr, i + 2);
if (null == error && attr.isDate() && Common.isNotNull(c)) {
c.replace("/","-").replace(CommonConstants.YEAR,"-")
.replace(CommonConstants.MONTH,"-").replace(CommonConstants.DAY,"");
Pattern pattern = Pattern.compile("[0-9]*");
if (pattern.matcher(c).matches()) {
StringBuilder sb = new StringBuilder(c);
sb.insert(4, "-");
sb.insert(7,"-");
c = sb.toString();
}
}
if (null != error) { if (null != error) {
errorList.add(new ErrorMessage(i + 2, error)); errorList.add(new ErrorMessage(i + 2, error));
errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, error), errorTemp); errorMessageHashMap = initErrorMessage(errorMessageHashMap, new ErrorMessage(i + 2, error), errorTemp);
......
...@@ -31,7 +31,6 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -31,7 +31,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List;
/** /**
...@@ -62,19 +61,6 @@ public class TSalaryStandardController { ...@@ -62,19 +61,6 @@ public class TSalaryStandardController {
return new R<>(tSalaryStandardService.getTSalaryStandardPage(page, tSalaryStandard)); return new R<>(tSalaryStandardService.getTSalaryStandardPage(page, tSalaryStandard));
} }
/**
* 不分页查询
*
* @param tSalaryStandard 标准薪酬工资表
* @return
*/
@Operation(summary = "不分页查询", description = "不分页查询")
@PostMapping("/noPage")
//@PreAuthorize("@pms.hasPermission('salary_tsalarystandard_get')" )
public R<List<TSalaryStandard>> getTSalaryStandardNoPage(@RequestBody TSalaryStandardSearchVo tSalaryStandard) {
return R.ok(tSalaryStandardService.noPageDiy(tSalaryStandard));
}
/** /**
* 通过id查询标准薪酬工资表 * 通过id查询标准薪酬工资表
* *
......
...@@ -27,13 +27,10 @@ import lombok.Data; ...@@ -27,13 +27,10 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
...@@ -228,14 +225,14 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -228,14 +225,14 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="实际工作地") @Schema(description ="实际工作地")
@Length(max = 20, message = "实际工作地不能超过20个字符") @Length(max = 20, message = "实际工作地不能超过20个字符")
@ExcelAttribute(name = "实际工作地") @ExcelAttribute(name = "实际工作地", maxLength = 20)
private String workingAddress; private String workingAddress;
/** /**
* 备注说明1 * 备注说明1
*/ */
@Schema(description ="备注说明1") @Schema(description ="备注说明1")
@Length(max = 250, message = "备注说明1不能超过255个字符") @Length(max = 250, message = "备注说明1不能超过250个字符")
@ExcelAttribute(name = "备注说明1", maxLength = 250) @ExcelAttribute(name = "备注说明1", maxLength = 250)
private String remarkOne; private String remarkOne;
...@@ -266,7 +263,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -266,7 +263,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="养老起缴月") @Schema(description ="养老起缴月")
@Length(max = 6, message = "养老起缴月不能超过6个字符") @Length(max = 6, message = "养老起缴月不能超过6个字符")
@ExcelAttribute(name = "养老起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "养老起缴月", maxLength = 6, min = 6, isInteger = true)
private String pensionStart; private String pensionStart;
/** /**
...@@ -288,7 +285,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -288,7 +285,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="医疗起缴月") @Schema(description ="医疗起缴月")
@Length(max = 6, message = "医疗起缴月不能超过6个字符") @Length(max = 6, message = "医疗起缴月不能超过6个字符")
@ExcelAttribute(name = "医疗起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "医疗起缴月", maxLength = 6, min = 6, isInteger = true)
private String medicalStart; private String medicalStart;
/** /**
...@@ -309,8 +306,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -309,8 +306,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 工伤起缴月 * 工伤起缴月
*/ */
@Schema(description ="工伤起缴月") @Schema(description ="工伤起缴月")
@Length(max = 6, message = "工伤起缴月不能超过6个字符") @ExcelAttribute(name = "工伤起缴月", maxLength = 6, min = 6, isInteger = true)
@ExcelAttribute(name = "工伤起缴月", maxLength = 6, isInteger = true)
private String injuryStart; private String injuryStart;
/** /**
...@@ -332,7 +328,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -332,7 +328,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="生育起缴月") @Schema(description ="生育起缴月")
@Length(max = 6, message = "生育起缴月不能超过6个字符") @Length(max = 6, message = "生育起缴月不能超过6个字符")
@ExcelAttribute(name = "生育起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "生育起缴月", maxLength = 6, min = 6, isInteger = true)
private String birthStart; private String birthStart;
/** /**
...@@ -354,7 +350,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -354,7 +350,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="失业起缴月") @Schema(description ="失业起缴月")
@Length(max = 6, message = "失业起缴月不能超过6个字符") @Length(max = 6, message = "失业起缴月不能超过6个字符")
@ExcelAttribute(name = "失业起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "失业起缴月", maxLength = 6, min = 6, isInteger = true)
private String unemploymentStart; private String unemploymentStart;
/** /**
...@@ -376,21 +372,21 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -376,21 +372,21 @@ public class TPreDispatchInfo extends BaseEntity {
*/ */
@Schema(description ="公积金起缴月") @Schema(description ="公积金起缴月")
@Length(max = 6, message = "公积金起缴月不能超过6个字符") @Length(max = 6, message = "公积金起缴月不能超过6个字符")
@ExcelAttribute(name = "公积金起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "公积金起缴月", maxLength = 6, min = 6, isInteger = true)
private String fundStart; private String fundStart;
/** /**
* 公积金个人比例 * 公积金个人比例
*/ */
@Schema(description ="公积金个人比例") @Schema(description ="公积金个人比例")
@ExcelAttribute(name = "公积金个人比例", isFloat = true,max = "99.99") @ExcelAttribute(name = "公积金个人比例", isFloat = true,max = "100.00")
private BigDecimal fundPersonalPer; private BigDecimal fundPersonalPer;
/** /**
* 公积金企业比例 * 公积金企业比例
*/ */
@Schema(description ="公积金企业比例") @Schema(description ="公积金企业比例")
@ExcelAttribute(name = "公积金企业比例", isFloat = true,max = "99.99") @ExcelAttribute(name = "公积金企业比例", isFloat = true,max = "100.00")
private BigDecimal fundCompanyPer; private BigDecimal fundCompanyPer;
/** /**
...@@ -439,9 +435,9 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -439,9 +435,9 @@ public class TPreDispatchInfo extends BaseEntity {
private String serviceType; private String serviceType;
/** /**
* 养老城市 * 城市
*/ */
@Schema(description ="养老城市") @Schema(description ="城市")
private String pensionAddressReduce; private String pensionAddressReduce;
/** /**
......
...@@ -220,16 +220,16 @@ public class TPreDispatchReduceVo { ...@@ -220,16 +220,16 @@ public class TPreDispatchReduceVo {
* 备注说明1 * 备注说明1
*/ */
@Schema(description ="备注说明1") @Schema(description ="备注说明1")
@Length(max = 255, message = "备注说明1不能超过255个字符") @Length(max = 250, message = "备注说明1不能超过250个字符")
@ExcelAttribute(name = "备注说明1", maxLength = 255) @ExcelAttribute(name = "备注说明1", maxLength = 250)
private String remarkOne; private String remarkOne;
/** /**
* 备注说明2 * 备注说明2
*/ */
@Schema(description ="备注说明2") @Schema(description ="备注说明2")
@Length(max = 255, message = "备注说明2不能超过255个字符") @Length(max = 250, message = "备注说明2不能超过250个字符")
@ExcelAttribute(name = "备注说明2", maxLength = 255) @ExcelAttribute(name = "备注说明2", maxLength = 250)
private String remarkTwo; private String remarkTwo;
/** /**
...@@ -244,7 +244,7 @@ public class TPreDispatchReduceVo { ...@@ -244,7 +244,7 @@ public class TPreDispatchReduceVo {
*/ */
@Schema(description ="养老起缴月") @Schema(description ="养老起缴月")
@Length(max = 6, message = "养老起缴月不能超过6个字符") @Length(max = 6, message = "养老起缴月不能超过6个字符")
@ExcelAttribute(name = "养老起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "养老起缴月", maxLength = 6, min = 6, isInteger = true)
private String pensionStart; private String pensionStart;
/** /**
...@@ -259,7 +259,7 @@ public class TPreDispatchReduceVo { ...@@ -259,7 +259,7 @@ public class TPreDispatchReduceVo {
*/ */
@Schema(description ="医疗起缴月") @Schema(description ="医疗起缴月")
@Length(max = 6, message = "医疗起缴月不能超过6个字符") @Length(max = 6, message = "医疗起缴月不能超过6个字符")
@ExcelAttribute(name = "医疗起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "医疗起缴月", maxLength = 6, min = 6, isInteger = true)
private String medicalStart; private String medicalStart;
/** /**
...@@ -281,7 +281,7 @@ public class TPreDispatchReduceVo { ...@@ -281,7 +281,7 @@ public class TPreDispatchReduceVo {
*/ */
@Schema(description ="工伤起缴月") @Schema(description ="工伤起缴月")
@Length(max = 6, message = "工伤起缴月不能超过6个字符") @Length(max = 6, message = "工伤起缴月不能超过6个字符")
@ExcelAttribute(name = "工伤起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "工伤起缴月", maxLength = 6, min = 6, isInteger = true)
private String injuryStart; private String injuryStart;
/** /**
...@@ -296,7 +296,7 @@ public class TPreDispatchReduceVo { ...@@ -296,7 +296,7 @@ public class TPreDispatchReduceVo {
*/ */
@Schema(description ="生育起缴月") @Schema(description ="生育起缴月")
@Length(max = 6, message = "生育起缴月不能超过6个字符") @Length(max = 6, message = "生育起缴月不能超过6个字符")
@ExcelAttribute(name = "生育起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "生育起缴月", maxLength = 6, min = 6, isInteger = true)
private String birthStart; private String birthStart;
/** /**
...@@ -311,7 +311,7 @@ public class TPreDispatchReduceVo { ...@@ -311,7 +311,7 @@ public class TPreDispatchReduceVo {
*/ */
@Schema(description ="失业起缴月") @Schema(description ="失业起缴月")
@Length(max = 6, message = "失业起缴月不能超过6个字符") @Length(max = 6, message = "失业起缴月不能超过6个字符")
@ExcelAttribute(name = "失业起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "失业起缴月", maxLength = 6, min = 6, isInteger = true)
private String unemploymentStart; private String unemploymentStart;
/** /**
...@@ -326,21 +326,21 @@ public class TPreDispatchReduceVo { ...@@ -326,21 +326,21 @@ public class TPreDispatchReduceVo {
*/ */
@Schema(description ="公积金起缴月") @Schema(description ="公积金起缴月")
@Length(max = 6, message = "公积金起缴月不能超过6个字符") @Length(max = 6, message = "公积金起缴月不能超过6个字符")
@ExcelAttribute(name = "公积金起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "公积金起缴月", maxLength = 6, min = 6, isInteger = true)
private String fundStart; private String fundStart;
/** /**
* 公积金个人比例 * 公积金个人比例
*/ */
@Schema(description ="公积金个人比例") @Schema(description ="公积金个人比例")
@ExcelAttribute(name = "公积金个人比例", isFloat = true,max = "99.99") @ExcelAttribute(name = "公积金个人比例", isFloat = true,max = "100.00")
private BigDecimal fundPersonalPer; private BigDecimal fundPersonalPer;
/** /**
* 公积金企业比例 * 公积金企业比例
*/ */
@Schema(description ="公积金企业比例") @Schema(description ="公积金企业比例")
@ExcelAttribute(name = "公积金企业比例", isFloat = true,max = "99.99") @ExcelAttribute(name = "公积金企业比例", isFloat = true,max = "100.00")
private BigDecimal fundCompanyPer; private BigDecimal fundCompanyPer;
/** /**
...@@ -689,8 +689,8 @@ public class TPreDispatchReduceVo { ...@@ -689,8 +689,8 @@ public class TPreDispatchReduceVo {
* 备注 * 备注
*/ */
@Schema(description ="备注") @Schema(description ="备注")
@Length(max = 255, message = "备注不能超过255个字符") @Length(max = 250, message = "备注不能超过250个字符")
@ExcelAttribute(name = "备注", maxLength = 255) @ExcelAttribute(name = "备注", maxLength = 250)
private String remark; private String remark;
/** /**
......
...@@ -174,7 +174,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -174,7 +174,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 养老起缴月 * 养老起缴月
*/ */
@Length(max = 6, message = "养老起缴月不能超过6个字符") @Length(max = 6, message = "养老起缴月不能超过6个字符")
@ExcelAttribute(name = "养老起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "养老起缴月", maxLength = 6, min = 6, isInteger = true)
private String pensionStart; private String pensionStart;
/** /**
* 医疗城市 * 医疗城市
...@@ -191,7 +191,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -191,7 +191,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 医疗起缴月 * 医疗起缴月
*/ */
@Length(max = 6, message = "医疗起缴月不能超过6个字符") @Length(max = 6, message = "医疗起缴月不能超过6个字符")
@ExcelAttribute(name = "医疗起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "医疗起缴月", maxLength = 6, min = 6, isInteger = true)
private String medicalStart; private String medicalStart;
/** /**
* 工伤城市 * 工伤城市
...@@ -208,7 +208,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -208,7 +208,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 工伤起缴月 * 工伤起缴月
*/ */
@Length(max = 6, message = "工伤起缴月不能超过6个字符") @Length(max = 6, message = "工伤起缴月不能超过6个字符")
@ExcelAttribute(name = "工伤起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "工伤起缴月", maxLength = 6, min = 6, isInteger = true)
private String injuryStart; private String injuryStart;
/** /**
* 生育城市 * 生育城市
...@@ -225,7 +225,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -225,7 +225,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 生育起缴月 * 生育起缴月
*/ */
@Length(max = 6, message = "生育起缴月不能超过6个字符") @Length(max = 6, message = "生育起缴月不能超过6个字符")
@ExcelAttribute(name = "生育起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "生育起缴月", maxLength = 6, min = 6, isInteger = true)
private String birthStart; private String birthStart;
/** /**
* 失业城市 * 失业城市
...@@ -242,7 +242,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -242,7 +242,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 失业起缴月 * 失业起缴月
*/ */
@Length(max = 6, message = "失业起缴月不能超过6个字符") @Length(max = 6, message = "失业起缴月不能超过6个字符")
@ExcelAttribute(name = "失业起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "失业起缴月", maxLength = 6, min = 6, isInteger = true)
private String unemploymentStart; private String unemploymentStart;
/** /**
* 公积金城市 * 公积金城市
...@@ -259,17 +259,17 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -259,17 +259,17 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 公积金起缴月 * 公积金起缴月
*/ */
@Length(max = 6, message = "公积金起缴月不能超过6个字符") @Length(max = 6, message = "公积金起缴月不能超过6个字符")
@ExcelAttribute(name = "公积金起缴月", maxLength = 6, isInteger = true) @ExcelAttribute(name = "公积金起缴月", maxLength = 6, min = 6, isInteger = true)
private String fundStart; private String fundStart;
/** /**
* 公积金个人比例 * 公积金个人比例
*/ */
@ExcelAttribute(name = "公积金个人比例", isFloat = true,max = "99.99") @ExcelAttribute(name = "公积金个人比例", isFloat = true,max = "100.00")
private BigDecimal fundPersonalPer; private BigDecimal fundPersonalPer;
/** /**
* 公积金企业比例 * 公积金企业比例
*/ */
@ExcelAttribute(name = "公积金企业比例", isFloat = true,max = "99.99") @ExcelAttribute(name = "公积金企业比例", isFloat = true,max = "100.00")
private BigDecimal fundCompanyPer; private BigDecimal fundCompanyPer;
/** /**
* 派单分公司 * 派单分公司
......
...@@ -251,6 +251,7 @@ public class TPreDispatchInfoController { ...@@ -251,6 +251,7 @@ public class TPreDispatchInfoController {
return R.ok(errorInfo); return R.ok(errorInfo);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
return R.failed(PreDispatchConstants.DATA_IMPORT_ANALYSIS_ERROR); return R.failed(PreDispatchConstants.DATA_IMPORT_ANALYSIS_ERROR);
} }
} }
......
...@@ -630,11 +630,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -630,11 +630,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isEmpty(socialFund.getFirstBuyMonthSocial())){ if (Common.isEmpty(socialFund.getFirstBuyMonthSocial())){
socialFund.setFirstBuyMonthSocial(social.getSocialStartDate()); socialFund.setFirstBuyMonthSocial(social.getSocialStartDate());
} }
socialFund.setUnitPersionMoney(BigDecimal.ZERO);
socialFund.setUnitMedicalMoney(BigDecimal.ZERO);
socialFund.setUnitUnemploymentMoney(BigDecimal.ZERO);
socialFund.setUnitInjuryMoney(BigDecimal.ZERO);
socialFund.setUnitBirthMoney(BigDecimal.ZERO);
if (!CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle()) if (!CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialFund.getIsIllness())){ && CommonConstants.ZERO_STRING.equals(socialFund.getIsIllness())){
socialFund.setUnitBigailmentMoney(social.getUnitBigailmentMoney()); socialFund.setUnitBigailmentMoney(social.getUnitBigailmentMoney());
...@@ -668,7 +663,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -668,7 +663,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund.setUnemployHandle(social.getUnemployHandle()); socialFund.setUnemployHandle(social.getUnemployHandle());
} }
if (!CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle()) if (!CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(socialFund.getIsIllness())){ && CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
socialFund.setUnitBigailmentCardinal(social.getUnitBigailmentCardinal()); socialFund.setUnitBigailmentCardinal(social.getUnitBigailmentCardinal());
socialFund.setPersonalBigailmentCardinal(social.getPersonalBigailmentCardinal()); socialFund.setPersonalBigailmentCardinal(social.getPersonalBigailmentCardinal());
socialFund.setUnitBigailmentPer(social.getUnitBigailmentPer()); socialFund.setUnitBigailmentPer(social.getUnitBigailmentPer());
...@@ -702,6 +697,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -702,6 +697,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund.setLatestCardinality(social.getInsuranceIsLatestCardinality()); socialFund.setLatestCardinality(social.getInsuranceIsLatestCardinality());
socialFund.setIsIllness(social.getIsIllness()); socialFund.setIsIllness(social.getIsIllness());
socialFund.setCollectType(social.getCollectType()); socialFund.setCollectType(social.getCollectType());
socialFund.setCollectMoth(social.getCollectMoth());
socialFund.setValueType(social.getValueType()); socialFund.setValueType(social.getValueType());
socialFund.setIsChargePersonal(social.getIsChargePersonal()); socialFund.setIsChargePersonal(social.getIsChargePersonal());
socialFund.setRecordBase(social.getRecordBase()); socialFund.setRecordBase(social.getRecordBase());
...@@ -974,32 +970,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -974,32 +970,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private void initAddHandleItem(TDispatchImportVo excel, TSocialFundInfo socialFund, TDispatchInfo dispatch, SysBaseSetInfo socialSet) { private void initAddHandleItem(TDispatchImportVo excel, TSocialFundInfo socialFund, TDispatchInfo dispatch, SysBaseSetInfo socialSet) {
StringBuffer temp = new StringBuffer(); StringBuffer temp = new StringBuffer();
if (Common.isEmpty(socialFund)){
if (Common.isNotNull(excel.getSocialHousehold())){
if (Common.isNotNull(excel.getPensionStart())){
temp.append(DispatchConstants.DISPATCH_PENSION);
}
if (Common.isNotNull(excel.getMedicalStart())){
temp.append(DispatchConstants.DISPATCH_MEDICAL);
}
if (Common.isNotNull(excel.getBirthStart())){
temp.append(DispatchConstants.DISPATCH_BIRTH);
}
if (Common.isNotNull(excel.getWorkInjuryStart())){
temp.append(DispatchConstants.DISPATCH_INJURY);
}
if (Common.isNotNull(excel.getUnemployStart())){
temp.append(DispatchConstants.DISPATCH_UNEMP);
}
if (Common.isNotNull(excel.getBigailmentStart())
&& CommonConstants.ZERO_STRING.equals(socialSet.getIsIllness())){
temp.append(DispatchConstants.DISPATCH_BIGMAILMENT);
}
}
if (Common.isNotNull(excel.getProvidentHousehold())){
temp.append(DispatchConstants.DISPATCH_FUND);
}
}
if (Common.isNotNull(socialFund)){ if (Common.isNotNull(socialFund)){
if (Common.isNotNull(excel.getSocialHousehold())){ if (Common.isNotNull(excel.getSocialHousehold())){
// 办理失败或已派减 视为可派增 // 办理失败或已派减 视为可派增
...@@ -1030,11 +1000,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1030,11 +1000,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
} }
//公积金状态:派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 ) //公积金状态:派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 )
if (Common.isNotNull(excel.getProvidentHousehold()) if (Common.isNotNull(excel.getProvidentHousehold())){
&& (CommonConstants.FOUR_STRING.equals(socialFund.getFundStatus())
|| CommonConstants.NINE_STRING.equals(socialFund.getFundStatus())
|| CommonConstants.EIGHT_STRING.equals(socialFund.getFundStatus())
)){
temp.append(DispatchConstants.DISPATCH_FUND); temp.append(DispatchConstants.DISPATCH_FUND);
} }
} }
...@@ -1236,25 +1202,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1236,25 +1202,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setUnitUnemploymentPer(socialSet.getUnitUnemploymentPro()); social.setUnitUnemploymentPer(socialSet.getUnitUnemploymentPro());
social.setUnitWorkUnjuryPer(socialSet.getUnitInjuryPro()); social.setUnitWorkUnjuryPer(socialSet.getUnitInjuryPro());
social.setUnitBirthPer(socialSet.getUnitBirthPro()); social.setUnitBirthPer(socialSet.getUnitBirthPro());
if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
social.setInsuranceBigailment(socialSet.getInsuranceBigailment());
social.setPersonalBigailmentCardinal(ServiceUtil.ifNull(excel.getBigailmentCardinal(), excel.getPensionCardinal()));
social.setUnitBigailmentCardinal(ServiceUtil.ifNull(excel.getBigailmentCardinal(), excel.getPensionCardinal()));
social.setUnitBigailmentPer(socialSet.getPayCompanyPro());
social.setPersonalBigailmentPer(socialSet.getPayPersonalPro());
social.setBigailmentHandle(CommonConstants.ZERO_STRING);
social.setBigailmentStart(excel.getBigailmentStart());
social.setCollectMoth(socialSet.getCollectMoth());
}else {
social.setInsuranceBigailment(null);
social.setPersonalBigailmentCardinal(null);
social.setUnitBigailmentCardinal(null);
social.setUnitBigailmentPer(null);
social.setPersonalBigailmentPer(null);
social.setBigailmentHandle(null);
social.setBigailmentStart(null);
social.setCollectMoth(null);
}
//按最低 //按最低
if (CommonConstants.ZERO_STRING.equals(excel.getPaymentType())){ if (CommonConstants.ZERO_STRING.equals(excel.getPaymentType())){
social.setPersonalPensionCardinal(socialSet.getLowerLimit()); social.setPersonalPensionCardinal(socialSet.getLowerLimit());
...@@ -1287,6 +1234,25 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1287,6 +1234,25 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setUnitBigailmentCardinal(socialSet.getUpperLimit()); social.setUnitBigailmentCardinal(socialSet.getUpperLimit());
} }
} }
if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
social.setInsuranceBigailment(socialSet.getInsuranceBigailment());
social.setPersonalBigailmentCardinal(ServiceUtil.ifNull(social.getPersonalBigailmentCardinal(), excel.getPensionCardinal()));
social.setUnitBigailmentCardinal(ServiceUtil.ifNull(social.getUnitBigailmentCardinal(), excel.getPensionCardinal()));
social.setUnitBigailmentPer(socialSet.getPayCompanyPro());
social.setPersonalBigailmentPer(socialSet.getPayPersonalPro());
social.setBigailmentHandle(CommonConstants.ZERO_STRING);
social.setBigailmentStart(excel.getBigailmentStart());
social.setCollectMoth(socialSet.getCollectMoth());
}else {
social.setInsuranceBigailment(null);
social.setPersonalBigailmentCardinal(null);
social.setUnitBigailmentCardinal(null);
social.setUnitBigailmentPer(null);
social.setPersonalBigailmentPer(null);
social.setBigailmentHandle(null);
social.setBigailmentStart(null);
social.setCollectMoth(null);
}
} }
social.setUnitPersionMoney(BigDecimalUtils.safeMultiply(social.getUnitPensionCardinal(), social.getUnitPensionPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue()))); social.setUnitPersionMoney(BigDecimalUtils.safeMultiply(social.getUnitPensionCardinal(), social.getUnitPensionPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
...@@ -1671,7 +1637,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1671,7 +1637,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& Common.isEmpty(excel.getUnemployStart()) && Common.isEmpty(excel.getUnemployStart())
&& Common.isEmpty(excel.getBigailmentStart()) && Common.isEmpty(excel.getBigailmentStart())
&& Common.isNotNull(excel.getWorkInjuryStart()) && Common.isNotNull(excel.getWorkInjuryStart())
&& Common.isEmpty(BigDecimal.ZERO.compareTo(excel.getWorkInjuryCardinal()) > 0); && (BigDecimal.ZERO.compareTo(excel.getWorkInjuryCardinal()) <= 0);
if (flag) { if (flag) {
// 有兼职工伤不可重复增 (未派减成功不可新增兼职工伤) // 有兼职工伤不可重复增 (未派减成功不可新增兼职工伤)
if (CommonConstants.ZERO_STRING.equals(sf.getWorkInjuryHandle()) if (CommonConstants.ZERO_STRING.equals(sf.getWorkInjuryHandle())
...@@ -1680,15 +1646,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1680,15 +1646,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return true; return true;
} }
// 有五险未派减不给新增兼职工伤 // 有五险未派减不给新增兼职工伤
flag = CommonConstants.ZERO_STRING.equals(sf.getPensionHandle()) flag = CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle()) || CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle()) || CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getUnemployHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle()) || CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| CommonConstants.ZERO_STRING.equals(sf.getBigailmentHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle()) || (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())); && CommonConstants.ZERO_STRING.equals(sf.getIsIllness()));
if (flag) { if (flag) {
...@@ -2682,6 +2643,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2682,6 +2643,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dis.setAuditUser(user.getId()); dis.setAuditUser(user.getId());
dis.setAuditTime(now); dis.setAuditTime(now);
baseMapper.updateById(dis); baseMapper.updateById(dis);
// 派增审核不通过 失败项重新派单审核不通过 恢复为部分办理失败
boolean flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())
&& (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
if (flagTemp){
sf.setSocialStatus(CommonConstants.FOUR_STRING);
sf.setSocialAddStatus(CommonConstants.THREE_STRING);
}
socialFundMapper.updateById(sf); socialFundMapper.updateById(sf);
// 派增审核不通过 // 派增审核不通过
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType()) if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())
...@@ -2698,15 +2673,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2698,15 +2673,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
vo.setEmpIdCard(dis.getEmpIdcard()); vo.setEmpIdCard(dis.getEmpIdcard());
vo.setDepartNo(dis.getSettleDomainCode()); vo.setDepartNo(dis.getSettleDomainCode());
if (Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId()) if (flagTemp){
&& (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())))
){
vo.setSocialStatus(CommonConstants.TWO_STRING); vo.setSocialStatus(CommonConstants.TWO_STRING);
} }
R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo); R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
...@@ -3080,6 +3047,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3080,6 +3047,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfo.setEmpIdcard(dis.getEmpIdcard()); auditInfo.setEmpIdcard(dis.getEmpIdcard());
auditInfoMapper.insert(auditInfo); auditInfoMapper.insert(auditInfo);
baseMapper.updateById(dis); baseMapper.updateById(dis);
// 派增办理失败 失败项重新派单办理失败 恢复为部分办理失败
boolean flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())
&& (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
if (flagTemp){
sf.setSocialStatus(CommonConstants.FOUR_STRING);
sf.setSocialAddStatus(CommonConstants.THREE_STRING);
}
socialFundMapper.updateById(sf); socialFundMapper.updateById(sf);
//1.派增办理失败 刷新预估数据 //1.派增办理失败 刷新预估数据
if (CommonConstants.ZERO_STRING.equals(dis.getType())) { if (CommonConstants.ZERO_STRING.equals(dis.getType())) {
...@@ -3142,7 +3122,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3142,7 +3122,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (CommonConstants.THREE_STRING.equals(socialInfo.getHandleStatus())){ if (CommonConstants.THREE_STRING.equals(socialInfo.getHandleStatus())){
vo.setSocialStatus(CommonConstants.FOUR_STRING); vo.setSocialStatus(CommonConstants.FOUR_STRING);
} }
if ((CommonConstants.ONE_STRING.equals(sf.getPensionHandle()) boolean flag = (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle()) || CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle()) || CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
...@@ -3156,8 +3136,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3156,8 +3136,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
|| !CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle()) || !CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| !CommonConstants.ONE_STRING.equals(sf.getUnemployHandle()) || !CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (!CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle()) || (!CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness()))) && CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
){ if (flag){
vo.setSocialStatus(CommonConstants.TWO_STRING); vo.setSocialStatus(CommonConstants.TWO_STRING);
} }
} }
......
...@@ -356,6 +356,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -356,6 +356,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
TDispatchImportVo importVo = new TDispatchImportVo(); TDispatchImportVo importVo = new TDispatchImportVo();
// 初始化派增的派单数据 // 初始化派增的派单数据
initDispatchAddVo(preInfo, importVo); initDispatchAddVo(preInfo, importVo);
importVo.setRowIndex(CommonConstants.ONE_INT);
List<TDispatchImportVo> importVoList = new ArrayList<>(); List<TDispatchImportVo> importVoList = new ArrayList<>();
importVoList.add(importVo); importVoList.add(importVo);
// 如果档案地市空 只能用缴纳地封装,如果缴纳地有问题直接返回 // 如果档案地市空 只能用缴纳地封装,如果缴纳地有问题直接返回
...@@ -562,8 +563,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -562,8 +563,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
tPreDispatchInfo.setFundAddress(tPreDispatchInfo.getFundAddressReduce()); tPreDispatchInfo.setFundAddress(tPreDispatchInfo.getFundAddressReduce());
} }
// 合同开始截止时间 同步更新派单的合同时间 // 合同开始截止时间 同步更新派单的合同时间
tPreDispatchInfo.setContractEndAdd(tPreDispatchInfo.getContractEnd()); // tPreDispatchInfo.setContractEndAdd(tPreDispatchInfo.getContractEnd());
tPreDispatchInfo.setContractStartAdd(tPreDispatchInfo.getContractStart()); // tPreDispatchInfo.setContractStartAdd(tPreDispatchInfo.getContractStart());
// 没问题重置异常状态,有问题 在前面就返回了 // 没问题重置异常状态,有问题 在前面就返回了
tPreDispatchInfo.setExceptionContent(CommonConstants.EMPTY_STRING); tPreDispatchInfo.setExceptionContent(CommonConstants.EMPTY_STRING);
tPreDispatchInfo.setPreStatus(CommonConstants.ZERO_STRING); tPreDispatchInfo.setPreStatus(CommonConstants.ZERO_STRING);
...@@ -2358,6 +2359,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -2358,6 +2359,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
importVo = new TDispatchImportVo(); importVo = new TDispatchImportVo();
// 初始化派增的派单数据 // 初始化派增的派单数据
initDispatchAddVo(pre, importVo); initDispatchAddVo(pre, importVo);
importVo.setRowIndex(i);
List<TDispatchImportVo> importVoList = new ArrayList<>(); List<TDispatchImportVo> importVoList = new ArrayList<>();
importVoList.add(importVo); importVoList.add(importVo);
// 如果档案地市空 只能用缴纳地封装,如果缴纳地有问题直接返回 // 如果档案地市空 只能用缴纳地封装,如果缴纳地有问题直接返回
......
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