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表示允许

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java

@@ -769,5 +769,9 @@ public class TDispatchInfo extends BaseEntity {
 	@TableField(exist = false)
 	private String socialFailureType;
 
+	@ExcelAttribute(name = "contactAddress")
+	@Schema(description = "通信地址" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("通信地址" )
 	private String contactAddress;
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -695,7 +695,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					dispatch = dispatchMap.get(excel.getEmpIdcard());
 					if (Common.isNotNull(dispatch)){
 						if(Common.isNotNull(empVo)) {
-							if (Common.isNotNull(empVo.getContactAddress()) && !excel.getContactAddress().equals(empVo.getContactAddress())) {
+							if (Common.isNotNull(empVo.getContactAddress()) && Common.isNotNull(excel.getContactAddress()) && !excel.getContactAddress().equals(empVo.getContactAddress())) {
 								dispatch.setContactAddress(empVo.getContactAddress());
 							}
 						}else  {
@@ -1767,8 +1767,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				}
 				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.setPersonalBigailmentCardinal(ServiceUtil.ifNull(social.getPersonalBigailmentCardinal(), excel.getBigailmentCardinal()));
+					social.setUnitBigailmentCardinal(ServiceUtil.ifNull(social.getUnitBigailmentCardinal(), excel.getBigailmentCardinal()));
 					social.setUnitBigailmentPer(socialSet.getPayCompanyPro());
 					social.setPersonalBigailmentPer(socialSet.getPayPersonalPro());
 					social.setBigailmentHandle(CommonConstants.ZERO_STRING);
@@ -1821,7 +1821,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						//收取大病按比例
 						social.setUnitBigailmentMoney(BigDecimalUtils.safeMultiply(social.getUnitBigailmentCardinal(), socialSet.getPayCompanyPro(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
 						social.setPersonalBigailmentMoney(BigDecimalUtils.safeMultiply(social.getPersonalBigailmentCardinal(), socialSet.getPayPersonalPro(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
-
 					}
 				}
 			}
@@ -2173,7 +2172,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		emp.setIdProvince(Common.isNotNullToInt(excel.getIdCardProvince()));
 		emp.setIdCity(Common.isNotNullToInt(excel.getIdCardCity()));
 		emp.setIdTown(Common.isNotNullToInt(excel.getIdCardTown()));
-		emp.setProjectNum(CommonConstants.ONE_INT);
+//		emp.setProjectNum(CommonConstants.ONE_INT);
 		emp.setDeptNo(excel.getSettleDomainCode());
 		emp.setPost(excel.getPost());
 		emp.setDeptId(excel.getSettleDomainId());
@@ -2651,7 +2650,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.BIR_DISPATCH_SOCIAL_LIMIT_ERROR)));
 				return true;
 			}
-			if (Common.isNotNull(excel.getBigailmentCardinal())
+			if (Common.isNotNull(excel.getBigailmentCardinal()) && CommonConstants.ONE_STRING.equals(socialSet.getCollectType())
+					&& CommonConstants.ONE_STRING.equals(socialSet.getValueType())
 					&& (excel.getBigailmentCardinal().compareTo(socialSet.getUpBig()) > CommonConstants.ZERO_INT
 					|| excel.getBigailmentCardinal().compareTo(socialSet.getLowerBig())< CommonConstants.ZERO_INT)) {
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.DB_DISPATCH_SOCIAL_LIMIT_ERROR)));
@@ -2716,7 +2716,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					socialSet.getLowerInjury().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
 					socialSet.getLowerBirth().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
 					socialSet.getLowerBig().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)) ||
-					(CommonConstants.ONE_STRING.equals(excel.getPaymentType())
+					(CommonConstants.TWO_STRING.equals(excel.getPaymentType())
 							&& (socialSet.getUpPersion().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
 							socialSet.getUpMedical().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
 							socialSet.getUpUnemployment().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT ||
@@ -4082,11 +4082,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							UpProjectSocialFundVo vo = new UpProjectSocialFundVo();
 							// 社保状态 社保状态（字典）: 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
 							initSocialFundStatus(socialInfo, providentFund, vo,sf);
+							vo.setEmpIdCard(dis.getEmpIdcard());
+							vo.setDepartNo(dis.getSettleDomainCode());
 							if (Common.isNotNull(dis.getChangeContractAndEmployee())
 									&& CommonConstants.ZERO_STRING.equals(dis.getChangeContractAndEmployee())
 							&& (Common.isNotNull(vo.getSocialStatus()) || Common.isNotNull(vo.getFundStatus()))) {
-								vo.setEmpIdCard(dis.getEmpIdcard());
-								vo.setDepartNo(dis.getSettleDomainCode());
 								vo.setChangeContractAndEmployee(dis.getChangeContractAndEmployee());
 								vo.setUserId(user.getId());
 								vo.setUserName(user.getNickname());

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java

@@ -374,6 +374,7 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 									&& (excel.getUnitWorkInjuryCardinal().compareTo(socialSetInfo.getUpInjury()) > CommonConstants.ZERO_INT
 									|| excel.getUnitWorkInjuryCardinal().compareTo(socialSetInfo.getLowerInjury()) < CommonConstants.ZERO_INT)) {
 								errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.GS_DISPATCH_SOCIAL_LIMIT_ERROR)));
+								continue;
 							}
 							if (Common.isNotNull(excel.getUnitBirthCardinal())
 									&& (excel.getUnitBirthCardinal().compareTo(socialSetInfo.getUpBirth()) > CommonConstants.ZERO_INT
@@ -381,12 +382,6 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
 								errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.BIR_DISPATCH_SOCIAL_LIMIT_ERROR)));
 								continue;
 							}
-							if (Common.isNotNull(excel.getUnitBigailmentMoney())
-									&& (excel.getUnitBigailmentMoney().compareTo(socialSetInfo.getUpBig()) > CommonConstants.ZERO_INT
-									|| excel.getUnitBigailmentMoney().compareTo(socialSetInfo.getLowerBig()) < CommonConstants.ZERO_INT)) {
-								errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.DB_DISPATCH_SOCIAL_LIMIT_ERROR)));
-								continue;
-							}
 						}
 						// 初始化社保调基信息
 						initSocialHistory(history, socialFundInfo);

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -1030,6 +1030,7 @@
 		a.CONTRACT_START,
 		a.CONTRACT_END,
 		a.CREATE_NAME,
+		a.CONTACT_ADDRESS,
 		s.RECORD_BASE,
 		s.PAYMENT_TYPE,
 		a.SOCIAL_HOUSEHOLD_NAME,