试验bug

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -872,6 +872,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String selfSubmit(TrialSelfInspectionRecordDTO dto) {
         //------初始当前填报的表pKeyIds------
         this.initTrialTabIds(dto);

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -1807,7 +1807,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         if (type.equals("1")) {
             TableInfo tableInfo = tableInfoService.getById(tabId);
             WbsTree wbsTree = wbsTreeMapper.selectById(linkids);
-            wbsTree.setInitTableName(tableInfo.getTabChName());
+            //wbsTree.setInitTableName(tableInfo.getTabChName());
+            wbsTree.setInitTableName(tableInfo.getTabEnName());
             wbsTree.setInitTableId(tableInfo.getId());
             wbsTree.setFillRate(tableInfo.getFillRate());
             wbsTree.setTableOwner(tableInfo.getTableOwner());
@@ -1896,9 +1897,9 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         String roleAndTabOwner = roleAndTabOwners.stream().filter(("7")::equals).findAny().orElse(null);
         if (StringUtils.isNotEmpty(roleAndTabOwner)) {
             //试验tabOwner=7，默认加载全部tabOwner=7的表
-            if ("1".equals(tableType)) {
+            if ("1".equals(tableType) || "9".equals(tableType)) {
                 tableType = "1,9"; //记录表
-            } else if ("2".equals(tableType)) {
+            } else if ("2".equals(tableType) || "10".equals(tableType)) {
                 tableType = "2,10";  //报告单
             }
             return baseMapper.selectWbsTreeTrialTabList(tableType, wbsTreePrivate.getProjectId(), wbsTreePrivate.getWbsId(), wbsTreePrivate.getId(), contractId);