修改bug

commons/src/main/java/com/jzg/commons/aop/aspect/OperatorTrajectoryAspect.java

@@ -194,6 +194,7 @@ public class OperatorTrajectoryAspect {
             case "U":
                 for (String s : ids) {
                     beforeData = GetSelectIdDataUtils.selectById(operatorTrajectory.entityClass(), operatorTrajectory.mapperClass(), s);
+                    trajectory.setId(IdGenerate.nextId());
                     trajectory.setPrimaryValue(s);
                     if (!Objects.isNull(beforeData)) {
                         trajectory.setBeforeJson(JSON.toJSONString(beforeData));

platform/src/main/resources/mapper/PtlAgreementAttributionMapper.xml

@@ -8,13 +8,26 @@
 
     <select id="getAgreementAttributionList" resultType="com.jzg.commons.entity.agreement.po.PtlAgreementAttribution">
         select
-        *,
+        paa.id,
+        paa.template_id,
+        paa.api_type,
+        paa.login_url,
+        paa.api_type,
+        paa.username,
+        paa.password,
+        paa.user_abbr,
+        paa.user_dept,
+        paa.user_desc,
+        paa.use_status,
+        paa.quote_status,
+        eic.name_simple as insCompanyName,
         pau.url as url,
         sd.name as deptName
         from
         ptl_agreement_attribution paa
         left join ptl_agreement_url pau on paa.login_url = pau.id
         left join sys_dept sd on paa.user_dept = sd.id
+        left join esm_ins_company eic on paa.ins_company_id = eic.id
         where
         1=1
             and paa.is_delete = '0'

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementServiceImpl.java

@@ -221,6 +221,25 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteByIds(List<String> ids) {
+        // 删除协议
+        baseMapper.deleteByIds(ids);
+
+        // 删除承保规则
+        agreementRulesService.remove(new LambdaQueryWrapper<PtlAgreementUndwrtRules>()
+                .in(PtlAgreementUndwrtRules::getAgreementId,ids));
+
+        // 获取关联的费用
+        List<PtlAgreementCost> costsList = agreementCostService.list(new LambdaQueryWrapper<PtlAgreementCost>()
+                .in(PtlAgreementCost::getPtlAgreementId, ids));
+        // 获取关联的费用id
+        List<String> costIds = costsList.stream().map(PtlAgreementCost::getId).collect(Collectors.toList());
+        // 删除关联的费用
+        agreementCostService.removeByIds(costIds);
+
+        // 删除费用关联的规则
+        agreementCostRuleService.remove(new LambdaQueryWrapper<PtlAgreementCostRule>()
+               .in(PtlAgreementCostRule::getPtlAgreementCostId, costIds));
+
         return baseMapper.deleteByIds(ids) > 0;
     }