数据

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

@@ -106,8 +106,6 @@ public class EVDataServiceImpl implements EVDataService {
             if (taskApp.getRemarkType().equals("1")) { //安心签
                 //添加电签策略
                 List<SealStrategyVO> strategyListByAXQ = getStrategyListByAXQ(taskApp, ids);
-
-
                 ids = ids.replaceAll("\\✹", "");
                 if (strategyListByAXQ == null || Func.isEmpty(strategyListByAXQ) || strategyListByAXQ.size() == 0) {
                     ids = ids.replaceAll("✹", "");

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreePrivateService.java

@@ -116,4 +116,5 @@ public interface IWbsTreePrivateService extends BaseService<WbsTreePrivate> {
     List<ArchiveSyncLogVO> getContractAllLogMonthPack(Long contractId);
 
     List<Long> getContractAllLogWbsNodeIds(Long contractId);
+
 }

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

@@ -4963,41 +4963,42 @@ 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();
+
                     String pdfUrl = entry.getValue();
                     String result = commonFileClient.getPdfNum(pdfUrl);
                     Integer pageNum=0;
                     if(StringUtils.isNotEmpty(result)){
                         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()+"');";
+                    if(pageNum<=300){
+                        long newPkId = SnowFlakeUtil.getId();
+                        addTaskInfoSql +="insert into s_interim_task(id,data_id,status,pdf_url,pdf_e_url,name,create_time) VALUES("+newPkId+","+this.id+",0,'"+pdfUrl+"','','"+entry.getKey()+"',SYSDATE());";
                     }else{
-                         Double pdfPageNo = Math.ceil(pageNum / 100.00);
-                         for (int i=0;i<pdfPageNo;i++){
-                             newPkId = SnowFlakeUtil.getId();
-                             Long id = SnowFlakeUtil.getId();
-                             String localPdf = FileUtils.getSysLocalFileUrl() + "/pdf/" + id + ".pdf";
-                             int pageStart = 0 ;
-                             int pageEnd = 0 ;
-                             if(i<pdfPageNo-1){
-                                 pageStart = 100 * i;
-                                 pageEnd = 100 * (i+1);
-                             }else{
-                                 pageStart = 100 * i;
-                                 pageEnd = pageNum;
-                             }
-                             int pdfByPage = this.getPdfByPage(pageStart, pageEnd, pdfUrl, localPdf);
-                             if(pdfByPage==0){
-                                 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+"');";
-                             }
-                         }
+                        Double pdfPageNo = Math.ceil(pageNum / 300.00);
+                        for (int i=0;i<pdfPageNo;i++){
+                            long  newPkId = SnowFlakeUtil.getId();
+                            Long id = SnowFlakeUtil.getId();
+                            String localPdf = FileUtils.getSysLocalFileUrl() + "/pdf/" + id + ".pdf";
+                            int pageStart = 0 ;
+                            int pageEnd = 0 ;
+                            if(i<pdfPageNo-1){
+                                pageStart = 300 * i;
+                                pageEnd = 300 * (i+1);
+                            }else{
+                                pageStart = 300 * i;
+                                pageEnd = pageNum;
+                            }
+                            int pdfByPage = this.getPdfByPage(pageStart, pageEnd, pdfUrl, localPdf);
+                            if(pdfByPage==0){
+                                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,data_id,status,pdf_url,pdf_e_url,name,create_time) VALUES("+newPkId+","+this.id+",0,'"+pagePdfUrl+"','','"+titleName+"',SYSDATE());";
+                            }
+                        }
                     }
                 }
                 jdbcTemplate.batchUpdate(addTaskInfoSql);