计量 电签

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

@@ -179,7 +179,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
 
     @Override
     public IFormulaService init(TableElementConverter tec) {
-        /*基础数据*/
+        /*基础数据 --本表相关的字段 和key 对应 关系 以及 数据*/
         baseData(tec);
         if (ExecuteType.INSPECTION.equals(tec.getExecuteType())) {
             /*依赖加载*/
@@ -216,7 +216,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         }
     }
 
-
+    //加载基本数据
     public void baseData(TableElementConverter tec) {
         /*List<FormData> list =this.tec.getFds();*/
         CurrentNode one = tec.getCurrentNode();
@@ -720,7 +720,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         );
     }
 
-
+    // 根据合同段查询表 表查询数据库中的数据
     public void missingFill(List<String> missingList, TableElementConverter tec) {
         try {
             /*数据池里面没有任何元素匹配和当前依赖匹配*/
@@ -739,7 +739,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     }
                     List<Map<String, Object>> tableNamePkIdsMaps = this.jdbcTemplate.queryForList(
                             "select c.init_table_name tableName,c.p_key_id pkId,c.html_url url,c.p_id from" +
-                                    " (select id from m_wbs_tree_contract where contract_id=" + currentNode.getContractId() + " and is_deleted=0 and node_type=6 and tree_code like '" + parent.getTreeCode() + "%' ORDER BY sort) k" +
+                                    " (select id from m_wbs_tree_contract where contract_id=" + currentNode.getContractId() + " and is_deleted=0 and node_type=6 and tree_code like '" + parent.getTreeCode() + "%' ORDER BY tree_code,sort) k" +
                                     " join m_wbs_tree_contract c on c.parent_id = k.id " +
                                     "where  c.contract_id=" + currentNode.getContractId() + " and c.is_deleted=0 "
                     );