Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!31

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -60,10 +60,6 @@ public class InsurancesConstants {
 	 * 无效、已过期、已出险、已减员的 不能替换
 	 */
 	public static final String REPLACE_IS_NOT_ALLOW = "无效、已过期、已出险、已减员的 不能替换";
-	/**
-	 * 订单编号不能为空
-	 */
-	public static final String ORDER_NO_NOT_EMPTY = "订单编号不能为空";
 	/**
 	 * 员工姓名不能为空
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -42,12 +42,6 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "员工身份证号")
     private String empIdcardNo;
 
-    /**
-     * 订单编号
-     */
-	@Schema(description = "订单编号")
-    private String orderNo;
-
 	/**
 	 * 项目编码
 	 */

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

@@ -14,11 +14,6 @@ import java.io.Serializable;
 @Schema(description = "商险办理新增入参")
 public class InsuranceAddParam  implements Serializable {
 	private static final long serialVersionUID = -2689686777914935788L;
-	/**
-	 * 订单编号
-	 */
-	@Schema(description = "订单编号")
-	private String orderNo;
 
 	/**
 	 * 员工姓名

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

@@ -16,11 +16,6 @@ import java.time.LocalDate;
 @Schema(description = "商险办理批增入参")
 public class InsuranceBatchParam implements Serializable {
 	private static final long serialVersionUID = -2689686777914935788L;
-	/**
-	 * 订单编号
-	 */
-	@Schema(description = "订单编号")
-	private String orderNo;
 
 	/**
 	 * 项目编码

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

@@ -22,12 +22,6 @@ public class InsuranceExportListVO implements Serializable {
 	 */
 	private String id;
 
-	/**
-	 * 订单编号
-	 */
-	@Schema(description = "订单编号")
-	private String orderNo;
-
 	/**
 	 * 项目名称
 	 */

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

@@ -24,12 +24,6 @@ public class InsuranceListVO implements Serializable {
 	@Schema(description = "主键")
 	private String id;
 
-	/**
-	 * 订单编号
-	 */
-	@Schema(description = "订单编号")
-	private String orderNo;
-
 	/**
 	 * 员工姓名
 	 */

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

@@ -24,12 +24,6 @@ public class InsuranceRefundHandlingListVo implements Serializable {
 	 */
 	private String id;
 
-	/**
-	 * 订单编号
-	 */
-	@Schema(description = "订单编号")
-	private String orderNo;
-
 	/**
 	 * 项目名称
 	 */

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

@@ -24,12 +24,6 @@ public class InsuranceRefundListVo implements Serializable {
 	@Schema(description = "主键")
 	private String id;
 
-	/**
-	 * 订单编号
-	 */
-	@Schema(description = "订单编号")
-	private String orderNo;
-
 	/**
 	 * 项目名称
 	 */

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

@@ -74,12 +74,6 @@ public class InsuranceReplaceParam implements Serializable {
 	@Schema(description = "替换员工项目编码")
 	private String replaceDeptNo;
 
-	/**
-	 * 订单编号
-	 */
-	@Schema(description = "订单编号")
-	private String orderNo;
-
 	/**
 	 * 岗位
 	 */

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

@@ -30,12 +30,6 @@ public class InsuredListVo implements Serializable {
 	@Schema(description = "主键")
 	private String id;
 
-	/**
-	 * 订单编号
-	 */
-	@Schema(description = "订单编号")
-	private String orderNo;
-
 	/**
 	 * 员工姓名
 	 */

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

@@ -257,7 +257,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				newDetail.setEmpName(success.getReplaceEmpName());
 				newDetail.setEmpIdcardNo(success.getReplaceEmpIdcardNo());
 				newDetail.setDeptNo(success.getReplaceDeptNo());
-				newDetail.setOrderNo(success.getOrderNo());
 				newDetail.setPost(success.getPost());
 				Boolean insert = this.save(newDetail);
 				//替换记录
@@ -597,11 +596,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<InsuranceAddParam> listSuccess = new ArrayList<>();
 		for (InsuranceAddParam param : paramList) {
 			// 必填校验
-			if (StringUtils.isBlank(param.getOrderNo())){
-				param.setErrorMessage(InsurancesConstants.ORDER_NO_NOT_EMPTY);
-				listResult.add(param);
-				continue;
-			}
 			if (StringUtils.isBlank(param.getEmpName())){
 				param.setErrorMessage(InsurancesConstants.EMP_NAME_NOT_EMPTY);
 				listResult.add(param);
@@ -847,11 +841,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<InsuranceBatchParam> listSuccess = new ArrayList<>();
 		for (InsuranceBatchParam param : paramList) {
 			// 必填校验
-			if (StringUtils.isBlank(param.getOrderNo())){
-				param.setErrorMessage(InsurancesConstants.ORDER_NO_NOT_EMPTY);
-				listResult.add(param);
-				continue;
-			}
 			if (StringUtils.isBlank(param.getDeptNo())){
 				param.setErrorMessage(InsurancesConstants.DEPT_NO_NOT_EMPTY);
 				listResult.add(param);
@@ -1137,11 +1126,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				listResult.add(param);
 				continue;
 			}
-			if (StringUtils.isBlank(param.getOrderNo())){
-				param.setErrorMessage(InsurancesConstants.ORDER_NO_NOT_EMPTY);
-				listResult.add(param);
-				continue;
-			}
 			if (StringUtils.isBlank(param.getPost())){
 				param.setErrorMessage(InsurancesConstants.POST_NOT_EMPTY);
 				listResult.add(param);

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

@@ -8,7 +8,6 @@
             <id property="id" column="ID" jdbcType="VARCHAR"/>
             <result property="empName" column="EMP_NAME" jdbcType="VARCHAR"/>
             <result property="empIdcardNo" column="EMP_IDCARD_NO" jdbcType="VARCHAR"/>
-            <result property="orderNo" column="ORDER_NO" jdbcType="VARCHAR"/>
             <result property="deptNo" column="DEPT_NO" jdbcType="VARCHAR"/>
             <result property="post" column="POST" jdbcType="VARCHAR"/>
             <result property="insuranceCompanyName" column="INSURANCE_COMPANY_NAME" jdbcType="VARCHAR"/>
@@ -53,7 +52,7 @@
 
     <sql id="Base_Column_List">
         ID,EMP_NAME,
-        EMP_IDCARD_NO,ORDER_NO,DEPT_NO,POST,INSURANCE_COMPANY_NAME,INSURANCE_TYPE_NAME,
+        EMP_IDCARD_NO,DEPT_NO,POST,INSURANCE_COMPANY_NAME,INSURANCE_TYPE_NAME,
         INSURANCE_TYPE_ID,BUY_STANDARD,MEDICAL_QUOTA,DIE_DISABLE_QUOTA,POLICY_NO,
         POLICY_START,POLICY_END,POLICY_EFFECT,
         BATCH_DATE,SETTLE_MONTH,INVOICE_NO,
@@ -67,7 +66,6 @@
     </sql>
 	<select id="getInsuranceListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
 		select detail.id as id,
-		detail.ORDER_NO as orderNo,
 		detail.EMP_NAME as empName,
 		detail.EMP_IDCARD_NO as empIdcardNo,
 		detail.BUY_TYPE as buyType,
@@ -104,7 +102,6 @@
 
 	<select id="getInsuranceList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
 		select detail.id as id,
-		detail.ORDER_NO as orderNo,
 		detail.EMP_NAME as empName,
 		detail.EMP_IDCARD_NO as empIdcardNo,
 		detail.BUY_TYPE as buyType,
@@ -184,7 +181,6 @@
 
 	<select id="getInsuranceExportListBySelect" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceExportListVO">
 		select detail.id as id,
-		detail.ORDER_NO as orderNo,
 		detail.DEPT_NO as deptNo,
 		detail.EMP_NAME as empName,
 		detail.EMP_IDCARD_NO as empIdcardNo,
@@ -215,7 +211,6 @@
 
 	<select id="getInsuranceExportList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceExportListVO">
 		select detail.id as id,
-			detail.ORDER_NO as orderNo,
 			detail.DEPT_NO as deptNo,
 			detail.EMP_NAME as empName,
 			detail.EMP_IDCARD_NO as empIdcardNo,
@@ -257,7 +252,6 @@
 	<select id="getInsuredListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredListVo">
 		select
 			detail.id as id,
-			detail.ORDER_NO as orderNo,
 			detail.REDUCE_HANDLE_STATUS as reduceHandleStatus,
 			detail.EMP_NAME as empName,
 			detail.EMP_IDCARD_NO as empIdcardNo,
@@ -315,7 +309,6 @@
 	<select id="getInsuredList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredListVo">
 		select
 			detail.id as id,
-			detail.ORDER_NO as orderNo,
 			detail.EMP_NAME as empName,
 			detail.EMP_IDCARD_NO as empIdcardNo,
 			detail.BUY_TYPE as buyType,
@@ -386,7 +379,6 @@
 	<select id="getInsuranceRefundPageList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceRefundListVo">
 		select
 		    detail.id as id,
-			detail.ORDER_NO as orderNo,
 			detail.EMP_NAME as empName,
 			detail.EMP_IDCARD_NO as empIdcardNo,
 			detail.POST as post,
@@ -395,16 +387,13 @@
 			detail.POLICY_START as policyStart,
 			detail.POLICY_END as policyEnd,
 			detail.POLICY_NO as policyNo,
-			refund.CREATE_TIME as refundCreateTime
+			detail.REFUND_CREATE_TIME as refundCreateTime
 		from
-			t_insurance_detail detail,
-			t_insurance_refund refund
+			t_insurance_detail detail
 		where
 		    detail.DELETE_FLAG = 0
 		and
 			detail.REDUCE_HANDLE_STATUS = 4
-		and
-		    detail.ID = refund.INS_DETAIL_ID
 		<if test="param.empName != null and param.empName.trim() != ''">
 			and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
 		</if>
@@ -426,12 +415,11 @@
 		<if test="param.policyEnd != null and param.policyEnd.trim() != ''">
 			AND detail.POLICY_END <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
 		</if>
-		ORDER BY detail.CREATE_TIME DESC
+		ORDER BY detail.REFUND_CREATE_TIME DESC
 	</select>
 	<select id="getInsuranceRefundList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceRefundListVo">
 		select
 			detail.id as id,
-			detail.ORDER_NO as orderNo,
 			detail.DEPT_NO as deptNo,
 			detail.EMP_NAME as empName,
 			detail.EMP_IDCARD_NO as empIdcardNo,
@@ -448,16 +436,13 @@
 			detail.BUY_STANDARD as buyStandard,
 			detail.MEDICAL_QUOTA as medicalQuota,
 			detail.DIE_DISABLE_QUOTA as dieDisableQuota,
-			refund.CREATE_TIME as refundCreateTime
+			detail.REFUND_CREATE_TIME as refundCreateTime
 		from
-			t_insurance_detail detail,
-			t_insurance_refund refund
+			t_insurance_detail detail
 		where
 			detail.DELETE_FLAG = 0
 		and
 			detail.REDUCE_HANDLE_STATUS = 4
-		and
-			detail.ID = refund.INS_DETAIL_ID
 		<if test="param.empName != null and param.empName.trim() != ''">
 			and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
 		</if>
@@ -479,12 +464,11 @@
 		<if test="param.policyEnd != null and param.policyEnd.trim() != ''">
 			AND detail.POLICY_END <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59')
 		</if>
-		ORDER BY detail.CREATE_TIME DESC
+		ORDER BY detail.REFUND_CREATE_TIME DESC
 	</select>
 	<select id="getInsuranceRefundHandlingPageList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceRefundHandlingListVo">
 		select
-			detail.ID as id,
-			detail.ORDER_NO as orderNo,
+		detail.id as id,
 		detail.EMP_NAME as empName,
 		detail.EMP_IDCARD_NO as empIdcardNo,
 		detail.BUY_TYPE as buyType,
@@ -501,15 +485,14 @@
 		detail.BUY_STANDARD as buyStandard,
 		detail.MEDICAL_QUOTA as medicalQuota,
 		detail.DIE_DISABLE_QUOTA as dieDisableQuota,
-			refund.CREATE_NAME as refundCreateName,
+		detail.CREATE_NAME as createName,
 		detail.REDUCE_HANDLE_STATUS as reduceHandleStatus
 		from
-			t_insurance_detail detail,
-			t_insurance_refund refund
+			t_insurance_detail detail
 		where
 			detail.DELETE_FLAG = 0
 		and
-			detail.ID = refund.INS_DETAIL_ID
+			(detail.REDUCE_HANDLE_STATUS is not null and detail.REDUCE_HANDLE_STATUS != 3)
 		<if test="param.empName != null and param.empName.trim() != ''">
 			and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
 		</if>
@@ -520,23 +503,19 @@
 			and detail.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
 		</if>
 		<if test="param.reduceHandleStatus != null and param.reduceHandleStatus.trim() != ''">
-			and detail.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
-		</if>
-		<if test="param.reduceHandleStatus = null and param.reduceHandleStatus.trim() = ''">
-			and detail.REDUCE_HANDLE_STATUS in (1,2,4)
+			and detail.REDUCE_HANDLE_STATUS like concat('%',replace(replace(#{param.reduceHandleStatus},'_','\_'),'%','\%'),'%')
 		</if>
 		<if test="param.isOverdue != null and param.isOverdue.trim() != ''">
-			and detail.IS_OVERDUE = #{param.isOverdue}
+			and detail.IS_OVERDUE like concat('%',replace(replace(#{param.isOverdue},'_','\_'),'%','\%'),'%')
 		</if>
 		<if test="param.isUse != null and param.isUse.trim() != ''">
-			and detail.IS_USE = #{param.isUse}
+			and detail.IS_USE like concat('%',replace(replace(#{param.isUse},'_','\_'),'%','\%'),'%')
 		</if>
-		ORDER BY detail.CREATE_TIME DESC
+		ORDER BY detail.REFUND_CREATE_TIME DESC
 	</select>
 	<select id="getInsuranceRefundHandlingList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceRefundHandlingListVo">
 		select
 		detail.id as id,
-		detail.ORDER_NO as orderNo,
 		detail.DEPT_NO as deptNo,
 		detail.EMP_NAME as empName,
 		detail.EMP_IDCARD_NO as empIdcardNo,
@@ -555,15 +534,12 @@
 		detail.DIE_DISABLE_QUOTA as dieDisableQuota,
 		detail.SETTLE_TYPE as settleType,
 		detail.SETTLE_MONTH as settleMonth,
-		refund.CREATE_NAME as refundCreateName,
+		detail.CREATE_NAME as createName,
 		detail.REMARK as remark
 		from
-			t_insurance_detail detail,
-			t_insurance_refund refund
+		t_insurance_detail detail
 		where
 		detail.DELETE_FLAG = 0
-		and
-			detail.ID = refund.INS_DETAIL_ID
 		and
 		detail.REDUCE_HANDLE_STATUS = 1
 		<if test="param.empName != null and param.empName.trim() != ''">
@@ -575,13 +551,16 @@
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
 		</if>
+		<if test="param.reduceHandleStatus != null and param.reduceHandleStatus.trim() != ''">
+			and detail.REDUCE_HANDLE_STATUS like concat('%',replace(replace(#{param.reduceHandleStatus},'_','\_'),'%','\%'),'%')
+		</if>
 		<if test="param.isOverdue != null and param.isOverdue.trim() != ''">
-			and detail.IS_OVERDUE = #{param.isOverdue}
+			and detail.IS_OVERDUE like concat('%',replace(replace(#{param.isOverdue},'_','\_'),'%','\%'),'%')
 		</if>
 		<if test="param.isUse != null and param.isUse.trim() != ''">
-			and detail.IS_USE = #{param.isUse
+			and detail.IS_USE like concat('%',replace(replace(#{param.isUse},'_','\_'),'%','\%'),'%')
 		</if>
-		ORDER BY detail.CREATE_TIME DESC
+		ORDER BY detail.REFUND_CREATE_TIME DESC
 	</select>
 
 	<update id="updateInsuranceRefund">