回退代码

blade-service/blade-manager/src/main/java/org/springblade/manager/bean/TableInfo.java

@@ -28,7 +28,7 @@ public class TableInfo {
     // 用于实验
     private String testGroupId = "0";
     //清楚字段数据时 是否删除附表 0否 1是
-    private String isRemoveForSubTab;
+    //private String isRemoveForSubTab;
 
 
     /**

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

@@ -180,7 +180,7 @@ public class SubTable {
     /*获取最终输出的项目信息*/
     public List<Item> getPutOutList(){
         /*初始化group,保留原先内容，只做同KEY覆盖*/
-        //initOriginal();
+        initOriginal();
         List<Item> itemList = new ArrayList<>(group.values());
         if(this.mainList!=null){
             List<String> itemNameIndex = this.mainList.stream().map(e->FormulaUtils.parseItemName(e.getEName()).trim()).collect(Collectors.toList());

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

@@ -135,7 +135,7 @@ public class TableElementConverter implements ITableElementConverter {
     public Integer scale = 0;
     public Integer payRadicScale = 2;
     //清楚字段数据时 是否删除附表 0否 1是
-    private String isRemoveForSubTab;
+    //private String isRemoveForSubTab;
     /*计量属性*/
     /**根据表名获取对应表页对象*/
     public LinkedList<NodeTable> getTableByName(String initTableName){

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

@@ -376,7 +376,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 tableInfo.setProjectId(dataInfo2.getString("projectId"));
                 //huangjn 填报的类型，施工或监理
                 tableInfo.setClassify(dataInfo2.getString("classify"));
-                tableInfo.setIsRemoveForSubTab(dataInfo2.getString("isRemoveForSubTab"));
+                //tableInfo.setIsRemoveForSubTab(dataInfo2.getString("isRemoveForSubTab"));
                 //设置首件信息
                 this.setFirstData(dataInfo2, tableInfo);
                 //设置日志信息
@@ -484,7 +484,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
                 if (tableAll.size() > tableInfoList.size()) {
                     TableInfo example = tableInfoList.get(0);
-                    isRemoveForSubTab=example.getIsRemoveForSubTab();
+                    //isRemoveForSubTab=example.getIsRemoveForSubTab();
                     /*补充缺失的数据*/
                     List<Long> cp = tableInfoList.stream().map(TableInfo::getPkeyId).map(Long::parseLong).collect(Collectors.toList());
                     List<Long> load = tableAll.stream().map(NodeTable::getPKeyId).filter(pk -> !cp.contains(pk)).collect(Collectors.toList());
@@ -564,7 +564,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         tec.setExecuteType(type);
                         tec.setContractId(contractId);
                         tec.setProjectId(projectId);
-                        tec.setIsRemoveForSubTab(isRemoveForSubTab);
+                        //tec.setIsRemoveForSubTab(isRemoveForSubTab);
                         if (tec.isPresent()) {
                             tec.before();
                             this.formulaService.execute(tec);

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

@@ -1361,12 +1361,12 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                             });
                             if (ele.size() < relyList.size()) {
                                 tec.getLog().put(FormulaLog.RELY, fd.getCode() + "@" + fd.getEName() + "@" + fd.getFormula().getFormula().replaceAll("'", ""));
-                                fd.getValues().forEach(e->e.setValue(null));
-                                FormData formData = tec.getFormDataMap().get(fd.getCode());
-                                if(formData!=null){
-                                    formData.getValues().forEach(e->e.setValue(null));
-                                    formData.setUpdate(1);
-                                }
+//                                fd.getValues().forEach(e->e.setValue(null));
+//                                FormData formData = tec.getFormDataMap().get(fd.getCode());
+//                                if(formData!=null){
+//                                    formData.getValues().forEach(e->e.setValue(null));
+//                                    formData.setUpdate(1);
+//                                }
                                 continue;
                             }
                             if (fd.getCoordsList().size() > 1 && f.split("[/+\\-*]").length > 1) {
@@ -1952,20 +1952,21 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 /*把主表的表头表尾信息拷贝*/
                 headerFooterSub(subTableFds, tec);
                 /*如果识别到手填内容需要在附表写入数据后，更新评定关联数据*/
-            }else {
-                if(StringUtils.isNotEmpty(tec.getIsRemoveForSubTab())&&"1".equals(tec.getIsRemoveForSubTab())){
-                    List<NodeTable> subTabList = tec.getTableAll().stream().filter(e -> e.getNodeName().contains("附表") && (e.getTableType() == 1 || e.getTableType() == 5)).collect(Collectors.toList());
-                    if(!subTabList.isEmpty()){
-                        String queryIds = subTabList.stream().map(e -> e.getPKeyId() + "").collect(Collectors.joining(","));
-                        // 如果不是系统自动生成的附表，则不删除。
-                        List<Long> ids = jdbcTemplate.query("SELECT a.p_key_id from m_wbs_tree_contract a LEFT JOIN m_wbs_tree_private b on b.p_key_id = a.is_type_private_pid " +
-                                "where a.is_deleted = 0 and (b.p_key_id is null or (b.is_deleted = 0 and b.is_link_table = 2 and b.type = 10 )) and a.p_key_id in ( " + queryIds +")", new SingleColumnRowMapper<>(Long.class));
-                        if (!ids.isEmpty()) {
-                            this.wbsTreeContractMapper.deleteLogicByIds(ids);
-                        }
-                    }
-                }
             }
+//            else {
+//                if(StringUtils.isNotEmpty(tec.getIsRemoveForSubTab())&&"1".equals(tec.getIsRemoveForSubTab())){
+//                    List<NodeTable> subTabList = tec.getTableAll().stream().filter(e -> e.getNodeName().contains("附表") && (e.getTableType() == 1 || e.getTableType() == 5)).collect(Collectors.toList());
+//                    if(!subTabList.isEmpty()){
+//                        String queryIds = subTabList.stream().map(e -> e.getPKeyId() + "").collect(Collectors.joining(","));
+//                        // 如果不是系统自动生成的附表，则不删除。
+//                        List<Long> ids = jdbcTemplate.query("SELECT a.p_key_id from m_wbs_tree_contract a LEFT JOIN m_wbs_tree_private b on b.p_key_id = a.is_type_private_pid " +
+//                                "where a.is_deleted = 0 and (b.p_key_id is null or (b.is_deleted = 0 and b.is_link_table = 2 and b.type = 10 )) and a.p_key_id in ( " + queryIds +")", new SingleColumnRowMapper<>(Long.class));
+//                        if (!ids.isEmpty()) {
+//                            this.wbsTreeContractMapper.deleteLogicByIds(ids);
+//                        }
+//                    }
+//                }
+//            }
         } catch (Exception e) {
             e.printStackTrace();
         }