bug

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

@@ -180,7 +180,7 @@ public class TrialDetectionController extends BladeController {
     @ApiOperationSupport(order = 18)
     @ApiOperation(value = "自检多表PDF预览", notes = "传入nodeId、classify、contractId、projectId")
     public R<Object> getPDFs(String nodeId, String classify, String contractId, String projectId) {
-        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 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);

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -1108,7 +1108,7 @@ public class TrialSelfInspectionRecordServiceImpl
             throw new ServiceException("请选择一个类型");
         }
         if (ObjectUtil.isEmpty(dto.getNodeId())) {
-            throw new ServiceException("未获取到当前节点的pKeyId");
+            throw new ServiceException("未获取到当前节点信息");
         }
 
         //获取当前节点的合并的pdfURL
@@ -1123,23 +1123,31 @@ public class TrialSelfInspectionRecordServiceImpl
 
                 List<String> pdfList = new ArrayList<>();
 
-                if (StringUtils.isEmpty(informationQuery.getPdfTrialUrl())) {
-                    //如果PdfTrialUrl == null 说明是第一次关联
+                //TODO ------自检------
+                if (dto.getType().equals(1)) {
+                    //当前施工pdf
                     pdfList.add(informationQuery.getPdfUrl());
-                } else {
-                    //如果PdfTrialUrl != null 说明是第二次以上操作关联，那么就在之前的上面做增量，主要解决不同类型提交时的问题
-                    pdfList.add(informationQuery.getPdfTrialUrl());
-                }
 
-                if (dto.getType().equals(1)) { //自检
-                    //获取自检的对应的数据pdf
-                    List<TrialSelfInspectionRecord> trialSelfInspectionRecords = baseMapper.selectList(Wrappers.<TrialSelfInspectionRecord>lambdaQuery().in(TrialSelfInspectionRecord::getId, dto.getIds()));
+                    //自检pdf
+                    List<TrialSelfInspectionRecord> trialSelfInspectionRecords = baseMapper.selectList(Wrappers.<TrialSelfInspectionRecord>lambdaQuery()
+                            .select(TrialSelfInspectionRecord::getPdfUrl)
+                            .in(TrialSelfInspectionRecord::getId, Func.toLongList(dto.getIds())));
                     List<String> pdfURLs = trialSelfInspectionRecords.stream().map(TrialSelfInspectionRecord::getPdfUrl).collect(Collectors.toList());
                     pdfList.addAll(pdfURLs);
 
-                } else if (dto.getType().equals(2) || dto.getType().equals(3)) { //第三方、外委
-                    //获取第三方、外委的对应的数据pdf
-                    List<TrialDetectionData> trialDetectionData = trialDetectionDataService.getBaseMapper().selectList(Wrappers.<TrialDetectionData>lambdaQuery().in(TrialDetectionData::getId, dto.getIds()));
+                    //TODO ------第三方、外委------
+                } else if (dto.getType().equals(2) || dto.getType().equals(3)) {
+
+                    if (informationQuery.getPdfTrialUrl() != null) {
+                        //如果当前存在自检pdf，那么拼接
+                        pdfList.add(informationQuery.getPdfTrialUrl());
+                    } else {
+                        //当前施工pdf
+                        pdfList.add(informationQuery.getPdfUrl());
+                    }
+
+                    //第三方、外委pdf
+                    List<TrialDetectionData> trialDetectionData = trialDetectionDataService.getBaseMapper().selectList(Wrappers.<TrialDetectionData>lambdaQuery().in(TrialDetectionData::getId, Func.toLongList(dto.getIds())));
                     List<String> pdfURLs = new ArrayList<>();
                     for (TrialDetectionData trialDetectionDatum : trialDetectionData) {
                         if (StringUtils.isNotEmpty(trialDetectionDatum.getRecordTableUrl())) {
@@ -1168,9 +1176,7 @@ public class TrialSelfInspectionRecordServiceImpl
                         //修改当前节点的pdfTrialURL地址
                         if (informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getPdfTrialUrl, bladeFile.getLink()).eq(InformationQuery::getId, informationQuery.getId()))) {
                             for (String recordId : Func.toStrList(dto.getIds())) {
-                                //修改选中状态记录信息(选中为勾选绿色)
                                 baseMapper.deleteSeletedStatusByNodeId(dto.getNodeId(), dto.getType(), recordId); //先删除对应记录
-
                                 baseMapper.insertSeletedStatus(SnowFlakeUtil.getId(), dto.getNodeId(), dto.getType(), recordId); //新增该类型选中的记录信息
                             }
                             return true;
@@ -1216,6 +1222,7 @@ public class TrialSelfInspectionRecordServiceImpl
                     //合并pdf把试验自检记录、第三方、外委的pdf追加到当前质检合同段树节点下的pdf后显示
                     List<String> collect = pdfList.stream().filter(Objects::nonNull).collect(Collectors.toList());
                     String filePath = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+                    assert informationQuery != null;
                     String listPdf = filePath + "/pdf/" + informationQuery.getId() + ".pdf";
                     File tabPDF = ResourceUtil.getFile(listPdf);
                     if (tabPDF.exists()) {
@@ -1227,9 +1234,7 @@ public class TrialSelfInspectionRecordServiceImpl
                         //修改当前节点的pdfTrialURL地址
                         if (informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getPdfTrialUrl, bladeFile.getLink()).eq(InformationQuery::getId, informationQuery.getId()))) {
                             for (String recordId : recordIds) {
-                                //修改选中状态记录信息(选中为勾选绿色)
                                 baseMapper.deleteSeletedStatusByNodeId(dto.getNodeId(), dto.getType(), recordId); //先删除对应记录
-
                                 baseMapper.insertSeletedStatus(SnowFlakeUtil.getId(), dto.getNodeId(), dto.getType(), recordId); //新增该类型选中的记录信息
                             }
                             return true;
@@ -1239,6 +1244,7 @@ public class TrialSelfInspectionRecordServiceImpl
 
             } else {
                 //修改pdfTrialUrl=null
+                assert informationQuery != null;
                 informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getPdfTrialUrl, null).eq(InformationQuery::getId, informationQuery.getId()));
             }
             //删除该类型的所有记录信息

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

@@ -1620,7 +1620,35 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                     x1 = 1;
                                 }
                                 String myData = DataInfo.get(val) + "";
-                                if (myData.contains("T") && myData.contains("-")) {
+
+                                if (myData.contains("T") && myData.contains("-") && myData.contains(":")) {
+                                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+                                    sdf.setTimeZone(TimeZone.getTimeZone("GTM+8"));
+                                    SimpleDateFormat formatStr = new SimpleDateFormat("yyyy年MM月dd日");
+                                    if (myData.contains(",") && myData.contains("]")) {
+                                        myData = myData.replace("[", "").replace("]", "").replaceAll("'", "");
+                                        String[] dataVal = myData.split(",");
+
+                                        Date Start_dataStr = sdf.parse(dataVal[0]);
+                                        Date end_dataStr = sdf.parse(dataVal[1]);
+                                        String StartDate = formatStr.format(Start_dataStr);
+                                        String endDate = formatStr.format(end_dataStr);
+                                        if (StartDate.equals(endDate)) {
+                                            myData = StartDate;
+                                        } else {
+                                            myData = StartDate + "-" + endDate;
+                                        }
+                                    } else {
+                                        String[] dataStr = myData.split("T")[0].split("-");
+                                        myData = StringUtil.format("{}年{}月{}日", dataStr[0], dataStr[1], Integer.parseInt(dataStr[2]) + 1);
+                                    }
+                                }
+
+                                /*if (myData.contains("T") && myData.contains("-") && myData.contains(":")) {
+                                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+                                    sdf.setTimeZone(TimeZone.getTimeZone("GTM+8"));
+                                    SimpleDateFormat formatStr = new SimpleDateFormat("yyyy年MM月dd日");
+
                                     if (myData.contains(",") && myData.contains("]")) {
                                         myData = myData.replace("[", "").replace("]", "").replaceAll("'", "");
                                         String[] dataVal = myData.split(",");
@@ -1628,6 +1656,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                         String StartDate = StringUtil.format("{}年{}月{}日", Start_dataStr[0], Start_dataStr[1], Integer.parseInt(Start_dataStr[2]) + 1).trim();
 
                                         String[] end_dataStr = dataVal[1].split("T")[0].split("-");
+
                                         String endDate = StringUtil.format("{}年{}月{}日", end_dataStr[0], end_dataStr[1], Integer.parseInt(end_dataStr[2]) + 1).trim();
                                         if (StartDate.equals(endDate)) {
                                             myData = StartDate;
@@ -1638,7 +1667,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                         String[] dataStr = myData.split("T")[0].split("-");
                                         myData = StringUtil.format("{}年{}月{}日", dataStr[0], dataStr[1], Integer.parseInt(dataStr[2]) + 1);
                                     }
-                                }
+                                }*/
+
                                 if (myData.contains("https") && myData.contains("aliyuncs")) {
                                     BufferedImage image = ImageIO.read(CommonUtil.getOSSInputStream(myData));
                                     int colspan = data.attr("COLSPAN").equals("") ? 0 : Integer.parseInt(data.attr("COLSPAN"));