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

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

@@ -51,7 +51,7 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable {
 	/**
 	 * 资格等级
 	 */
-	@ExcelAttribute(name = "资格等级",isNotEmpty = true,errorInfo = "资格等级不可为空",isDataId = true, dataType = ExcelAttributeConstants.QUALIFICATION_LEVEL)
+	@ExcelAttribute(name = "资格等级",isNotEmpty = false,errorInfo = "资格等级不可为空",isDataId = true, dataType = ExcelAttributeConstants.QUALIFICATION_LEVEL)
 	@NotNull(message = "资格等级不可为空")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="资格等级")

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpDisabilityInfoController.java

@@ -102,6 +102,9 @@ public class TEmpDisabilityInfoController {
     public R<Boolean> save(@RequestBody TEmpDisabilityInfo tEmpDisabilityInfo) {
 		R<Boolean> failed = getCheckRes(tEmpDisabilityInfo);
 		if (failed != null) return failed;
+		if (CommonConstants.ZERO_STRING.equals(tEmpDisabilityInfo.getOtherFlag())){
+			tEmpDisabilityInfo.setRemark("曾经或正在追究与承担过刑事责任");
+		}
 		return tEmpDisabilityInfoService.saveDiy(tEmpDisabilityInfo);
     }
 
@@ -122,6 +125,9 @@ public class TEmpDisabilityInfoController {
 				return R.failed("伤残等级不可为空！");
 			}
 		}
+		if (Common.isEmpty(tEmpDisabilityInfo.getOtherFlag())){
+			return R.failed("是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 不可为空！");
+		}
 		return null;
 	}
 
@@ -137,6 +143,9 @@ public class TEmpDisabilityInfoController {
     public R<Boolean> updateById(@RequestBody TEmpDisabilityInfo tEmpDisabilityInfo) {
 		R<Boolean> failed = getCheckRes(tEmpDisabilityInfo);
 		if (failed != null) return failed;
+		if (CommonConstants.ZERO_STRING.equals(tEmpDisabilityInfo.getOtherFlag())){
+			tEmpDisabilityInfo.setRemark("曾经或正在追究与承担过刑事责任");
+		}
 		return tEmpDisabilityInfoService.updateByIdDiy(tEmpDisabilityInfo);
     }
 

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

@@ -126,6 +126,13 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
 					continue;
 				}
 			}
+			if (Common.isEmpty(excel.getOtherFlag())){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(),"是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 不可为空！"));
+				continue;
+			}
+			if (CommonConstants.ZERO_STRING.equals(excel.getOtherFlag())){
+				excel.setRemark("曾经或正在追究与承担过刑事责任");
+			}
 			// 数据合法情况
 			insertExcel(excel,emp);
 			errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));

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

@@ -159,8 +159,10 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
 		}
 		if (Common.isNotNull(list)){
 			// 检查添加是否已经存在
-			boolean match = list.stream().anyMatch(info -> excel.getQualificationLevel()
-					.equals(info.getQualificationLevel())
+			boolean match = list.stream().anyMatch(info ->
+					((Common.isEmpty(excel.getQualificationLevel()) && Common.isNotNull(info.getQualificationLevel()))
+					|| (Common.isNotNull(excel.getQualificationLevel())
+					&& excel.getQualificationLevel().equals(info.getQualificationLevel())))
 					&& excel.getEmpIdcard().equals(info.getEmpIdcard())
 					&& excel.getQualificationType().equals(info.getQualificationType()));
 

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

@@ -101,6 +101,10 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_WORK_RECORD_EXISTING)));
 				continue;
 			}
+			if (Common.isEmpty(excel.getEndDate())){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.EMP_WORKING_RECODE_END_DATE_NOT_EMPTY)));
+				continue;
+			}
 			// 数据合法情况
 			insertExcel(excel,emp);
 			errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
@@ -119,6 +123,9 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
 
 	@Override
 	public R<Boolean> saveDiy(TEmpWorkRecording recording) {
+		if (CommonConstants.ONE_STRING.equals(recording.getFirstWorkFlag()) && Common.isEmpty(recording.getEndDate())){
+			return R.failed("结束日期必填");
+		}
 		recording.setDeleteFlag(CommonConstants.ZERO_STRING);
 		String res = checkRepeat(recording);
 		if (Common.isEmpty(res)){

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java

@@ -607,4 +607,9 @@ public interface ErrorCodes {
 	 * 公积金未派减，请核实！
 	 */
 	String EMP_DISPATCH_SIGNLE_REDUCE = "emp.dispatch.signle.reduce";
+
+	/**
+	 * 工作经历结束日期不可为空
+	 */
+	String EMP_WORKING_RECODE_END_DATE_NOT_EMPTY = "emp.work.record.end.date.not.empty";
 }

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -233,6 +233,8 @@ emp.dispatch.fund.not.empty.signle=\u5355\u51CF\u516C\u79EF\u91D1\uFF0C\u662F\u5
 
 emp.dispatch.signle.reduce=\u516C\u79EF\u91D1\u672A\u6D3E\u51CF\uFF0C\u8BF7\u6838\u5B9E\uFF01
 
+emp.work.record.end.date.not.empty=\u5DE5\u4F5C\u7ECF\u5386\u7ED3\u675F\u65E5\u671F\u4E0D\u53EF\u4E3A\u7A7A
+