Merge remote-tracking branch 'origin/master'

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckServiceImpl.java

@@ -744,28 +744,35 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                     builder.getFont().setSize(15);
                     // 插入表头
                     builder.insertCell();
-                    builder.getCellFormat().setWidth(60);
+                    builder.getCellFormat().setWidth(40);
                     builder.getRowFormat().setHeight(20);
                     builder.getRowFormat().setHeightRule(HeightRule.EXACTLY);//设置HeightRule
                     builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
                     buildTextContentTitle(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_6, 12, true,
                             "NO.", null);
                     builder.insertCell();
-                    builder.getCellFormat().setWidth(200);
+                    builder.getCellFormat().setWidth(170);
                     builder.getRowFormat().setHeight(20);
                     builder.getRowFormat().setHeightRule(HeightRule.EXACTLY);//设置HeightRule
                     builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
                     buildTextContentTitle(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_6, 12, true,
                             "检查项目", null);
                     builder.insertCell();
-                    builder.getCellFormat().setWidth(60);
+                    builder.getCellFormat().setWidth(120);
+                    builder.getRowFormat().setHeight(20);
+                    builder.getRowFormat().setHeightRule(HeightRule.EXACTLY);//设置HeightRule
+                    builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
+                    buildTextContentTitle(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_6, 12, true,
+                            "测试地点", null);
+                    builder.insertCell();
+                    builder.getCellFormat().setWidth(40);
                     builder.getRowFormat().setHeight(20);
                     builder.getRowFormat().setHeightRule(HeightRule.EXACTLY);//设置HeightRule
                     builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
                     buildTextContentTitle(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_6, 12, true,
                             "结果", null);
                     builder.insertCell();
-                    builder.getCellFormat().setWidth(150);
+                    builder.getCellFormat().setWidth(100);
                     builder.getRowFormat().setHeight(20);
                     builder.getRowFormat().setHeightRule(HeightRule.EXACTLY);//设置HeightRule
                     builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
@@ -775,13 +782,15 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                     for (ZhcxCommissionCheckDetailDo detailWordVO:res.getDetailList()){
                         // 插入表格的第一行
                         builder.insertCell();
-                        builder.getCellFormat().setWidth(60);
+                        builder.getCellFormat().setWidth(40);
                         builder.getRowFormat().setHeightRule(HeightRule.AUTO);//设置HeightRule
                         builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
+                        // 取的应该是新的章节号 detailWordVO.getChapterno
                         buildTextContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_7, 11, false,
-                                detailWordVO.getChapterno(), null);
+                                detailWordVO.getChapternopuls(), null);
+
                         builder.insertCell();
-                        builder.getCellFormat().setWidth(200);
+                        builder.getCellFormat().setWidth(170);
                         builder.getRowFormat().setHeightRule(HeightRule.AUTO);//设置HeightRule
                         builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
                         String chtestcontent = "";
@@ -794,8 +803,23 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                         }
                         buildTextContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_7, 11, false,
                                 chtestcontent+entestcontent, null);
+
+                        builder.insertCell();
+                        builder.getCellFormat().setWidth(120);
+                        builder.getRowFormat().setHeightRule(HeightRule.AUTO);//设置HeightRule
+                        builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
+                        String testaddress = "CX BASE长兴基地";
+                        if (StringUtils.isNotBlank(detailWordVO.getTestaddress())){
+                            // 10-> CX BASE长兴基地  20-> USER SITE码头现场
+                            if(detailWordVO.getTestaddress().equals("20")){
+                                testaddress = "USER SITE码头现场";
+                            }
+                        }
+                        buildTextContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_7, 11, false,
+                                testaddress, null);
+
                         builder.insertCell();
-                        builder.getCellFormat().setWidth(60);
+                        builder.getCellFormat().setWidth(40);
                         builder.getRowFormat().setHeightRule(HeightRule.AUTO);//设置HeightRule
                         builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
                         String testresult = "";
@@ -805,7 +829,7 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                         buildTextContent(builder, DEFAULT_FONT_NAME, StyleIdentifier.HEADING_7, 11, false,
                                 testresult, null);
                         builder.insertCell();
-                        builder.getCellFormat().setWidth(150);
+                        builder.getCellFormat().setWidth(100);
                         builder.getRowFormat().setHeightRule(HeightRule.AUTO);//设置HeightRule
                         builder.getCellFormat().setOrientation(TextOrientation.HORIZONTAL);
                         String testnotes = "";

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPMQMServiceImpl.java

@@ -209,7 +209,8 @@ public class ZhcxPMQMServiceImpl implements ZhcxPMQMService {
                 .map(map -> (String) map.get("PROJECT_CODE"))
                 .collect(Collectors.toSet());
         List<ZhcxPmqManagementRecoredDo> tempList1 = recoredDao.getMaxDatetime();
-        String maxTime = "2024-07-01 10:01:01";
+        //String maxTime = "2024-07-01 10:01:01";
+        String maxTime = "2024-11-11 00:01:01";
         if (!tempList1.isEmpty() && tempList1.get(0) != null && tempList1.get(0).getDistributetime() != null) {
             maxTime = DateFormatUtils.format(tempList1.get(0).getDistributetime(), "yyyy-MM-dd HH:mm:ss");
         }

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxPMQMController.java

@@ -47,8 +47,8 @@ public class ZhcxPMQMController {
 
     @PostMapping("/gnsd")
     public R getNxSystemData() {
-        List<ZhcxPmqManagementSourceDo> lsit = pmqmService.getNxSystemData();
-        return R.ok();
+        List<ZhcxPmqManagementSourceDo> list = pmqmService.getNxSystemData();
+        return R.ok(list);
     }
 
 }