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

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

@@ -56,7 +56,7 @@ public class TAutoPaymentDetail extends BaseEntity {
 	 */
 	@ExcelAttribute(name = "是否重新办理 0 是 1 否", maxLength = 1)
 	@Length(max = 1, message = "是否重新办理 0 是 1 否不能超过1个字符")
-	@ExcelProperty("是否重新办理 0 是 1 否")
+	@ExcelProperty("是否重新办理")
 	@Schema(description = "是否重新办理 0 是 1 否")
 	private String repeatHandleFlag;
 	/**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TAutoPaymentInfoSearchVo.java

 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TAutoPaymentInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -26,6 +27,7 @@ public class TAutoPaymentInfoSearchVo extends TAutoPaymentInfo {
 	 */
 	@Schema(description = "创建时间区间")
 	private LocalDateTime[] createTimes;
+
 	/**
 	 * @Author fxj
 	 * 查询数据起
@@ -39,4 +41,31 @@ public class TAutoPaymentInfoSearchVo extends TAutoPaymentInfo {
 	@Schema(description = "查询limit  数据条数")
 	private int limitEnd;
 
+	/**
+	 * 创建时间起
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建时间起")
+	private LocalDateTime createTimeStart;
+	/**
+	 * 创建时间止
+	 */
+	@TableField(exist = false)
+	@Schema(description = "创建时间止")
+	private LocalDateTime createTimeEnd;
+
+
+	/**
+	 * 更新时间起
+	 */
+	@TableField(exist = false)
+	@Schema(description = "更新时间起")
+	private LocalDateTime updateTimeStart;
+	/**
+	 * 更新时间止
+	 */
+	@TableField(exist = false)
+	@Schema(description = "更新时间止")
+	private LocalDateTime updateTimeEnd;
+
 }

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

@@ -224,6 +224,7 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
 					data.setRowIndex(rowIndex + 1);
 					ErrorMessage errorMessage = util1.checkEntity(data, data.getRowIndex());
 					if (Common.isNotNull(errorMessage)) {
+						errorMessage.setData(data);
 						errorMessageList.add(errorMessage);
 					} else {
 						cachedDataList.add(data);
@@ -264,16 +265,16 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
 		for (int i = 0; i < excelVOList.size(); i++) {
 			excel = excelVOList.get(i);
 			if (Common.isEmpty(paymentInfo)){
-				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.PARAM_IS_NOT_ERROR));
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.PARAM_IS_NOT_ERROR,excel));
 				continue;
 			}
 			if (CommonConstants.ZERO_STRING.equals(paymentInfo.getRepeatReviewFlag())){
-				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "重新复核中,禁止更新！"));
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "重新复核中,禁止更新！",excel));
 				continue;
 			}
 			// 数据合法情况
 			if (!CommonConstants.IS_TRUE.equals(excel.getRepeatHandleFlag())){
-				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "'是否重新办理'填写不正确！"));
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "'是否重新办理'填写不正确！",excel));
 				continue;
 			}
 			detail = baseMapper.selectOne(Wrappers.<TAutoPaymentDetail>query().lambda()
@@ -283,13 +284,13 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
 					.eq(TAutoPaymentDetail::getSocialSecurityAccount,excel.getSocialSecurityAccount())
 					.last(CommonConstants.LAST_ONE_SQL));
 			if (Common.isEmpty(detail)){
-				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "对应姓名+证件号码+社保户的数据不存在！"));
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "对应姓名+证件号码+社保户的数据不存在！",excel));
 				continue;
 			}
 			detail.setRepeatHandleFlag("0");
 			// 插入
 			baseMapper.updateById(detail);
-			errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS));
+			errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS,excel));
 		}
 	}
 

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

@@ -74,6 +74,18 @@
                     <if test="tAutoPaymentInfo.updateTime != null">
                         AND a.UPDATE_TIME = #{tAutoPaymentInfo.updateTime}
                     </if>
+					<if test="tAutoPaymentInfo.createTimeStart != null">
+						AND a.CREATE_TIME <![CDATA[ >= ]]> #{tAutoPaymentInfo.createTimeStart}
+					</if>
+					<if test="tAutoPaymentInfo.createTimeEnd != null">
+						AND a.CREATE_TIME <![CDATA[ <= ]]> #{tAutoPaymentInfo.createTimeEnd}
+					</if>
+					<if test="tAutoPaymentInfo.updateTimeStart != null">
+						AND a.UPDATE_TIME <![CDATA[ >= ]]> #{tAutoPaymentInfo.updateTimeStart}
+					</if>
+					<if test="tAutoPaymentInfo.updateTimeEnd != null">
+						AND a.UPDATE_TIME <![CDATA[ <= ]]> #{tAutoPaymentInfo.updateTimeEnd}
+					</if>
         </if>
     </sql>
     <!--tAutoPaymentInfo简单分页查询-->