From 99af6468d1e047a43da7609ef97185b72ef3412d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 28 Jun 2023 19:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8C=85=E5=90=AB=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ParamsCollectManifestEOMapper.java       |  1 +
 .../mapper/xml/ParamsCollectManifestEOMapper.xml    | 13 +++++++++++++
 .../impl/ParamsCollectManifestEOServiceImpl.java    | 10 +++++++---
 .../cert/collect/vo/ParamsCollectManifestVO.java    |  4 ++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
index 64eb78905..dfa97007a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
@@ -23,6 +23,7 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
 
     List<ParamsCollectManifestEO> listInfoOfTodoCenter(@Param("manifestIdList") List<String> manifestIdList);
     List<Map<String, Object>> listInfoForExport(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO, @Param("ids") String ids);
+    List<Map<String, Object>> listInfoForExportExportTitle(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO, @Param("ids") String ids);
     List<ParamsCollectManifestEO> listInfoOfTodoCenter();
 
     // 查询控件类型为 标题的 参数项
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index 01139f7ac..35f81bc2f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -94,6 +94,19 @@
             </foreach>
     </select>
 
+    <select id="listInfoForExportExportTitle" resultType="java.util.LinkedHashMap">
+        select *
+        from params_collect_manifest
+        <include refid="BaseQuerySql"/>
+        <if test="ids !=null and ids !=''">
+            AND id in
+            <foreach collection="ids.split(',')" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
+    </select>
+
     <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
         select *
         from params_collect_manifest
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index f78b0a372..69a843f04 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -4278,7 +4278,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         for (int i = 0; i < fieldList.size(); i++) {
             OnlCgformField onlCgformField = fieldList.get(i);
             String dbFieldName = onlCgformField.getDbFieldName();
-            if (!"deadline".equals(dbFieldName) && !"cert_category".equals(dbFieldName) && !"description".equals(dbFieldName)) {
+            if (!"deadline".equals(dbFieldName) && !"cert_category".equals(dbFieldName)) {
                 dbFieldList.add(dbFieldName);
 
                 if (CutEnum.CN.getValue().equals(cut)) {
@@ -4464,14 +4464,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
         ParamsCollectManifestEO queryEO = new ParamsCollectManifestEO();
         queryEO.setParamsManifestId(paramsManifestId);
-
         String userTypes = paramsCollectManifestVO.getUserTypes();
         if (userTypes != null && CollectManifestUserTypeEnum.SDT.getValue().equals(userTypes)) {
             queryEO.setUserTypes(CollectManifestUserTypeEnum.SDT.getValue());
             queryEO.setSdt(loginUser.getUsername());
         }
 
-        List<Map<String, Object>> dataList = paramsCollectManifestEOMapper.listInfoForExport(queryEO, null); // 查询导出数据
+        List<Map<String, Object>> dataList = paramsCollectManifestEOMapper.listInfoForExportExportTitle(queryEO, null); // 查询导出数据
         if (dataList == null || dataList.isEmpty()) {
             // 没有查到数据，进行提示
             if (CutEnum.EN.getValue().equals(paramsCollectManifestVO.getCut())) {
@@ -4489,6 +4488,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         List<Map<String,Object>> exportDataList = new ArrayList<>();
         // 配置列多行数据处理
         for (Map<String, Object> data : dataList) {
+            String controlType = (String)data.get("control_type");
+            if("0".equals(paramsCollectManifestVO.getExportOption()) && "11".equals(controlType)){
+                //不要标题
+                continue;
+            }
             String id = (String) data.get("id");
 
             Map<String, List<ParamsConfigDataEO>> paramsConfigDataMap = paramsConfigDataEOList.stream().filter(configDataEO -> {
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
index 4428fb8a9..e080b6c69 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
@@ -106,4 +106,8 @@ public class ParamsCollectManifestVO {
     //排序规则 ”1“ 顺序  ”2“逆序
     @TableField(exist = false)
     private String orderBy;
+
+    //是否导出标题 ”1“ 是  ”0“否
+    @TableField(exist = false)
+    private String exportOption;
 }