From 1140e9733fa4ee5a0e367980d03d91a7d507b607 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 10 Sep 2024 13:06:27 +0800
Subject: [PATCH] =?UTF-8?q?app=E6=94=B6=E6=A0=B7=E6=96=B0=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aqgqj/app/dao/ExperimentalAppMapper.java  |  9 +++
 .../impl/ExperimentalAppServiceImpl.java      | 10 +++-
 .../java/com/bonus/aqgqj/utils/WordUtils.java |  5 +-
 .../mappers/app/ExperimentalAppMapper.xml     | 56 ++++++++++++-------
 4 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/bonus/aqgqj/app/dao/ExperimentalAppMapper.java b/src/main/java/com/bonus/aqgqj/app/dao/ExperimentalAppMapper.java
index 7a09a2a..c13834c 100644
--- a/src/main/java/com/bonus/aqgqj/app/dao/ExperimentalAppMapper.java
+++ b/src/main/java/com/bonus/aqgqj/app/dao/ExperimentalAppMapper.java
@@ -471,4 +471,13 @@ public interface ExperimentalAppMapper {
      * @return int
      */
     Integer getNotFilledDevs(Long sampleId);
+
+    /**
+     * 查询新增的试验设备
+     * @param dto
+     * @return List<ExperDevVo>
+     * @author cwchen
+     * @date 2024/9/4 9:07
+     */
+    List<ExperDevAppVo> getLsExperDevs(ParamsAppDto dto);
 }
diff --git a/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java b/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java
index 5f4c319..f8cbc4e 100644
--- a/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/app/service/impl/ExperimentalAppServiceImpl.java
@@ -327,7 +327,15 @@ public class ExperimentalAppServiceImpl implements ExperimentalAppService {
                 List<ConfigItemAppVo> configItemVos = mapper.getExperItem(configItemsVo.getId());
                 configItemsVo.setItemList(configItemVos);
             }
-            List<ExperDevAppVo> experDevVos = mapper.getExperDev(dto);
+            List<ExperDevAppVo> experDevVos = new ArrayList<>();
+            experDevVos = mapper.getExperDev(dto);
+            // 查询新增的试验设备信息
+            dto.setSampleId(testAppVo.getSampleId());
+            dto.setDevTypeCode(testAppVo.getDevTypeCode());
+            List<ExperDevAppVo> lsExperDevs = mapper.getLsExperDevs(dto);
+            if(CollectionUtils.isNotEmpty(lsExperDevs)){
+                experDevVos.addAll(lsExperDevs);
+            }
             testAppVo.setMainDeviceVos(configMainDevVos);
             testAppVo.setBasisVos(experBasisVos);
             testAppVo.setConfigItemsVos(configItemsVos);
diff --git a/src/main/java/com/bonus/aqgqj/utils/WordUtils.java b/src/main/java/com/bonus/aqgqj/utils/WordUtils.java
index 4ea70e2..87b1cc9 100644
--- a/src/main/java/com/bonus/aqgqj/utils/WordUtils.java
+++ b/src/main/java/com/bonus/aqgqj/utils/WordUtils.java
@@ -96,7 +96,7 @@ public class WordUtils {
     }
 
     private static String createDocApp(Map<?, ?> dataMap, Template template,String batchCode) {
-        String fileName = batchCode+"_委托书.doc";
+        String fileName = batchCode+"_委托书.docx";
         File f = new File(SystemUtils.getUploadPath()+ fileName);
         if (!f.getParentFile().exists()){
             f.getParentFile().mkdirs();
@@ -107,9 +107,6 @@ public class WordUtils {
             template.process(dataMap, w);
             w.close();
 
-            // 这里可以保留文件，或者根据需要在方法结束时删除
-            // 例如，如果你确定不再需要这个文件，可以调用 FileUtils.deleteQuietly(f);
-
             return fileName;
         } catch (Exception ex) {
             ex.printStackTrace();
diff --git a/src/main/resources/mappers/app/ExperimentalAppMapper.xml b/src/main/resources/mappers/app/ExperimentalAppMapper.xml
index c472111..0d719c0 100644
--- a/src/main/resources/mappers/app/ExperimentalAppMapper.xml
+++ b/src/main/resources/mappers/app/ExperimentalAppMapper.xml
@@ -427,29 +427,31 @@
     <!--试验数据详情-->
     <select id="viewTestData" resultType="com.bonus.aqgqj.app.entity.TestAppVo">
         SELECT te.id,
-               te.sample_id AS sampleId,
-               te.dev_type_code AS devTypeCode,
-               te.dev_type_name AS devTypeName,
-               te.dev_num AS sampleQuantity,
-               te.dev_module AS devModule,
-               te.sample_date AS sampleDate,
-               DATE_FORMAT(te.exper_time, '%Y-%m-%d') AS experTime,
+               te.sample_id                                AS sampleId,
+               te.dev_type_code                            AS devTypeCode,
+               te.dev_type_name                            AS devTypeName,
+               te.dev_num                                  AS sampleQuantity,
+               te.dev_module                               AS devModule,
+               te.sample_date                              AS sampleDate,
+               DATE_FORMAT(te.exper_time, '%Y-%m-%d')      AS experTime,
                DATE_FORMAT(te.next_exper_time, '%Y-%m-%d') AS nextExperTime,
-               te.submit_unit AS customId,
-               tc.custom_name AS customName,
-               te.submit_location AS experLocal,
-               te.exper_dev AS experDev,
-               te.exper_module AS experModule,
-               te.exper_code AS experCode,
-               DATE_FORMAT(te.check_time, '%Y-%m-%d') AS checkTime,
-               te.exper_stand AS experStand,
-               te.exper_conclu AS experConclu,
-               te.remarsk AS remarsk,
-               su.user_name AS experUserName,
-               te.audit_user_name AS auditUserName
+               te.submit_unit                              AS customId,
+               tc.custom_name                              AS customName,
+               te.submit_location                          AS experLocal,
+               te.exper_dev                                AS experDev,
+               te.exper_module                             AS experModule,
+               te.exper_code                               AS experCode,
+               DATE_FORMAT(te.check_time, '%Y-%m-%d')      AS checkTime,
+               te.exper_stand                              AS experStand,
+               te.exper_conclu                             AS experConclu,
+               te.remarsk                                  AS remarsk,
+               su.user_name                                AS experUserName,
+               te.audit_user_name                          AS auditUserName,
+               tsc.times                                   as cycle
         FROM tb_exper te
-        LEFT JOIN tb_custom tc ON te.submit_unit = tc.id AND tc.del_flag = 0
-        LEFT JOIN sys_user su ON te.update_user = su.id AND su.del_flag = 0
+                 LEFT JOIN tb_exper_config tsc ON tsc.dev_type_code = te.dev_type_code AND tsc.del_flag = 0
+                 LEFT JOIN tb_custom tc ON te.submit_unit = tc.id AND tc.del_flag = 0
+                 LEFT JOIN sys_user su ON te.update_user = su.id AND su.del_flag = 0
         WHERE te.id = #{id}
     </select>
     <!--试验依据信息-->
@@ -641,4 +643,16 @@
                  LEFT JOIN tb_exper_dev ted ON tsd.id = ted.dev_id
         WHERE tsd.sample_id = #{sampleId} AND tsd.del_falg = 0 AND ted.id IS NULL
     </select>
+
+    <select id="getLsExperDevs" resultType="com.bonus.aqgqj.app.entity.ExperDevAppVo">
+        SELECT tsd.id,
+               tsd.dev_code AS devCode,
+               tsd.dev_module AS devModule,
+               tsd.department_id AS departmentId,
+               tsd.id AS devId
+        FROM tb_sample_device tsd
+                 LEFT JOIN tb_exper_dev ted ON tsd.id = ted.dev_id AND ted.exper_id = #{id}
+        WHERE tsd.sample_id = #{sampleId} AND tsd.dev_type_code = #{devTypeCode} AND tsd.del_falg = 0 AND ted.id IS NULL
+        ORDER BY tsd.id
+    </select>
 </mapper>