Переглянути джерело

委托单 和number 编号问题

zhuwei 2 місяців тому
батько
коміт
7a620c426d

+ 2 - 2
blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDetectionController.java

@@ -294,12 +294,12 @@ public class TrialDetectionController extends BladeController {
     @ApiOperationSupport(order = 18)
     @ApiOperation(value = "自检多表PDF预览", notes = "传入nodeId=试验记录id、classify、contractId、projectId")
     public R<Object> getPDFs(String nodeId, String classify, String contractId, String projectId) throws FileNotFoundException {
-        String sql = "select pdf_url,e_visa_pdf_url from u_information_query where project_id ='" + projectId + "' and classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "'";
+        String sql = "select pdf_url,e_visa_pdf_url from u_information_query where status in(1,2) and project_id ='" + projectId + "' and classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "'";
         List<Map<String, Object>> maps = jdbcTemplate.queryForList(sql);
         if (maps.size() >= 1) {
             Map<String, Object> stringObjectMap = maps.get(0);
             Object pdfUrl = stringObjectMap.get("pdf_url");
-            if (stringObjectMap.get("e_visa_pdf_url") != null) {
+            if (stringObjectMap.get("e_visa_pdf_url") != null ) {
                 //优先使用电签的pdf
                 pdfUrl = stringObjectMap.get("e_visa_pdf_url");
             }

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -3257,14 +3257,14 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             //报告编号
             if (bgHB.size() >= 1 && StringUtils.isNotEmpty(dto.getReportNo())) {
                 for (Element element : bgHB) {
-                    DataInfo.put(element.attr("keyname"), "NUMBER-" + dto.getReportNo());
+                   // DataInfo.put(element.attr("keyname"), "NUMBER-" + dto.getReportNo());
                     break;
                 }
             }
             //记录编号
             if (jlBH.size() >= 1 && StringUtils.isNotEmpty(dto.getRecordNo())) {
                 for (Element element : jlBH) {
-                    DataInfo.put(element.attr("keyname"), "NUMBER-" + dto.getRecordNo());
+                   // DataInfo.put(element.attr("keyname"), "NUMBER-" + dto.getRecordNo());
                     break;
                 }
             }