Commit acdbd36c authored by huyuchen's avatar huyuchen

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

parents fd7bfa38 22761e50
...@@ -185,14 +185,14 @@ public class TProveRecord extends Model<TProveRecord> { ...@@ -185,14 +185,14 @@ public class TProveRecord extends Model<TProveRecord> {
* *
*/ */
@NotBlank(message = "单位全称不能为空") @NotBlank(message = "单位全称不能为空")
@Length(max = 20, message = "不能超过20个字符") @Length(max = 100, message = "不能超过100个字符")
@Schema(description = "单位全称", name = "unitName") @Schema(description = "单位全称", name = "unitName")
private String unitName; private String unitName;
/** /**
* *
*/ */
@NotBlank(message = "单位地址不能为空") @NotBlank(message = "单位地址不能为空")
@Length(max = 50, message = "不能超过50个字符") @Length(max = 100, message = "不能超过100个字符")
@Schema(description = "单位地址", name = "unitAddr") @Schema(description = "单位地址", name = "unitAddr")
private String unitAddr; private String unitAddr;
/** /**
......
...@@ -162,9 +162,9 @@ public class SalaryProveController { ...@@ -162,9 +162,9 @@ public class SalaryProveController {
//正式员工证明 //正式员工证明
//合同信息 //合同信息
List<TEmployeeContractInfo> contractList = employeeContractInfoService.list(Wrappers.<TEmployeeContractInfo>lambdaQuery() List<TEmployeeContractInfo> contractList = employeeContractInfoService.list(Wrappers.<TEmployeeContractInfo>lambdaQuery()
.eq(TEmployeeContractInfo::getEmpId, em.getEmpId()) .eq(TEmployeeContractInfo::getEmpIdcard, em.getEmpIdcard())
.eq(TEmployeeContractInfo::getSettleDomain, em.getDeptId()) .eq(TEmployeeContractInfo::getSettleDomain, em.getDeptId())
.eq(TEmployeeContractInfo::getIsObsolete, CommonConstants.ZERO_STRING) .eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING)
.ne(TEmployeeContractInfo::getSituation, ArchivesConstants.contractSituation[0]) .ne(TEmployeeContractInfo::getSituation, ArchivesConstants.contractSituation[0])
.ne(TEmployeeContractInfo::getSituation, ArchivesConstants.contractSituation[6]) .ne(TEmployeeContractInfo::getSituation, ArchivesConstants.contractSituation[6])
.isNotNull(TEmployeeContractInfo::getAuditTimeLast) .isNotNull(TEmployeeContractInfo::getAuditTimeLast)
......
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