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

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/vo/ErrorDetailVO.java

@@ -50,6 +50,8 @@ public class ErrorDetailVO implements Serializable {
 
 	// 提示信息
 	private String message;
+	// 颜色
+	private String color = "red";
 
 	// 所有行的结果，当第一行的allTrue=1时，需要反馈文件，否则直接提示成功
 	private int allTrue = 0;
@@ -70,4 +72,15 @@ public class ErrorDetailVO implements Serializable {
 		this.message = message;
 	}
 
+	public ErrorDetailVO(Integer lineNum, int result, String empIdCard, String socialHousehold, String providentHousehold, String empName,String message,String color) {
+		this.lineNum = lineNum;
+		this.result = result;
+		this.empIdCard = empIdCard;
+		this.socialHousehold = socialHousehold;
+		this.providentHousehold = providentHousehold;
+		this.empName = empName;
+		this.message = message;
+		this.color = color;
+	}
+
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceHandleImportParam.java

@@ -78,4 +78,10 @@ public class InsuranceHandleImportParam implements Serializable {
 	 */
 	@Schema(description = "错误信息")
 	private String errorMessage;
+
+	/**
+	 * 错误标志 0 正确 1错误
+	 */
+	@Schema(description = "错误标志")
+	private String flag;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceInsuredParam.java

@@ -94,6 +94,12 @@ public class InsuranceInsuredParam implements Serializable {
 	@Schema(description = "错误信息")
 	private String errorMessage;
 
+	/**
+	 * 错误标志 0 正确 1错误
+	 */
+	@Schema(description = "错误标志")
+	private String flag;
+
 	/**
 	 * 数据传递对象
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRegisterInvoiceNoParam.java

@@ -64,6 +64,11 @@ public class InsuranceRegisterInvoiceNoParam implements Serializable {
 	@Schema(description = "发票号")
 	private String invoiceNo;
 
+	/**
+	 * 错误标志 0 正确 1错误
+	 */
+	@Schema(description = "错误标志")
+	private String flag;
 
 	/**
 	 * 错误信息

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRegisterParam.java

@@ -83,6 +83,12 @@ public class InsuranceRegisterParam implements Serializable {
 	@Schema(description = "错误信息")
 	private String errorMessage;
 
+	/**
+	 * 错误标志 0 正确 1错误
+	 */
+	@Schema(description = "错误标志")
+	private String flag;
+
 	/**
 	 * 数据传递对象
 	 */

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -3387,6 +3387,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		outer:
 		for (int i = 0; i < distinctList.size(); i++) {
 			InsuranceRegisterParam param = distinctList.get(i);
+			param.setFlag(CommonConstants.ONE_STRING);
 			// 必填校验
 			if (StringUtils.isBlank(param.getEmpName())){
 				param.setErrorMessage(InsurancesConstants.EMP_NAME_NOT_EMPTY);
@@ -3635,6 +3636,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				}
 			}
 			param.setErrorMessage(CommonConstants.RESULT_DATA_SUCESS);
+			param.setFlag(CommonConstants.ZERO_STRING);
 			//所有校验通过后设置查到的结果
 			param.setDetail(detail);
 		}
@@ -3652,6 +3654,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	private List<InsuranceRegisterInvoiceNoParam> registeredInvoiceNoCheck(List<InsuranceRegisterInvoiceNoParam> paramList, List<TInsuranceAreaRes> insuranceAreaResList){
 		List<InsuranceRegisterInvoiceNoParam> collect = paramList.stream().distinct().collect(Collectors.toList());
 		for (InsuranceRegisterInvoiceNoParam param : collect) {
+			param.setFlag(CommonConstants.ONE_STRING);
 			// 必填校验
 			if (StringUtils.isBlank(param.getEmpName())){
 				param.setErrorMessage(InsurancesConstants.EMP_NAME_NOT_EMPTY);
@@ -3730,6 +3733,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				}
 			}
 			param.setErrorMessage(CommonConstants.RESULT_DATA_SUCESS);
+			param.setFlag(CommonConstants.ZERO_STRING);
 			//所有校验通过后设置查到的结果
 			param.setDetail(detail);
 		}
@@ -3749,6 +3753,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	private List<InsuranceInsuredParam> updateInsuranceInsuredCheck(List<InsuranceInsuredParam> paramList, List<TInsuranceAreaRes> insuranceAreaResList){
 		List<InsuranceInsuredParam> collect = paramList.stream().distinct().collect(Collectors.toList());
 		for (InsuranceInsuredParam param : collect) {
+			param.setFlag(CommonConstants.ONE_STRING);
 			// 必填校验
 			if (StringUtils.isBlank(param.getEmpName())){
 				param.setErrorMessage(InsurancesConstants.EMP_NAME_NOT_EMPTY);
@@ -3869,6 +3874,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				}
 			}
 			param.setErrorMessage(CommonConstants.RESULT_DATA_SUCESS);
+			param.setFlag(CommonConstants.ZERO_STRING);
 			//所有校验通过后设置查到的结果
 			param.setDetail(detail);
 		}
@@ -6124,6 +6130,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		for (int i = 0; i < distinctList.size(); i++) {
 			InsuranceHandleImportParam param = distinctList.get(i);
 			//办理结果
+			param.setFlag(CommonConstants.ONE_STRING);
 			String handType = param.getHandType();
 			if(StringUtils.isBlank(handType)){
 				param.setErrorMessage(InsurancesConstants.HAND_RESULT_IS_EMPTY);
@@ -6289,6 +6296,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 			param.setId(detailId);
 			param.setErrorMessage(CommonConstants.RESULT_DATA_SUCESS);
+			param.setFlag(CommonConstants.ZERO_STRING);
 		}
 		return distinctList;
 	}

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

@@ -48,7 +48,6 @@ public class TPaymentInfo extends BaseEntity {
     /**
      * 主键
      */
-    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description ="主键")
     private String id;