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

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

@@ -1219,10 +1219,12 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 		TEmployeeProject tEmployeeProject;
 		TEmployeeInfo tEmployeeInfo;
 		int i =1;
+		int errorCount=0;
 		for (TEmployeeContractInfo contract:contractInfos){
 			i++;
 			if (contract.getAuditStatus() != CommonConstants.ONE_INT) {
-				errorMessages.add(new ErrorMessage(i,"不是待审核状态！",CommonConstants.RED));
+				errorMessages.add(new ErrorMessage(i,"不是待审核状态！",CommonConstants.RED,contract.getApplyNo()));
+				errorCount++;
 				continue;
 			}
 			tEmployeeContractInfo = new TEmployeeContractInfo();
@@ -1263,18 +1265,21 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						TEmployeeContractInfo old = this.getById(contract.getOldContractId());
 						if (old != null && Common.isNotNull(old.getId())) {
 							if (!CommonConstants.ZERO_STRING.equals(old.getInUse())) {
-								errorMessages.add(new ErrorMessage(i,"关联的原合同已不在用！",CommonConstants.RED));
+								errorMessages.add(new ErrorMessage(i,"关联的原合同已不在用！",CommonConstants.RED,contract.getApplyNo()));
+								errorCount++;
 								continue;
 							} else {
 								old.setInUse(CommonConstants.ONE_STRING);
 								this.updateById(old);
 							}
 						} else {
-							errorMessages.add(new ErrorMessage(i,"未找到关联的原合同！",CommonConstants.RED));
+							errorMessages.add(new ErrorMessage(i,"未找到关联的原合同！",CommonConstants.RED,contract.getApplyNo()));
+							errorCount++;
 							continue;
 						}
 					} else {
-						errorMessages.add(new ErrorMessage(i,"未找到关联的原合同！",CommonConstants.RED));
+						errorMessages.add(new ErrorMessage(i,"未找到关联的原合同！",CommonConstants.RED,contract.getApplyNo()));
+						errorCount++;
 						continue;
 					}
 
@@ -1314,7 +1319,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			// 不是待提交，记录审核记录
 			this.setAuditInfo(tEmployeeContractInfo);
 			this.updateById(tEmployeeContractInfo);
-			errorMessages.add(new ErrorMessage(i,"更新成功！",CommonConstants.GREEN));
+			errorMessages.add(new ErrorMessage(i,"审核成功！",CommonConstants.GREEN));
+		}
+		if (errorCount == CommonConstants.ZERO_INT){
+			return R.ok();
 		}
 		return R.ok(errorMessages);
 	}

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

@@ -97,7 +97,7 @@ archives.project.emp.not.exist=\u8BE5\u4EBA\u5458\u65E0\u5BF9\u5E94\u7684\u9879\
 
 archives.project.change.not.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0B\u5B58\u5728\u8FDB\u884C\u4E2D/\u672A\u5B8C\u7ED3\u7684\u670D\u52A1
 
-archives.project.change.contract.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0B\u5B58\u5728\u5B58\u5728\u5728\u7528\u6216\u5F85\u5BA1\u6838\u3001\u5F85\u63D0\u4EA4\u7684\u5408\u540C\uFF0C\u4E0D\u5141\u8BB8\u51CF\u9879
+archives.project.change.contract.exist=\u4EBA\u5458\u5728\u8BE5\u9879\u76EE\u4E0B\u5B58\u5728\u5728\u7528\u6216\u5F85\u5BA1\u6838\u3001\u5F85\u63D0\u4EA4\u7684\u5408\u540C\uFF0C\u4E0D\u5141\u8BB8\u51CF\u9879
 
 archives.project.emp.lose.fee.not.empty=\u4E0D\u826F\u8BB0\u5F55\u8D39\u7528\u635F\u5931\u548C\u5176\u4ED6\u635F\u5931\u4E0D\u53EF\u540C\u65F6\u4E3A\u7A7A
 

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceEnclosureMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEnclosureMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEnclosure">
-            <id property="id" column="ID" jdbcType="INTEGER"/>
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
             <result property="enclosureName" column="ENCLOSURE_NAME" jdbcType="VARCHAR"/>
             <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
             <result property="deleteFlag" column="DELETE_FLAG" jdbcType="VARCHAR"/>