评定汇总接口以及编辑标准分类单元名称

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -854,7 +854,8 @@ public class ExcelTabController extends BladeController {
         // 添加标题显示
         Elements trs = table.select("tr");
         //这句代码在正式环境要加上
-        if( Func.isNotEmpty(dataInfo)&& dataInfo.getTabType()!=100L) {
+
+        if( Func.isNotEmpty(dataInfo)&&dataInfo.getTabType()!=null&&dataInfo.getTabType()!=100L) {
             for (int i = 1; i < 6; i++) {
                 Element tr = trs.get(i);
                 Elements tds = tr.select("td");
@@ -4103,7 +4104,7 @@ public class ExcelTabController extends BladeController {
     }
 
 
-    @Scheduled(cron = "0/20 * * * * ?")
+    //@Scheduled(cron = "0/20 * * * * ?")
     public void HtmlCope() {
         //执行代码
         String sql = "SELECT * from m_wbs_tree_contract where p_key_id=1789131196718907437" ;

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

@@ -3456,7 +3456,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             List<WbsTreeContract> queryNodes = jdbcTemplate.query(queryNode, new BeanPropertyRowMapper<>(WbsTreeContract.class));
             if(queryNodes.size()>1){
                 for (WbsTreeContract node : queryNodes) {
-                    if(node.getNodeName().indexOf("分部工程施工质量评定表_")>=0){
+                    if(node.getNodeName().indexOf(wbsTreeContract1.getNodeName()+"_")>=0){
                         excelTabService.removeBussTabInfoById(node.getPKeyId().toString());
                     }
                 }
@@ -3552,8 +3552,10 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             if(list2.size()>0){
                 for (WbsTreeContract treeContract : list2) {
                     String tableInfoSql="SELECT id from m_table_info Where tab_en_name="+ "'"+treeContract.getInitTableName()+"'";
-                    Long id = jdbcTemplate.queryForObject(tableInfoSql, Long.class);
-                    if(ObjectUtil.isEmpty(id)){
+                    Long id =null;
+                    try {
+                       id=jdbcTemplate.queryForObject(tableInfoSql, Long.class);
+                    }catch (Exception e){
                         continue;
                     }
                     String elementSql="SELECT * from m_wbs_form_element where f_id="+id;
@@ -3614,11 +3616,9 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 }
             }
             try {
-                Document document = null;
                 InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(wbsTreeContract1.getHtmlUrl());
                 String htmlString = IoUtil.readToString(inputStreamByUrl);
                 Document doc = Jsoup.parse(htmlString);
-                document = doc;
                 Elements unitNames = doc.select("el-input[placeholder~=单元工程种类]");
                 Elements unitNums = doc.select("el-input[placeholder~=单元工程个数]");
                 Elements qualifiedNums = doc.select("el-input[placeholder~=合格个数]");