Merge remote-tracking branch 'origin/dev-lml' into dev-lml

- 分单策略的配套字段只有 groupByField，缺少用于展示的 groupByFieldName，
  前端选中分组字段后无法回显名称，补上该字段（仅展示用途，不参与分单计算，
  执行侧仍按 field id 取分组依据）
- 实体实现 Serializable，与 ReverseWritingRules 等规则实体保持一致

common/common-botp/src/main/java/apelet/common/botp/controller/ReverseWritingRulesController.java

@@ -1,8 +1,11 @@
 package apelet.common.botp.controller;
 
+import apelet.common.botp.dto.ReverseWritingRulesDto;
+import apelet.common.botp.model.ConvertPluginEntry;
 import apelet.common.botp.model.ReverseWritingBusiness;
 import apelet.common.botp.model.ReverseWritingFormula;
 import apelet.common.botp.model.ReverseWritingRules;
+import apelet.common.botp.service.IConvertPluginEntryService;
 import apelet.common.botp.service.IReverseWritingBusinessService;
 import apelet.common.botp.service.IReverseWritingFormulaService;
 import apelet.common.botp.service.IReverseWritingRulesService;
@@ -12,9 +15,8 @@ import apelet.common.core.object.MyPageData;
 import apelet.common.core.object.MyPageParam;
 import apelet.common.core.object.ResponseResult;
 import apelet.common.core.util.MyPageUtil;
-import apelet.common.botp.dto.ReverseWritingRulesDto;
+import apelet.common.generator.model.OnlFormHead;
-import apelet.common.generator.model.*;
+import apelet.common.generator.service.IOnlFormHeadService;
-import apelet.common.generator.service.*;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.Page;
@@ -26,7 +28,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -47,6 +51,8 @@ public class ReverseWritingRulesController {
     IReverseWritingBusinessService businessService;
     @Autowired
     IOnlFormHeadService onlFormHeadService;
+    @Autowired
+    IConvertPluginEntryService convertPluginEntryService;
 
     @PostMapping(value = "/page")
     @Schema(description = "分页查询")
@@ -106,6 +112,7 @@ public class ReverseWritingRulesController {
         rulesService.removeById(id);
         formulaService.remove(new LambdaQueryWrapper<ReverseWritingFormula>().eq(ReverseWritingFormula::getRulesId, id));
         businessService.remove(new LambdaQueryWrapper<ReverseWritingBusiness>().eq(ReverseWritingBusiness::getRulesId, id));
+        convertPluginEntryService.remove(new LambdaQueryWrapper<ConvertPluginEntry>().eq(ConvertPluginEntry::getParentId, id.toString()));
         return ResponseResult.success("删除成功");
     }
 
@@ -121,6 +128,12 @@ public class ReverseWritingRulesController {
         return ResponseResult.success(businessList);
     }
 
+    @GetMapping(value = "/getConvertPluginEntry")
+    public ResponseResult<List<ConvertPluginEntry>> getConvertPluginEntryByRuleId(@RequestParam Long id) {
+        List<ConvertPluginEntry> convertPluginEntryList = convertPluginEntryService.list(new LambdaQueryWrapper<ConvertPluginEntry>().eq(ConvertPluginEntry::getParentId, id.toString()));
+        return ResponseResult.success(convertPluginEntryList);
+    }
+
     @GetMapping(value = "/getVersionList")
     @Schema(description = "反写规则版本快照列表")
     public ResponseResult<?> getVersionList(@RequestParam Long id) {

common/common-botp/src/main/java/apelet/common/botp/dto/ReverseWritingRulesDto.java

@@ -1,6 +1,7 @@
 package apelet.common.botp.dto;
 
 
+import apelet.common.botp.model.ConvertPluginEntry;
 import apelet.common.botp.model.ReverseWritingBusiness;
 import apelet.common.botp.model.ReverseWritingFormula;
 import apelet.common.botp.model.ReverseWritingRules;
@@ -30,6 +31,8 @@ public class ReverseWritingRulesDto extends ReverseWritingRules implements Seria
 
     private List<ReverseWritingBusiness> businessList;
 
+    private List<ConvertPluginEntry> convertPluginEntryList;
+
 
 
 }

common/common-botp/src/main/java/apelet/common/botp/model/ConvertPluginEntry.java

@@ -53,7 +53,7 @@ public class ConvertPluginEntry extends BaseModel {
 
     @Excel(name = "序号", width = 15)
     @Schema(description = "序号")
-    private String serialNumber;
+    private Integer serialNumber;
 
     @Excel(name = "父表id", width = 15)
     @Schema(description = "父表id")

common/common-botp/src/main/java/apelet/common/botp/model/ConvertRule.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -22,7 +23,7 @@ import java.util.Map;
 @Data
 @Schema( description = "转换规则存值主表")
 @TableName("convert_rule")
-public class ConvertRule extends BaseModel {
+public class ConvertRule extends BaseModel implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -167,6 +168,10 @@ public class ConvertRule extends BaseModel {
     @Schema(description = "分单字段")
     private String groupByField;
 
+    @Excel(name = "分单字段名称", width = 15)
+    @Schema(description = "分单字段名称")
+    private String groupByFieldName;
+
     @Excel(name = "规则启用条件", width = 15)
     @Schema(description = "规则启用条件，,留空 = 始终启用")
     private String enableConditionJson;

common/common-botp/src/main/java/apelet/common/botp/service/impl/ReverseWritingRulesServiceImpl.java

@@ -1,14 +1,12 @@
 package apelet.common.botp.service.impl;
 
 
+import apelet.common.botp.dao.ConvertPluginEntryMapper;
 import apelet.common.botp.dao.ReverseWritingRulesMapper;
 import apelet.common.botp.dao.ReverseWritingRulesVerMapper;
 import apelet.common.botp.dto.ReverseWritingRulesDto;
 import apelet.common.botp.dto.RuleVersionDiffDto;
-import apelet.common.botp.model.ReverseWritingBusiness;
+import apelet.common.botp.model.*;
-import apelet.common.botp.model.ReverseWritingFormula;
-import apelet.common.botp.model.ReverseWritingRules;
-import apelet.common.botp.model.ReverseWritingRulesVer;
 import apelet.common.botp.service.IReverseWritingBusinessService;
 import apelet.common.botp.service.IReverseWritingFormulaService;
 import apelet.common.botp.service.IReverseWritingRulesService;
@@ -25,12 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -45,6 +38,8 @@ public class ReverseWritingRulesServiceImpl extends ServiceImpl<ReverseWritingRu
     ReverseWritingRulesMapper reverseWritingRulesMapper;
     @Autowired
     ReverseWritingRulesVerMapper reverseWritingRulesVerMapper;
+    @Autowired
+    ConvertPluginEntryMapper convertPluginEntryMapper;
 
 
 
@@ -59,11 +54,13 @@ public class ReverseWritingRulesServiceImpl extends ServiceImpl<ReverseWritingRu
         }
         List<ReverseWritingBusiness> businessesList = businessService.list(new LambdaQueryWrapper<ReverseWritingBusiness>().in(ReverseWritingBusiness::getRulesId, ids));
         List<ReverseWritingFormula> formulaList = formulaService.list(new LambdaQueryWrapper<ReverseWritingFormula>().in(ReverseWritingFormula::getRulesId, ids));
+        List<ConvertPluginEntry> convertPluginEntryList = convertPluginEntryMapper.selectList(new LambdaQueryWrapper<ConvertPluginEntry>().in(ConvertPluginEntry::getParentId, ids));
         list.forEach(f -> {
             ReverseWritingRulesDto dto = new ReverseWritingRulesDto();
             BeanUtils.copyProperties(f, dto);
             dto.setBusinessList(businessesList.stream().filter(b -> b.getRulesId().equals(f.getId())).collect(Collectors.toList()));
             dto.setFormulaList(formulaList.stream().filter(b -> b.getRulesId().equals(f.getId())).collect(Collectors.toList()));
+            dto.setConvertPluginEntryList(convertPluginEntryList.stream().filter(b -> b.getParentId().equals(f.getId().toString())).collect(Collectors.toList()));
             dtoList.add(dto);
         });
         return dtoList;
@@ -105,6 +102,7 @@ public class ReverseWritingRulesServiceImpl extends ServiceImpl<ReverseWritingRu
             // 分录按规则id全量覆盖
             formulaService.remove(new LambdaQueryWrapper<ReverseWritingFormula>().eq(ReverseWritingFormula::getRulesId, reverseWritingRules.getId()));
             businessService.remove(new LambdaQueryWrapper<ReverseWritingBusiness>().eq(ReverseWritingBusiness::getRulesId, reverseWritingRules.getId()));
+            convertPluginEntryMapper.delete(new LambdaQueryWrapper<ConvertPluginEntry>().eq(ConvertPluginEntry::getParentId, reverseWritingRules.getId().toString()));
             remark = RuleSnapshotUtil.REMARK_UPDATE;
             snapshotVersion = RuleVersionUtil.next(baseVersion);
         } else {
@@ -130,6 +128,14 @@ public class ReverseWritingRulesServiceImpl extends ServiceImpl<ReverseWritingRu
             businessList.forEach(f -> f.setRulesId(reverseWritingRules.getId()));
             businessService.saveBatch(businessList);
         }
+        List<ConvertPluginEntry> convertPluginEntryList = dto.getConvertPluginEntryList();
+        if (ObjectUtil.isNotEmpty(convertPluginEntryList)) {
+            convertPluginEntryList.forEach(f -> {
+                f.setParentId(reverseWritingRules.getId().toString());
+                convertPluginEntryMapper.insert(f);
+            });
+
+        }
         // 落全量快照
         saveSnapshot(reverseWritingRules.getId(), snapshotVersion, remark);
         return reverseWritingRules;