pdf为空

blade-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -214,7 +214,7 @@ public class CommonUtil {
                 if (!((date = bis.read()) != -1)) break;
                 os.write(date);
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                return new byte[0];
             }
         }
         return os.toByteArray();

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVController.java

@@ -64,7 +64,7 @@ public class EVController {
 
         log.info("扫描开始");
 
-        String sql = "SELECT GROUP_CONCAT(id) as id, JSON_UNQUOTE(JSON_EXTRACT(json_data, '$.taskId')) as taskId," +
+        String sql = " SELECT GROUP_CONCAT(id) as id, JSON_UNQUOTE(JSON_EXTRACT(json_data, '$.taskId')) as taskId," +
                 "GROUP_CONCAT(JSON_EXTRACT(json_data, '$.parallelProcessInstanceId')) as parallelProcessInstanceId," +
                 "JSON_UNQUOTE(JSON_EXTRACT(json_data, '$.formDataId')) as formDataId," +
                 "JSON_EXTRACT(json_data, '$.approvalType') as approvalType," +
@@ -74,7 +74,7 @@ public class EVController {
                 "sign_type as sigType ," +
                 "(select count(0) from u_task_parallel b INNER JOIN u_task c on b.process_instance_id = c.process_instance_id " +
                 "where c.id = JSON_UNQUOTE(JSON_EXTRACT(a.json_data, '$.taskId')) and b.is_deleted = 0 and (b.status = 1 or b.initiative = 1)) isSignature" +
-                " from u_task_batch a where is_deleted=0  GROUP BY JSON_EXTRACT(json_data, '$.formDataId'),sign_type ORDER BY sign_type DESC ";
+                " from u_task_batch a where is_deleted=0  GROUP BY JSON_EXTRACT(json_data, '$.formDataId'),sign_type ORDER BY sign_type DESC,update_time ASC ";
 
         List<TaskSignInfoVO> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(TaskSignInfoVO.class));
 

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

@@ -449,10 +449,11 @@ public class EVDataServiceImpl implements EVDataService {
                 //中间计量用逗号拼接pagePdfUrl
                 String pageUrl = map.get("page_pdf_url")+"";
                 if(StringUtils.isNotEmpty(pageUrl) && pageUrl.length()>=20 ) {
-                    pageUrl = pageUrl.replaceAll(" ", "");
+                    pdfUrl = pageUrl.replaceAll(" ", "");
                 }else{
                     pdfUrl=map.get("raw_url") + "";
                 }
+                pdfUrl=map.get("raw_url") + "";
                 taskApp.setSignPdfUrl(pdfUrl);
             } else if (taskApp.getApprovalType() == 6 || taskApp.getApprovalType() == 7) {
                 map = this.jdbcTemplate.queryForMap("select * from  s_material_start_statement where is_deleted=0 and meter_period_id = " + taskApp.getFormDataId());

blade-service/blade-meter/src/main/java/org/springblade/MeterApplication.java

@@ -16,5 +16,4 @@ public class MeterApplication {
     public static void main(String[] args) {
         BladeApplication.run(LauncherConstant.APPLICATION_METER_NAME, MeterApplication.class, args);
     }
-
 }

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

@@ -1319,7 +1319,8 @@ public class TaskController extends BladeController {
         /*获取用户信息Map*/
         Map<Long, String> nameMap = jdbcTemplate.query("select id,name from blade_user where is_deleted = 0", new BeanPropertyRowMapper<>(User.class)).stream().collect(Collectors.toMap(User::getId, User::getName, (key1, key2) -> key1));
         /*获取预设流程Map*/
-        Map<Long, String> flowMap = jdbcTemplate.query("select id,fixed_flow_name from u_fixed_flow where is_deleted = 0 and contract_id = "+dto.getContractId(), new BeanPropertyRowMapper<>(FixedFlow.class)).stream().collect(Collectors.toMap(FixedFlow::getId, FixedFlow::getFixedFlowName, (key1, key2) -> key1));
+       // Map<Long, String> flowMap = jdbcTemplate.query("select id,fixed_flow_name from u_fixed_flow where is_deleted = 0 and contract_id = "+dto.getContractId(), new BeanPropertyRowMapper<>(FixedFlow.class)).stream().collect(Collectors.toMap(FixedFlow::getId, FixedFlow::getFixedFlowName, (key1, key2) -> key1));
+        Map<Long, String> flowMap = jdbcTemplate.query("select id,fixed_flow_name from u_fixed_flow where is_deleted = 0 ", new BeanPropertyRowMapper<>(FixedFlow.class)).stream().collect(Collectors.toMap(FixedFlow::getId, FixedFlow::getFixedFlowName, (key1, key2) -> key1));
 
         //筛选出可审批的数据
          if(ObjectUtil.isNotEmpty(dto.getStatusValue()) && dto.getStatusValue() .equals(4) && ObjectUtil.isNotEmpty(resultList)){