Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreementAttribution.java

@@ -7,9 +7,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementAttributionDto;
+import com.ydtech.modules.protocol.entity.dto.PtlAttributionTemplateDto;
 import lombok.*;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 协议归属信息
@@ -96,4 +100,23 @@ public class PtlAgreementAttribution implements Serializable {
         this.fields = ptlInsAttributionTemplate.getFields();
     }
 
+    /**
+     * 过滤模版信息
+     *
+     * @param ptlAgreementAttribution   协议归属
+     * @param ptlInsAttributionTemplate 协议归属模版
+     */
+    public static void filterTemplates(PtlAgreementAttribution ptlAgreementAttribution, PtlInsAttributionTemplate ptlInsAttributionTemplate) {
+        List<PtlAttributionTemplateDto> ptlAttributionTemplateDtoList = ptlAgreementAttribution.getFields().toJavaList(PtlAttributionTemplateDto.class);
+        // 信息
+        Map<String, String> map = ptlAttributionTemplateDtoList.stream().collect(Collectors.toMap(PtlAttributionTemplateDto::getField, PtlAttributionTemplateDto::getValue, (v1, v2) -> v1));
+        // 模版中的数据
+        List<PtlAttributionTemplateDto> ptlAttributionTemplate = ptlInsAttributionTemplate.getFields().toJavaList(PtlAttributionTemplateDto.class);
+        ptlAttributionTemplate.forEach(x -> {
+            String s = map.get(x.getField());
+            x.setValue(s);
+        });
+        ptlAgreementAttribution.setFields(JSON.parseArray(JSON.toJSONString(ptlAttributionTemplate)));
+    }
+
 }

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -534,15 +534,15 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             wrapper.apply("SUBSTRING(partner_companies_id, 6, " + sign + ") =" + prefix);
         }
         List<PtlAgreementDept> deptList = new ArrayList<>();
-        if(StringUtils.isNotBlank(ptlAgreementPageVo.getDeptId())){
+        if (StringUtils.isNotBlank(ptlAgreementPageVo.getDeptId())) {
             // 获取所有该部门下勾选的协议
             LambdaQueryWrapper<PtlAgreementDept> deptWrapper = new LambdaQueryWrapper<>();
             deptWrapper.eq(PtlAgreementDept::getDeptId, ptlAgreementPageVo.getDeptId());
             deptList = ptlAgreementDeptService.list(deptWrapper);
         }
         Map<String, Object> agreeMap = new HashMap<>();
-        if(CollUtil.isNotEmpty(deptList)){
-            agreeMap = deptList.stream().collect(Collectors.toMap(PtlAgreementDept::getAgreementId,PtlAgreementDept::getDeptId));
+        if (CollUtil.isNotEmpty(deptList)) {
+            agreeMap = deptList.stream().collect(Collectors.toMap(PtlAgreementDept::getAgreementId, PtlAgreementDept::getDeptId));
         }
         Page<PtlAgreement> agreementPage = page(page, wrapper);
         for (PtlAgreement agreement : agreementPage.getRecords()) {
@@ -557,7 +557,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             }
             ptlAgreementMapper.updateById(agreement);
             // 判断是否勾选
-            if(agreeMap.containsKey(agreement.getId())){
+            if (agreeMap.containsKey(agreement.getId())) {
                 agreement.setCheck(true);
             }
         }
@@ -567,7 +567,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Override
     public HttpResult<List<PtlAgreement>> listAgreement(PtlAgreementPageVo ptlAgreementPageVo) {
         LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
-        if (!ObjectUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId())){
+        if (!ObjectUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId())) {
             // 获取供应商本级id 及其 下级id
             List<String> lowerId = esmInsCompanyService.getByLowerId(ptlAgreementPageVo.getPartnerCompaniesId());
             wrapper.in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()) && !lowerId.isEmpty(),
@@ -585,7 +585,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                 // 录入时间
                 .between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate())
                         , PtlAgreement::getCreateTime, ptlAgreementPageVo.getStartDate(), ptlAgreementPageVo.getEndDate())
-                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getIsExternal()),PtlAgreement::getIsExternal,
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getIsExternal()), PtlAgreement::getIsExternal,
                         ptlAgreementPageVo.getIsExternal())
         ;
         List<PtlAgreement> agreementPage = list(wrapper);
@@ -641,22 +641,12 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             ptlAgreementAttribution.setUsername("");
             ptlAgreementAttribution.setPassword("");
 
-        }else {
+        } else {
             PtlInsAttributionTemplate ptlInsAttributionTemplate = ptlInsAttributionTemplateService.lambdaQuery()
                     .eq(PtlInsAttributionTemplate::getInsCompanyId, ptlAgreementAttribution.getInsCompanyId())
                     .eq(PtlInsAttributionTemplate::getApiType, ptlAgreementAttribution.getApiType())
                     .one();
-            // 信息
-            List<PtlAttributionTemplateDto> ptlAttributionTemplateDtoList = ptlAgreementAttribution.getFields().toJavaList(PtlAttributionTemplateDto.class);
-            // 信息
-            Map<String, String> map = ptlAttributionTemplateDtoList.stream().collect(Collectors.toMap(PtlAttributionTemplateDto::getField, PtlAttributionTemplateDto::getValue));
-            // 模版中的数据
-            List<PtlAttributionTemplateDto> ptlAttributionTemplate = ptlInsAttributionTemplate.getFields().toJavaList(PtlAttributionTemplateDto.class);
-            ptlAttributionTemplate.forEach(x->{
-                String s = map.get(x.getField());
-                x.setValue(s);
-            });
-            ptlAgreementAttribution.setFields(JSON.parseArray(JSON.toJSONString(ptlAttributionTemplate)));
+            PtlAgreementAttribution.filterTemplates(ptlAgreementAttribution, ptlInsAttributionTemplate);
         }
 
 
@@ -1072,7 +1062,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         // 复制授权部门
         List<PtlAgreementDept> ptlAgreementDept = ptlAgreementDeptService.list(new LambdaQueryWrapper<PtlAgreementDept>().eq(PtlAgreementDept::getAgreementId, ptlAgreement.getId()));
         List<String> deptIds = ptlAgreementDept.stream().map(PtlAgreementDept::getDeptId).collect(Collectors.toList());
-        ptlAgreementDeptService.saveBatchDept(newPtlAgreement.getId(),deptIds);
+        ptlAgreementDeptService.saveBatchDept(newPtlAgreement.getId(), deptIds);
         // 添加授权部门记录
         List<PtlAgreementDeptHistory> ptlAgreementDeptList = PtlAgreementDeptHistory.toPtlAgreementDeptHistoryList(newPtlAgreement.getId(),
                 deptIds, batchNo);
@@ -1087,11 +1077,12 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         ptlAgreementTrajectoryService.save(ptlAgreementTrajectory);
         return HttpResult.ok("协议复制成功");
     }
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/9/21 15:33
-     *  @Description: 通过协议名称查询数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/9/21 15:33
+     * @Description: 通过协议名称查询数据
      */
     @Override
     public PtlAgreement getByAgreementTitle(String title) {

src/main/java/com/ydtech/modules/protocol/service/impl/PtlInsAttributionTemplateServiceImpl.java

@@ -177,18 +177,8 @@ public class PtlInsAttributionTemplateServiceImpl extends ServiceImpl<PtlInsAttr
 
         if (ObjectUtils.isEmpty(ptlAgreementAttribution)) {
             ptlAgreementAttribution = new PtlAgreementAttribution(ptlInsAttributionTemplate);
-        }else {
-            // 信息
-            List<PtlAttributionTemplateDto> ptlAttributionTemplateDtoList = ptlAgreementAttribution.getFields().toJavaList(PtlAttributionTemplateDto.class);
-            // 信息
-            Map<String, String> map = ptlAttributionTemplateDtoList.stream().collect(Collectors.toMap(PtlAttributionTemplateDto::getField, PtlAttributionTemplateDto::getValue));
-            // 模版中的数据
-            List<PtlAttributionTemplateDto> ptlAttributionTemplate = ptlInsAttributionTemplate.getFields().toJavaList(PtlAttributionTemplateDto.class);
-            ptlAttributionTemplate.forEach(x->{
-                String s = map.get(x.getField());
-                x.setValue(s);
-            });
-            ptlAgreementAttribution.setFields(JSON.parseArray(JSON.toJSONString(ptlAttributionTemplate)));
+        } else {
+            PtlAgreementAttribution.filterTemplates(ptlAgreementAttribution, ptlInsAttributionTemplate);
         }
 
         return HttpResult.ok(ptlAgreementAttribution);