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

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

@@ -1351,6 +1351,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 								if (ll.getRemark() != null) {
 									if (!ll.getRemark().contains("派增审核")) {
 										if (ll.getAuditStatus().contains("审核不通过") && null != ll.getRemark()) {
+											if(!ll.getRemark().contains("-")&&!ll.getRemark().contains(":")){
+												ll.setNoPassReason(ll.getRemark());
+												ll.setRemark("");
+											}
 											if (ll.getRemark().contains(":")) {
 												String a = ll.getRemark().substring(0, ll.getRemark().indexOf(":", 1));
 												String b = ll.getRemark().substring(ll.getRemark().indexOf(":", 1) + 1);
@@ -1360,6 +1364,15 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 										}
 									}
 									if (ll.getRemark().contains("派增审核")) {
+									        if (ll.getRemark().contains("：")&&!ll.getRemark().contains(":")){
+                                                 if(ll.getRemark().split("：").length==2){
+													 int indexOne = ll.getRemark().indexOf("：");
+													 String after1 = ll.getRemark().substring(indexOne + 1);
+													 ll.setNoPassReason(after1);
+													 ll.setRemark("");
+												 }
+
+											}
 										if (ll.getRemark().contains("-")) {
 											String c = ll.getRemark().substring(0, ll.getRemark().indexOf("-", 1));
 											String d = ll.getRemark().substring(ll.getRemark().indexOf("-", 1) + 1);
@@ -1368,7 +1381,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 										}
 									}
 
-
 								}
 							}
 							writeSheet = EasyExcel.writerSheet("员工合同" + index).build();

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/Common.java

@@ -523,7 +523,7 @@ public class Common {
 	 * @param null
 	 * @return
 	 **/
-	private static final String insuranceSuffixList = "pdf|png|jpg|doc|docx|xls|xlsx|rar|zip|txt";
+	private static final String insuranceSuffixList = "pdf|png|jpg|doc|docx|xls|xlsx|rar|zip|txt|jpeg";
 
 	/**
 	 * 判断是否为允许的上传文件类型,true表示允许