Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!54

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java

@@ -58,7 +58,7 @@ public class ProjectSetInfoVo implements Serializable {
 	 * 商险结算类型：0预估  1 实缴
 	 */
 	@Schema(description = "商险结算类型")
-	private String insuranceSettleType = CommonConstants.ONE_STRING;
+	private String insuranceSettleType;
 
 
 }

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -195,6 +195,7 @@
 		SELECT a.ID,
 			   a.DEPART_NO,
 			   a.DEPART_NAME,
+		       a.INSURANCE_SETTLE_TYPE,
 			   c.ID AS 'customerId',
 			   c.CUSTOMER_NAME as 'customerName',
 			   c.CUSTOMER_CODE as 'customerCode'

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

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author licancan
@@ -27,6 +28,12 @@ public class InsuranceListParam implements Serializable {
 	@Schema(description = "投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员")
 	private Integer buyHandleStatus;
 
+	/**
+	 * 投保列表专用字段
+	 */
+	@Schema(description = "投保状态 集合中只能有这三个状态 1待投保 2投保中 4投保退回")
+	private List<Integer> buyHandleStatusList;
+
 	/**
 	 * 员工姓名
 	 */

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

@@ -346,7 +346,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				return R.failed(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
 			}
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -355,7 +355,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					return R.failed(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 				}
-			}
+			}*/
 
 			if(!LocalDateUtil.isDate(param.getPolicyStart(),LocalDateUtil.NORM_DATE_PATTERN)){
 				return R.failed(InsurancesConstants.POLICY_START_PARSE_ERROR);
@@ -974,7 +974,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				continue;
 			}
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -985,7 +985,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			//根据项目编码查询项目是否存在
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(param.getDeptNo()));
@@ -1280,7 +1280,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -1291,7 +1291,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			//根据项目编码查询项目是否存在
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(param.getDeptNo()));
@@ -1548,7 +1548,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				continue;
 			}
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getReplaceEmpName());
 			checkIdCard.setIdCard(param.getReplaceEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -1559,7 +1559,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			if (param.getEmpName().equals(param.getReplaceEmpName()) && param.getEmpIdcardNo().equals(param.getReplaceEmpIdcardNo())){
 				param.setErrorMessage(InsurancesConstants.REPLACE_EMP_INFO_SAME);
@@ -1813,7 +1813,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						listResult.add(param);
 						continue;
 					}
-					if(BigDecimalUtils.isBigDecimal(param.getActualPremium())){
+					if(!BigDecimalUtils.isBigDecimal(param.getActualPremium())){
 						param.setErrorMessage(InsurancesConstants.ACTUAL_PREMIUM_PARSE_ERROR);
 						listResult.add(param);
 						continue;

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

@@ -101,6 +101,12 @@
 		<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
 			and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
 		</if>
+		<if test="param.buyHandleStatusList.size > 0 and param.buyHandleStatusList != null">
+			and detail.BUY_HANDLE_STATUS in
+			<foreach collection="param.buyHandleStatusList" index="index" item="item" open="(" separator="," close=")">
+				 #{item}
+			</foreach>
+		</if>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>
 
@@ -140,6 +146,12 @@
 		<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
 			and detail.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
 		</if>
+		<if test="param.buyHandleStatusList.size > 0 and param.buyHandleStatusList != null">
+			and detail.BUY_HANDLE_STATUS in
+			<foreach collection="param.buyHandleStatusList" index="index" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>