Merge branch 'f-zy' into 'feature/insurance-1.3.0'

feat:减员办理相关列表增加购买标准区间筛选条件

See merge request !284

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

@@ -109,16 +109,15 @@ public class InsuranceRefundHandlingParam extends BaseEntity implements Serializ
 	private String endDate;
 
 	/**
-	 * 购买标准开始
+	 * 购买标准区间最小值
 	 */
-	@Schema(description = "购买标准开始")
-	private String buyStandardStart;
+	@Schema(description = "购买标准区间最小值")
+	private String buyStandardMin;
 
 	/**
-	 * 购买标准结束
+	 * 购买标准区间最大值
 	 */
-	@Schema(description = "购买标准结束")
-	private String buyStandardEnd;
-
+	@Schema(description = "购买标准区间最大值")
+	private String buyStandardMax;
 
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -459,7 +459,7 @@ public class TInsuranceDetailController {
 	 *
 	 * @author zhaji
 	 * @param param 查询条件
-	 * @return {@link R<List<  RefundExportListVo  >>}
+	 * @return {@link R<List<RefundExportListVo>>}
 	 */
 	@Operation(summary = "导出减员列表", description = "导出减员列表")
 	@PostMapping("/getInsuranceRefundHandlingList")

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceRefundController.java

@@ -7,7 +7,6 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.jmx.export.annotation.ManagedOperationParameter;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

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

@@ -4138,7 +4138,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 *
 	 * @author zhaji
 	 * @param param 查询参数
-	 * @return {@link List<  RefundExportListVo >}
+	 * @return {@link List<RefundExportListVo>}
 	 */
 	@Override
 	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})

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

@@ -893,11 +893,11 @@
 		<if test="param.endDate != null and param.endDate.trim() != ''">
 			AND refund.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
 		</if>
-		<if test="param.buyStandardStart != null and param.buyStandardStart.trim() != ''">
-			AND a.BUY_STANDARD   <![CDATA[ >= ]]>  #{param.buyStandardStart}
+		<if test="param.buyStandardMin != null and param.buyStandardMin.trim() != ''">
+			AND a.BUY_STANDARD   <![CDATA[ >= ]]>  #{param.buyStandardMin}
 		</if>
-		<if test="param.buyStandardEnd != null and param.buyStandardEnd.trim() != ''">
-			AND a.BUY_STANDARD <![CDATA[ <= ]]> #{param.buyStandardEnd}
+		<if test="param.buyStandardMax != null and param.buyStandardMax.trim() != ''">
+			AND a.BUY_STANDARD <![CDATA[ <= ]]> #{param.buyStandardMax}
 		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
@@ -1026,11 +1026,11 @@
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
-		<if test="param.buyStandardStart != null and param.buyStandardStart.trim() != ''">
-			AND a.BUY_STANDARD   <![CDATA[ >= ]]>  #{param.buyStandardStart}
+		<if test="param.buyStandardMin != null and param.buyStandardMin.trim() != ''">
+			AND a.BUY_STANDARD   <![CDATA[ >= ]]>  #{param.buyStandardMin}
 		</if>
-		<if test="param.buyStandardEnd != null and param.buyStandardEnd.trim() != ''">
-			AND a.BUY_STANDARD <![CDATA[ <= ]]> #{param.buyStandardEnd}
+		<if test="param.buyStandardMax != null and param.buyStandardMax.trim() != ''">
+			AND a.BUY_STANDARD <![CDATA[ <= ]]> #{param.buyStandardMax}
 		</if>
 		<if test="param.updateBy != null and param.updateBy.trim() != ''">
 			and  refund.UPDATE_BY = #{param.updateBy}
@@ -1306,6 +1306,12 @@
 		<if test="param.endDate != null and param.endDate.trim() != ''">
 			AND refund.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
 		</if>
+		<if test="param.buyStandardMin != null and param.buyStandardMin.trim() != ''">
+			AND a.BUY_STANDARD   <![CDATA[ >= ]]>  #{param.buyStandardMin}
+		</if>
+		<if test="param.buyStandardMax != null and param.buyStandardMax.trim() != ''">
+			AND a.BUY_STANDARD <![CDATA[ <= ]]> #{param.buyStandardMax}
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>
@@ -1381,6 +1387,12 @@
 		<if test="param.endDate != null and param.endDate.trim() != ''">
 			AND refund.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
 		</if>
+		<if test="param.buyStandardMin != null and param.buyStandardMin.trim() != ''">
+			AND a.BUY_STANDARD   <![CDATA[ >= ]]>  #{param.buyStandardMin}
+		</if>
+		<if test="param.buyStandardMax != null and param.buyStandardMax.trim() != ''">
+			AND a.BUY_STANDARD <![CDATA[ <= ]]> #{param.buyStandardMax}
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>