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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java

@@ -251,6 +251,11 @@ public class EmployeeContractExportVO implements Serializable {
 	@ExcelProperty("创建人")
 	private String createName;
 
+	@ExcelAttribute(name = "审核人")
+	@ExcelProperty("审核人")
+	@Schema(description = "审核人")
+	private String auditUserName;
+
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("创建时间")

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java

@@ -1440,17 +1440,28 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						contractInfo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
 						list = baseMapper.getTEmployeeContractExport(contractInfo);
 						if (Common.isNotNull(list)) {
-							for(EmployeeContractExportVO ll:list){
-								if(ll.getAuditStatus().contains("审核不通过")) {
-									if (null != ll.getRemark()) {
-										String[] a = ll.getRemark().split(":");
-										for(int t=CommonConstants.ZERO_INT;t<a.length;t++){
-											if(t==CommonConstants.ONE_INT) {
-												ll.setNoPassReason(a[CommonConstants.ZERO_INT]);
-												ll.setRemark(a[CommonConstants.ONE_INT]);
+							for (EmployeeContractExportVO ll : list) {
+								if (ll.getRemark() != null) {
+									if (!ll.getRemark().contains("派增审核")) {
+										if (ll.getAuditStatus().contains("审核不通过") && null != ll.getRemark()) {
+											if (ll.getRemark().contains(":")) {
+												String a = ll.getRemark().substring(0, ll.getRemark().indexOf(":", 1));
+												String b = ll.getRemark().substring(ll.getRemark().indexOf(":", 1) + 1);
+												ll.setNoPassReason(a);
+												ll.setRemark(b);
 											}
 										}
 									}
+									if (ll.getRemark().contains("派增审核")) {
+										if (ll.getRemark().contains("-")) {
+											String c = ll.getRemark().substring(0, ll.getRemark().indexOf("-", 1));
+											String d = ll.getRemark().substring(ll.getRemark().indexOf("-", 1) + 1);
+											ll.setNoPassReason(c);
+											ll.setRemark(d);
+										}
+									}
+
+
 								}
 							}
 							writeSheet = EasyExcel.writerSheet("员工合同" + index).build();

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml

@@ -213,6 +213,7 @@
 		a.EMP_NO,
 		a.EMP_NAME,
 		a.EMP_IDCARD,
+		a.AUDIT_USER_NAME,
 		a.CONTRACT_START,
 		a.CONTRACT_END,
 		a.FILE_PROVINCE,
@@ -476,6 +477,7 @@
 		a.EMP_IDCARD,
 		a.CONTRACT_START,
 		a.CONTRACT_END,
+		a.AUDIT_USER_NAME,
 		a1.AREA_NAME as "FILE_PROVINCE",
 		a2.AREA_NAME as "FILE_CITY",
 		a3.AREA_NAME as "FILE_TOWN",