Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!34

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

@@ -19,6 +19,12 @@ import java.time.LocalDateTime;
 @Schema(description = "投保详情VO")
 public class InsuranceDetailVO implements Serializable {
 	private static final long serialVersionUID = 628032758008497542L;
+	/**
+	 * 主键
+	 */
+	@Schema(description = "主键")
+	private String id;
+
 	/**
 	 * 员工姓名
 	 */

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

@@ -413,6 +413,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	@Override
 	public InsuranceDetailVO getInsuranceDetailById(String id) {
 		InsuranceDetailVO insuranceDetailVO = this.baseMapper.getInsuranceDetailById(id);
+		if (null != insuranceDetailVO){
+			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(insuranceDetailVO.getDeptNo()));
+			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
+				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
+				ProjectSetInfoVo jsonObject = data.get(insuranceDetailVO.getDeptNo());
+				if (null != jsonObject){
+					insuranceDetailVO.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
+				}
+			}
+		}
 		return insuranceDetailVO;
 	}
 
@@ -594,7 +604,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		Map<String,List<InsuranceAddParam>> map = new HashMap<>();
 		List<InsuranceAddParam> listResult = new ArrayList<>();
 		List<InsuranceAddParam> listSuccess = new ArrayList<>();
-		for (InsuranceAddParam param : paramList) {
+		for (InsuranceAddParam param : paramList.stream().distinct().collect(Collectors.toList())) {
 			// 必填校验
 			if (StringUtils.isBlank(param.getEmpName())){
 				param.setErrorMessage(InsurancesConstants.EMP_NAME_NOT_EMPTY);
@@ -802,7 +812,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					.eq(TInsuranceDetail::getPolicyStart, param.getPolicyStart())
 					.eq(TInsuranceDetail::getPolicyEnd, param.getPolicyEnd())
 					.notIn(TInsuranceDetail::getBuyHandleStatus, setRStatus)
-					.eq(TInsuranceDetail::getIsOverdue, CommonConstants.ZERO_INT)
 					.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
 			);
 			if (Optional.ofNullable(insuranceDetail).isPresent()){
@@ -839,7 +848,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		Map<String,List<InsuranceBatchParam>> map = new HashMap<>();
 		List<InsuranceBatchParam> listResult = new ArrayList<>();
 		List<InsuranceBatchParam> listSuccess = new ArrayList<>();
-		for (InsuranceBatchParam param : paramList) {
+		for (InsuranceBatchParam param : paramList.stream().distinct().collect(Collectors.toList())) {
 			// 必填校验
 			if (StringUtils.isBlank(param.getDeptNo())){
 				param.setErrorMessage(InsurancesConstants.DEPT_NO_NOT_EMPTY);
@@ -1074,7 +1083,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		Map<String,List<InsuranceReplaceParam>> map = new HashMap<>();
 		List<InsuranceReplaceParam> listResult = new ArrayList<>();
 		List<InsuranceReplaceParam> listSuccess = new ArrayList<>();
-		for (InsuranceReplaceParam param : paramList) {
+		for (InsuranceReplaceParam param : paramList.stream().distinct().collect(Collectors.toList())) {
 			// 必填校验
 			if (StringUtils.isBlank(param.getEmpName())){
 				param.setErrorMessage(InsurancesConstants.EMP_NAME_NOT_EMPTY);
@@ -1213,7 +1222,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		Map<String,List<InsuranceRegisterParam>> map = new HashMap<>();
 		List<InsuranceRegisterParam> listResult = new ArrayList<>();
 		List<InsuranceRegisterParam> listSuccess = new ArrayList<>();
-		for (InsuranceRegisterParam param : paramList) {
+		for (InsuranceRegisterParam param : paramList.stream().distinct().collect(Collectors.toList())) {
 			// 必填校验
 			if (StringUtils.isBlank(param.getEmpName())){
 				param.setErrorMessage(InsurancesConstants.EMP_NAME_NOT_EMPTY);

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

@@ -138,6 +138,7 @@
 
 	<select id="getInsuranceDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceDetailVO">
 		select
+		detail.id as id,
 		detail.EMP_NAME as empName,
 		detail.EMP_IDCARD_NO as empIdcardNo,
 		detail.BUY_TYPE as buyType,