排序

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVDataServiceImpl.java

@@ -344,7 +344,7 @@ public class EVDataServiceImpl implements EVDataService {
                     updateSql = "update u_contract_log set e_visa_pdf_url='" + taskApp.getLastFilePdfUrl() + "',status='" + taskApp.getSigType() + "',update_time=SYSDATE() where id='" + taskApp.getFormDataId() + "' ";
                 } else if (taskApp.getApprovalType() == 5) { //中期计量支付证书
                     // 获取s_interim_pay_certificate 的原始数据
-                    taskApp.getPagePdfUrl()
+                    //taskApp.getPagePdfUrl()
 
 
                     updateSql = "update s_interim_pay_certificate set approve_status=" + taskApp.getSigType() + ",update_time=SYSDATE(), raw_url='" + taskApp.getLastFilePdfUrl() + "' where contract_period_id = " + taskApp.getFormDataId();

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

@@ -191,7 +191,6 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             option(tec);
             /*评定表*/
             assessmentForm(tec);
-
         }
         return this;
     }
@@ -748,17 +747,17 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     }
 
                     // 原来业务逻辑
-          /*         String queryAllTabs =  "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" +
-                            " join m_wbs_tree_contract c on c.parent_id = k.id " +
+                   String queryAllTabs =  "select c.init_table_name tableName,c.p_key_id pkId,c.html_url url,c.p_id,type from" +
+                            " (select p_key_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" +
+                            " join m_wbs_tree_contract c on c.p_id = k.p_key_id " +
                             "where  c.contract_id=" + currentNode.getContractId() + " and c.is_deleted=0 " ;
-                    List<Map<String, Object>> tableNamePkIdsMaps = this.jdbcTemplate.queryForList(queryAllTabs);*/
+                    List<Map<String, Object>> tableNamePkIdsMaps = this.jdbcTemplate.queryForList(queryAllTabs);
 
-                    String contSql = "SELECT c.init_table_name tableName,c.p_key_id pkId,c.html_url url,c.p_id from m_wbs_tree_contract where is_deleted=0 and ancestors_p_id like '%"+parent.getPId()+"%' and contract_id ="+parent.getContractId()+"  ORDER BY sort ,full_name,create_time ";
-                    List<Map<String, Object>> tableNamePkIdsMaps = this.jdbcTemplate.queryForList(contSql);
+                 ///   String contSql = "SELECT init_table_name tableName,p_key_id pkId,html_url url,p_id,type from m_wbs_tree_contract where is_deleted=0 and node_type=6 and ancestors_p_id like '%"+parent.getPId()+"%' and contract_id ="+parent.getContractId()+"  ORDER BY sort ,full_name,create_time ";
+                  //  List<Map<String, Object>> allTable = this.jdbcTemplate.queryForList(queryAllTabs);
                     // 对查询的表单进行排序 优先以树节点，表单名称，数字，顺序
-                    List<Map<String, Object>> conNode= getAllChildNodesWithStreamByMaps(parent.getPId()+"",tableNamePkIdsMaps);
-
+                 //   List<Map<String, Object>> conNode= getAllChildNodesWithStreamByMaps(parent.getPId()+"",allTable);
+                  //  List<Map<String, Object>> tableNamePkIdsMaps = conNode.stream().filter(e->(e.get("type")+"").equals("2")).collect(Collectors.toList());
                     if (Func.isNotEmpty(tableNamePkIdsMaps)) {
                         // removeList.clear();
                         missingList.forEach(miss -> {

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -4963,7 +4963,7 @@ public class TaskController extends BladeController {
 
             //由于之前需求每400 进行分割，现在需求需要根据类型+页码 分页
             if(this.type==0) {
-                jdbcTemplate.execute("delete from s_interim_task where task_id='"+id+"'");
+                jdbcTemplate.execute("delete from s_interim_task where data_id='"+id+"'");
                 String addTaskInfoSql = "";
                 for (Map.Entry<String, String> entry : fileListMap.entrySet()) {
                     long newPkId = SnowFlakeUtil.getId();
@@ -4974,7 +4974,7 @@ public class TaskController extends BladeController {
                         pageNum= Integer.parseInt(result);
                     }
                     if(pageNum<=100){
-                        addTaskInfoSql +="insert into s_interim_task(id,task_id,status,pdf_url,pdf_e_url,name) VALUES("+newPkId+","+this.id+",0,'"+pdfUrl+"','','"+entry.getKey()+"');";
+                        addTaskInfoSql +="insert into s_interim_task(id,data_id,status,pdf_url,pdf_e_url,name) VALUES("+newPkId+","+this.id+",0,'"+pdfUrl+"','','"+entry.getKey()+"');";
                     }else{
                          Double pdfPageNo = Math.ceil(pageNum / 100.00);
                          for (int i=0;i<pdfPageNo;i++){
@@ -4995,7 +4995,7 @@ public class TaskController extends BladeController {
                                  BladeFile bladeFile1 = newIOSSClient.uploadFile( SnowFlakeUtil.get() + ".pdf", localPdf);
                                  String pagePdfUrl=bladeFile1.getLink();
                                  String titleName = entry.getKey()+""+(i+1);
-                                 addTaskInfoSql +="insert into s_interim_task(id,task_id,status,pdf_url,pdf_e_url,name) VALUES("+newPkId+","+this.id+",0,'"+pagePdfUrl+"','','"+titleName+"');";
+                                 addTaskInfoSql +="insert into s_interim_task(id,data_id,status,pdf_url,pdf_e_url,name) VALUES("+newPkId+","+this.id+",0,'"+pagePdfUrl+"','','"+titleName+"');";
                              }
                          }
                     }