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,6 +2136,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 
 					//只有当结算id存在的时候修改数据才会推给ekp
 					if (StringUtils.isNotBlank(detail.getDefaultSettleId())){
+						String differenceKey = HrEquator.comparisonValue(oldDetail, detail);
+						if(!Common.isEmpty(differenceKey)){
 							try {
 								//推送修改信息
 								StringBuilder sb = new StringBuilder();
@@ -2166,6 +2169,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					}
 				}
 			}
+		}
 
 		if (CollectionUtils.isNotEmpty(detailList)){
 			this.updateBatchById(detailList);
@@ -2245,6 +2249,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 
 		//只有当结算id存在的时候修改数据才会推给ekp
 		if(StringUtils.isNotBlank(byId.getDefaultSettleId())){
+			String differenceKey = HrEquator.comparisonValue(old, byId);
+			if(!Common.isEmpty(differenceKey)){
 				try {
 					//推送修改信息
 					StringBuilder sb = new StringBuilder();
@@ -2273,6 +2279,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					log.error("pushEkp error updateInsuranceInsuredById:",e.getMessage());
 				}
 			}
+		}
 		this.updateById(byId);
 		return R.ok(InsurancesConstants.OPERATE_SUCCESS);
 	}
@@ -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);