Commit 469988d8 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.23' into MVP1.7.23

parents 9e4c90c8 e0d068d1
...@@ -85,7 +85,16 @@ public class TAutoMainRelExportVo implements Serializable { ...@@ -85,7 +85,16 @@ public class TAutoMainRelExportVo implements Serializable {
@Schema(description = "前端客服") @Schema(description = "前端客服")
@ExcelProperty("前端客服") @ExcelProperty("前端客服")
private String csUserName; private String csUserName;
/**
* 创建时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("添加配置时间")
@Schema(description = "添加配置时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ColumnWidth(18)
private LocalDateTime createTime;
/** /**
* 最新更新时间 * 最新更新时间
*/ */
...@@ -120,14 +129,5 @@ public class TAutoMainRelExportVo implements Serializable { ...@@ -120,14 +129,5 @@ public class TAutoMainRelExportVo implements Serializable {
@Schema(description = "限制项显示(拼接后的服务项目名称)") @Schema(description = "限制项显示(拼接后的服务项目名称)")
private String restrictItemsDisplay; private String restrictItemsDisplay;
/**
* 创建时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("创建时间")
@Schema(description = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ColumnWidth(18)
private LocalDateTime createTime;
} }
...@@ -1430,19 +1430,32 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -1430,19 +1430,32 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
// 规则1:标准合同(1)或劳务派遣合同(20),工资形式为计时/计件时,对应字段必填 // 规则1:标准合同(1)或劳务派遣合同(20),工资形式为计时/计件时,对应字段必填
// 兼容中文和数字两种格式 // 兼容中文和数字两种格式
boolean isStandardOrDispatch = ("1".equals(contractType) || "20".equals(contractType) boolean isStandard = ("1".equals(contractType) || "标准合同".equals(contractType));
|| "标准合同".equals(contractType) || "劳务派遣合同".equals(contractType)); boolean isDispatch = ( "20".equals(contractType) || "劳务派遣合同".equals(contractType));
if (isStandardOrDispatch) { if (isStandard) {
if ("1".equals(salaryType)) { if ("1".equals(salaryType)) {
// 计时工资:计时工资标准必填 // 计时工资:计时工资标准必填
if (Common.isEmpty(contractPre.getSalaryStandardPerHour())) { if (Common.isEmpty(contractPre.getSalaryStandardPerHour())) {
return "标准合同/劳务派遣合同的计时工资形式,计时工资标准不能为空,请至“入职确认信息”点击修改补充完整"; return "“计时工资标准(元/月)”不能为空,请至“入职确认信息”点击修改补充完整";
} }
} else if ("2".equals(salaryType)) { } else if ("2".equals(salaryType)) {
// 计件工资:计件工资单价必填 // 计件工资:计件工资单价必填
if (Common.isEmpty(contractPre.getSalaryStandardPerPiece())) { if (Common.isEmpty(contractPre.getSalaryStandardPerPiece())) {
return "标准合同/劳务派遣合同的计件工资形式,计件工资单价不能为空,请至“入职确认信息”点击修改补充完整"; return "“计件工资单价(元)”不能为空,请至“入职确认信息”点击修改补充完整";
}
}
}
if (isDispatch) {
if ("1".equals(salaryType)) {
// 计时工资:计时工资标准必填
if (Common.isEmpty(contractPre.getSalaryStandardPerHour())) {
return "“计时工资标准(元/月)”不能为空,请至“入职确认信息”点击修改补充完整";
}
} else if ("2".equals(salaryType)) {
// 计件工资:计件工资单价必填
if (Common.isEmpty(contractPre.getSalaryStandardPerPiece())) {
return "“计件工资单价(元)”不能为空,请至“入职确认信息”点击修改补充完整";
} }
} }
} }
...@@ -1450,7 +1463,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -1450,7 +1463,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
// 规则2:劳务协议(3),劳务费必填 // 规则2:劳务协议(3),劳务费必填
if ("3".equals(contractType) || "劳务协议".equals(contractType)) { if ("3".equals(contractType) || "劳务协议".equals(contractType)) {
if (Common.isEmpty(contractPre.getLaborCost())) { if (Common.isEmpty(contractPre.getLaborCost())) {
return "劳务协议的劳务费不能为空,请至“入职确认信息”点击修改补充完整"; return "“劳务费(元/月)”不能为空,请至“入职确认信息”点击修改补充完整";
} }
} }
...@@ -1460,7 +1473,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -1460,7 +1473,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
return "非全日制合同的工资形式必须为计时工资,请至“入职确认信息”点击修改补充完整"; return "非全日制合同的工资形式必须为计时工资,请至“入职确认信息”点击修改补充完整";
} }
if (Common.isEmpty(contractPre.getSalaryStandardPerHour())) { if (Common.isEmpty(contractPre.getSalaryStandardPerHour())) {
return "非全日制合同的计时工资标准不能为空,请至“入职确认信息”点击修改补充完整"; return "“计时工资标准(元/月)”不能为空,请至“入职确认信息”点击修改补充完整";
} }
} }
......
...@@ -10439,7 +10439,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -10439,7 +10439,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
employeeInsurancePreMapper.update(null, updateDiyInfoWrapper); employeeInsurancePreMapper.update(null, updateDiyInfoWrapper);
LambdaUpdateWrapper<TInsurancePreRenewDetail> updateReNewInfoWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TInsurancePreRenewDetail> updateReNewInfoWrapper = new LambdaUpdateWrapper<>();
updateReNewInfoWrapper.eq(TInsurancePreRenewDetail::getInsurancesId, ids) updateReNewInfoWrapper.eq(TInsurancePreRenewDetail::getInsurancesIdNew, ids)
.set(TInsurancePreRenewDetail::getProcessStatus,CommonConstants.THREE_STRING) .set(TInsurancePreRenewDetail::getProcessStatus,CommonConstants.THREE_STRING)
.set(TInsurancePreRenewDetail::getErrorTime,null) .set(TInsurancePreRenewDetail::getErrorTime,null)
.set(TInsurancePreRenewDetail::getErrorInfo,null); .set(TInsurancePreRenewDetail::getErrorInfo,null);
...@@ -10503,7 +10503,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -10503,7 +10503,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
employeeInsurancePreMapper.update(null, updateDiyInfoWrapper); employeeInsurancePreMapper.update(null, updateDiyInfoWrapper);
LambdaUpdateWrapper<TInsurancePreRenewDetail> updateReNewInfoWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TInsurancePreRenewDetail> updateReNewInfoWrapper = new LambdaUpdateWrapper<>();
updateReNewInfoWrapper.in(TInsurancePreRenewDetail::getInsurancesId, insuranceIds) updateReNewInfoWrapper.in(TInsurancePreRenewDetail::getInsurancesIdNew, insuranceIds)
.set(TInsurancePreRenewDetail::getProcessStatus,CommonConstants.SEVEN_STRING) .set(TInsurancePreRenewDetail::getProcessStatus,CommonConstants.SEVEN_STRING)
.set(TInsurancePreRenewDetail::getErrorTime,null) .set(TInsurancePreRenewDetail::getErrorTime,null)
.set(TInsurancePreRenewDetail::getErrorInfo,null); .set(TInsurancePreRenewDetail::getErrorInfo,null);
......
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