全局字段

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictbins/DynamicTbInsServiceImpl.java

@@ -8,8 +8,10 @@ import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.DynamicTbIn
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.DynamicTbInsSaveReqVO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.InitInstanceVO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictb.DynamicTbDO;
+import cn.start.tz.module.pressure2.dal.dataobject.dynamictbcol.DynamicTbColDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbval.DynamicTbValDO;
+import cn.start.tz.module.pressure2.dal.mysql.dynamictbcol.DynamicTbColMapper;
 import cn.start.tz.module.pressure2.dal.mysql.dynamictbins.DynamicTbInsMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
@@ -32,6 +34,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static cn.start.tz.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.start.tz.module.pressure2.enums.ErrorCodeConstants.DYNAMIC_TB_INS_NOT_EXISTS;
@@ -64,6 +67,9 @@ public class DynamicTbInsServiceImpl extends ServiceImpl<DynamicTbInsMapper, Dyn
     @Resource
     private AutoDataPipeService autoDataPipeService;
 
+    @Resource
+    private DynamicTbColMapper dynamicTbColMapper;
+
     @Override
     public String createDynamicTbIns(DynamicTbInsSaveReqVO createReqVO) {
         // 插入
@@ -139,6 +145,11 @@ public class DynamicTbInsServiceImpl extends ServiceImpl<DynamicTbInsMapper, Dyn
         } else {
             ofData = findOFService.getOfDataByVO(ruleVO);
         }
+        List<DynamicTbColDO> dynamicTbColDOS = dynamicTbColMapper.selectList(DynamicTbColDO::getColRound, 2);
+        if (dynamicTbColDOS != null && !dynamicTbColDOS.isEmpty()) {
+            Map<String, String> collect = dynamicTbColDOS.stream().collect(Collectors.toMap(DynamicTbColDO::getColCode, DynamicTbColDO::getNote));
+            ofData.putAll(collect);
+        }
 
         // 将json的value非String转成字符串
         ofData = JsonConvertUtil.convertAllFieldsToString(ofData);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictbval/DynamicTbValServiceImpl.java

@@ -284,6 +284,7 @@ public class DynamicTbValServiceImpl extends ServiceImpl<DynamicTbValMapper, Dyn
 
         List<DynamicTbColDO> dynamicTbColDOS = dynamicTbColMapper.selectList(DynamicTbColDO::getTbId, dynamicTBInsDO.getTbId());
         dynamicTbColDOS.addAll(dynamicTbColMapper.selectList(DynamicTbColDO::getColRound, 3));
+        dynamicTbColDOS.addAll(dynamicTbColMapper.selectList(DynamicTbColDO::getColRound, 2));
 
         var listTbVal = this.lambdaQuery().eq(DynamicTbValDO::getInsId, dynamicTBInsDO.getId()).list();
         listTbVal = listTbVal.stream().filter(val -> StrUtil.isNotBlank(val.getValValue())).toList();

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/dynamictb/DynamicTbMapper.xml

@@ -14,7 +14,7 @@
         tc.col_name,tc.col_round,tc.col_code,tc.col_val_type,tc.note,
         (select max(tb1.version_no) from PRESSURE2_DYNAMIC_TB tb1 where tb1.tb_code=tb.tb_code) as version_max
         from PRESSURE2_DYNAMIC_TB tb INNER JOIN
-        PRESSURE2_DYNAMIC_TB_COL tc on tb.id=tc.TB_ID or tc.COL_ROUND = 3
+        PRESSURE2_DYNAMIC_TB_COL tc on tb.id=tc.TB_ID or tc.COL_ROUND = 3 or tc.COL_ROUND = 2
         where tc.deleted=0
         ) t
         <where>