Merge branch 'feature-licancan' into 'feature/insurance-1.3.0'

Feature licancan

See merge request !313

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

@@ -22,5 +22,9 @@ public class TSettleDomainListVo {
 	 * 合同主体IDS
 	 */
 	private List<String> deptIds;
+	/**
+	 * 合同主体项目编码
+	 */
+	private List<String> deptNos;
 
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java

@@ -156,6 +156,7 @@ public class TSettleDomainController {
 	public TSettleDomainListVo getSettleDomainIdsByUserId(@RequestBody String userId) {
 		TSettleDomainListVo vo = new TSettleDomainListVo();
 		vo.setDeptIds(tSettleDomainService.getSettleDomainIdsByUserId(userId));
+		vo.setDeptNos(tSettleDomainService.getSettleDomainNosByUserId(userId));
 		return vo;
 	}
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java

@@ -76,6 +76,11 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
 
 	List<String> getSettleDomainIdsByUserId(String id);
 
+	/**
+	 * 获取用户所拥有的项目编码
+	 */
+	List<String> getSettleDomainNosByUserId(String id);
+
 	SetInfoVo getSetInfoByCodes(List<String> codes);
 
 	TSettleDomainListVo getSettleInfoByCodes(List<String> codes);

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java

@@ -117,6 +117,28 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 		return domainIds;
 	}
 
+	/**
+	 * 获取用户所拥有的项目编码
+	 *
+	 * @param userId 用户id
+	 */
+	@Override
+	public List<String> getSettleDomainNosByUserId(String userId) {
+		List<String> domainNos = new ArrayList<>();
+		String userKey = CacheConstants.WXHR_SETTLE_DOMAIN_NOS_BY_USERID + "_" + userId;
+		Object settleDomainVoR = redisUtil.get(userKey);
+		if (settleDomainVoR != null) {
+			return (List<String>) settleDomainVoR;
+		} else {
+			List<TCutsomerDataPermisson>  permissonList = permissonMapper.selectAllSettleDomainPermissionByUserId(userId);
+			if (Common.isNotNull(permissonList)) {
+				domainNos = permissonList.stream().map(TCutsomerDataPermisson::getSettleDomainNo).collect(Collectors.toList());
+				redisUtil.set(userKey, domainNos);
+			}
+		}
+		return domainNos;
+	}
+
 	/**
 	 * @param settleDomainSelectVo
 	 * @Author: wangan

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CacheConstants.java

@@ -131,5 +131,9 @@ public interface CacheConstants {
 	 * 用户登录的项目vo缓存
 	 */
 	public static final String WXHR_SETTLE_DOMAIN_VOS_BY_USERID = ServiceNameConstants.ARCHIVES_SERVICE + "_SettleDomainVosByUserId";
+	/**
+	 * 缓存用户所拥有的项目编码
+	 */
+	public static final String WXHR_SETTLE_DOMAIN_NOS_BY_USERID = ServiceNameConstants.ARCHIVES_SERVICE + "_SettleDomainNosByUserId";
 
 }

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

@@ -16,6 +16,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.*;
@@ -2135,32 +2136,35 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 
 					//只有当结算id存在的时候修改数据才会推给ekp
 					if (StringUtils.isNotBlank(detail.getDefaultSettleId())){
-						try {
-							//推送修改信息
-							StringBuilder sb = new StringBuilder();
-							sb.append("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-							if (!oldDetail.getPolicyStart().toString().equals(success.getPolicyStartNew())) {
-								sb.append(";变更前保单开始时间:" + oldDetail.getPolicyStart() + ";变更后保单开始时间:" + success.getPolicyStartNew());
-							}
-							if (!oldDetail.getPolicyEnd().toString().equals(success.getPolicyEndNew())) {
-								sb.append(";变更前保单结束时间:" + oldDetail.getPolicyEnd() + ";变更后保单结束时间:" + success.getPolicyEndNew());
-							}
-							if (!oldDetail.getBuyType().equals(success.getBuyType())) {
-								sb.append(";变更前投保类型:" + getBuyType(oldDetail.getBuyType()) + ";变更后投保类型:" + getBuyType(success.getBuyType()));
-							}
-							if (StringUtils.isNotBlank(success.getReason())){
-								sb.append(";变更原因:" + success.getReason());
+						String differenceKey = HrEquator.comparisonValue(oldDetail, detail);
+						if(!Common.isEmpty(differenceKey)){
+							try {
+								//推送修改信息
+								StringBuilder sb = new StringBuilder();
+								sb.append("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+								if (!oldDetail.getPolicyStart().toString().equals(success.getPolicyStartNew())) {
+									sb.append(";变更前保单开始时间:" + oldDetail.getPolicyStart() + ";变更后保单开始时间:" + success.getPolicyStartNew());
+								}
+								if (!oldDetail.getPolicyEnd().toString().equals(success.getPolicyEndNew())) {
+									sb.append(";变更前保单结束时间:" + oldDetail.getPolicyEnd() + ";变更后保单结束时间:" + success.getPolicyEndNew());
+								}
+								if (!oldDetail.getBuyType().equals(success.getBuyType())) {
+									sb.append(";变更前投保类型:" + getBuyType(oldDetail.getBuyType()) + ";变更后投保类型:" + getBuyType(success.getBuyType()));
+								}
+								if (StringUtils.isNotBlank(success.getReason())){
+									sb.append(";变更原因:" + success.getReason());
+								}
+								EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
+								ekpUpdateParam.setFd_3b5bf02d3b8fc4(success.getPolicyStartNew());
+								ekpUpdateParam.setFd_3b5bf02e1d47cc(success.getPolicyEndNew());
+								ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(success.getBuyType()));
+								ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard());
+								ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId() + "_" + detail.getDefaultSettleId());
+								ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString());
+								eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam);
+							}catch (Exception e){
+								log.error("pushEkp error updateInsuranceInsured:",e.getMessage());
 							}
-							EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
-							ekpUpdateParam.setFd_3b5bf02d3b8fc4(success.getPolicyStartNew());
-							ekpUpdateParam.setFd_3b5bf02e1d47cc(success.getPolicyEndNew());
-							ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(success.getBuyType()));
-							ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard());
-							ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId() + "_" + detail.getDefaultSettleId());
-							ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString());
-							eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam);
-						}catch (Exception e){
-							log.error("pushEkp error updateInsuranceInsured:",e.getMessage());
 						}
 					}
 				}
@@ -2245,32 +2249,35 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 
 		//只有当结算id存在的时候修改数据才会推给ekp
 		if(StringUtils.isNotBlank(byId.getDefaultSettleId())){
-			try {
-				//推送修改信息
-				StringBuilder sb = new StringBuilder();
-				sb.append("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-				if (!old.getPolicyStart().toString().equals(param.getPolicyStart())) {
-					sb.append(";变更前保单开始时间:" + old.getPolicyStart() + ";变更后保单开始时间:" + param.getPolicyStart());
-				}
-				if (!old.getPolicyEnd().toString().equals(param.getPolicyEnd())) {
-					sb.append(";变更前保单结束时间:" + old.getPolicyEnd() + ";变更后保单结束时间:" + param.getPolicyEnd());
-				}
-				if (!old.getBuyType().equals(param.getBuyType())) {
-					sb.append(";变更前投保类型:" + getBuyType(old.getBuyType()) + ";变更后投保类型:" + getBuyType(param.getBuyType()));
-				}
-				if (StringUtils.isNotBlank(param.getReason())){
-					sb.append(";变更原因:" + param.getReason());
-				}
-				EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
-				ekpUpdateParam.setFd_3b5bf02d3b8fc4(param.getPolicyStart());
-				ekpUpdateParam.setFd_3b5bf02e1d47cc(param.getPolicyEnd());
-				ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(param.getBuyType()));
-				ekpUpdateParam.setFd_3b5bf031b52314(byId.getBuyStandard());
-				ekpUpdateParam.setFd_3b5bf032d7a822(byId.getId() + "_" + byId.getDefaultSettleId());
-				ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString());
-				eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam);
-			}catch (Exception e){
-				log.error("pushEkp error updateInsuranceInsuredById:",e.getMessage());
+			String differenceKey = HrEquator.comparisonValue(old, byId);
+			if(!Common.isEmpty(differenceKey)){
+				try {
+					//推送修改信息
+					StringBuilder sb = new StringBuilder();
+					sb.append("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+					if (!old.getPolicyStart().toString().equals(param.getPolicyStart())) {
+						sb.append(";变更前保单开始时间:" + old.getPolicyStart() + ";变更后保单开始时间:" + param.getPolicyStart());
+					}
+					if (!old.getPolicyEnd().toString().equals(param.getPolicyEnd())) {
+						sb.append(";变更前保单结束时间:" + old.getPolicyEnd() + ";变更后保单结束时间:" + param.getPolicyEnd());
+					}
+					if (!old.getBuyType().equals(param.getBuyType())) {
+						sb.append(";变更前投保类型:" + getBuyType(old.getBuyType()) + ";变更后投保类型:" + getBuyType(param.getBuyType()));
+					}
+					if (StringUtils.isNotBlank(param.getReason())){
+						sb.append(";变更原因:" + param.getReason());
+					}
+					EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
+					ekpUpdateParam.setFd_3b5bf02d3b8fc4(param.getPolicyStart());
+					ekpUpdateParam.setFd_3b5bf02e1d47cc(param.getPolicyEnd());
+					ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(param.getBuyType()));
+					ekpUpdateParam.setFd_3b5bf031b52314(byId.getBuyStandard());
+					ekpUpdateParam.setFd_3b5bf032d7a822(byId.getId() + "_" + byId.getDefaultSettleId());
+					ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString());
+					eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam);
+				}catch (Exception e){
+					log.error("pushEkp error updateInsuranceInsuredById:",e.getMessage());
+				}
 			}
 		}
 		this.updateById(byId);
@@ -6807,7 +6814,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		try{
 			R<TSettleDomainListVo> settleDomainList = archivesDaprUtil.getSettleDomainIdsByUserId(user.getId());
 			if(Common.isNotNull(settleDomainList) && settleDomainList.getCode() == CommonConstants.SUCCESS){
-				deptList = settleDomainList.getData().getDeptIds();
+				TSettleDomainListVo data = settleDomainList.getData();
+				if (Optional.ofNullable(data).isPresent()){
+					deptList = data.getDeptNos();
+				}
 			}
 		}catch (Exception e){
 			log.error("查询项目信息出错："+e);