Merge remote-tracking branch 'origin/develop' into develop

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

@@ -87,4 +87,11 @@ public class InsuranceListParam extends BaseEntity {
 	 */
 	@Schema(description = "派单结束时间")
 	private String endDate;
+
+	/**
+	 * 减员状态 1待减员 2减员中3减员退回
+	 */
+	@Schema(description = "减员状态 1待减员 2减员中3减员退回,4减员成功")
+	private Integer reduceHandleStatus;
+
 }

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

@@ -99,7 +99,8 @@
 		a.SETTLE_TYPE as settleType,
 		a.CREATE_USER_DEPT_NAME as createUserDeptName,
 		a.SETTLE_MONTH as settleMonth,
-		a.DEPT_NAME as projectName
+		a.DEPT_NAME as projectName,
+		a.REDUCE_HANDLE_STATUS as reduceHandleStatus
 		from t_insurance_detail a
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
@@ -141,6 +142,9 @@
 		<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
 			and a.CREATE_TIME <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
 		</if>
+		<if test="param.reduceHandleStatus != null">
+			and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>
@@ -165,7 +169,8 @@
 		a.BUY_HANDLE_STATUS as buyHandleStatus,
 		a.SETTLE_TYPE as settleType,
 		a.SETTLE_MONTH as settleMonth,
-		a.DEPT_NAME as projectName
+		a.DEPT_NAME as projectName,
+		a.REDUCE_HANDLE_STATUS as reduceHandleStatus
 		from t_insurance_detail a
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			left join t_insurance_area_res p on p.USER_ID = #{param.createBy}
@@ -204,6 +209,9 @@
 		<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
 			and a.CREATE_TIME <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
 		</if>
+		<if test="param.reduceHandleStatus != null">
+			and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
+		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>