From f2d8482eeb9e56059699bda6e7bcd39acc0ee963 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 27 Dec 2021 15:26:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java  | 10 +++++-----
 .../service/impl/EsRevisePlanServiceImpl.java          |  8 ++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
index 26f8a511..6c95316b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
@@ -82,19 +82,19 @@ public class EsRevisePlan extends BasePage {
 //    private String ptJson;
     @ApiModelProperty(value = "引入企业标准json(标准id)")
     private String rqbJson;
-    @ApiModelProperty(value = "引入企业标准json(标准id)")
+    @ApiModelProperty(value = "引入企业标准json(标准名称)")
     private String rqbName;
-    @ApiModelProperty(value = "引入企业标准json(标准id)")
+    @ApiModelProperty(value = "引入企业标准json(标准编号)")
     private String rqbCode;
-    @ApiModelProperty(value = "体系结构树（找到表直接json处理掉，存储方式是逗号拼接）")
+    @ApiModelProperty(value = "体系结构树（id存储方式是逗号拼接）")
     private String tsJson;
-    @ApiModelProperty(value = "体系结构树（找到表直接json处理掉，存储方式是逗号拼接）")
+    @ApiModelProperty(value = "体系结构树（名称逗号拼接展示）")
     private String tsJsonName;
     @ApiModelProperty(value = "标准范围")
     private String area;
     @ApiModelProperty(value = "标准范围")
     private String areaName;
-    @ApiModelProperty(value = "标准范围")
+    @ApiModelProperty(value = "企标类别")
     private String qblb;
 
     private List<EsMatingRelation> esMatingRelations;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
index fe2f8367..68e545c5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
@@ -77,6 +77,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
             return "企标名称不能重复,请更换新的企标名称";
         }else {
             esRevisePlanDao.insertOne(esRevisePlan);
+            esRevisePlan.getEsMatingRelations().forEach(esMatingRelation -> {
+                esMatingRelation.setEsId(UUIDUtils.randomUUID(32));
+                esMatingRelation.setEsId(esRevisePlan.getId());
+            });
+            esRevisePlan.getEsStandRelations().forEach(esStandRelation -> {
+                esStandRelation.setEsId(esRevisePlan.getId());
+                esStandRelation.setId(UUIDUtils.randomUUID(32));
+            });
             esMatingRelationService.saveBatch(esRevisePlan.getEsMatingRelations());
             esStandRelationService.saveBatch(esRevisePlan.getEsStandRelations());
             return "操作成功";

From 840b426adc1b54a3a70530e59be7bb3e547c5404 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 27 Dec 2021 15:38:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=87=E6=A0=87=E7=A8=8B=E5=BA=A6?=
 =?UTF-8?q?=E8=BF=9E=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/slrs/esStandRelation/entity/EsStandRelation.java   | 4 ++++
 .../mybatis/mapper/esStandRelation/EsStandRelationMapper.xml  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java
index e71f029a..01922222 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esStandRelation/entity/EsStandRelation.java
@@ -40,6 +40,10 @@ public class EsStandRelation extends BaseEntity {
     @TableField("use_level")
     private String useLevel;
 
+    @ApiModelProperty(value = "采用程度名称")
+    @TableField(exist = false)
+    private String useLevelName;
+
     @ApiModelProperty(value = "简述技术指标依据")
     @TableField("technologic")
     private String technologic;
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml
index 870a74ae..5a2b1c6e 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esStandRelation/EsStandRelationMapper.xml
@@ -5,9 +5,10 @@
     <select id="getDatas" resultType="com.adc.da.slrs.esStandRelation.entity.EsStandRelation">
         select es_stand_relation.id , es_stand_relation.stand_id , es_stand_relation.stand_type,sar_standards_info.STAND_NAME as standName,
         concat(sar_standards_info.STAND_SORT,concat(' ',concat(concat(sar_standards_info.STAND_NUMBER,concat('-',sar_standards_info.STAND_YEAR))))) as standNumber,
-        es_stand_relation.is_relate as isRelate,es_stand_relation.technologic,es_stand_relation.use_level as useLevel
+        es_stand_relation.is_relate as isRelate,es_stand_relation.technologic,es_stand_relation.use_level as useLevel,ts_dictype.DIC_TYPE_NAME as useLevelName
         from es_stand_relation
         left join sar_standards_info on es_stand_relation.stand_id = sar_standards_info.ID
+        left join ts_dictype on es_stand_relation.use_level = ts_dictype.DIC_TYPE_CODE
         where es_stand_relation.es_id=#{id}
         union all
         select es_stand_relation.id , es_stand_relation.stand_id , es_stand_relation.stand_type,sar_bussioness_stand.STAND_NAME as standName,

From c41a19a1aba9fc643bb6b0ea0b7865baf497b0bf Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 27 Dec 2021 15:46:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRevisePlan/EsRevisePlanMapper.xml       | 59 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
index 45d42f98..03bb4422 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
@@ -142,9 +142,62 @@
     </select>
     <!--    多条件查询-->
     <select id="queryAll" parameterType="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan" resultMap="BaseInfoMapList">
-        select <include refid="BaseInfoList"></include> from es_revise_plan
-        <include refid="Conditions">
-        </include>
+        select
+        id,
+        es_name,
+        plan_status,
+        revise_status,
+        drafter,
+        res_person,
+        wg_leader,
+        draft_time,
+        release_time,
+        unit,
+        rqb_json as rqbJson,
+        ts_json as tsJson,
+        area,
+        qblb,
+        (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
+        (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName,
+        (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName,
+        (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName,
+        (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName
+        from es_revise_plan
+        <where>
+            <if test="esName != null and esName != ''">
+                and es_name like concat('%',#{esName},'%')
+            </if>
+            <if test="area != null and area != ''">
+                and area = #{area}
+            </if>
+            <if test="qblb != null and qblb != ''">
+                and qblb = #{qblb}
+            </if>
+            <if test="planStatus != null and planStatus != ''">
+                and plan_status = #{planStatus}
+            </if>
+            <if test="reviseStatus != null and reviseStatus != ''">
+                and revise_status = #{reviseStatus}
+            </if>
+            <if test="drafter != null and drafter != ''">
+                and drafter = #{drafter}
+            </if>
+            <if test="resPerson != null and resPerson != ''">
+                and res_person = #{resPerson}
+            </if>
+            <if test="wgLeader != null and wgLeader != ''">
+                and wg_leader = #{wgLeader}
+            </if>
+            <if test="draftTime != null">
+                and DATE_FORMAT(draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d')
+            </if>
+            <if test="releaseTime != null">
+                and DATE_FORMAT(release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d')
+            </if>
+            <if test="unit != null and unit != ''">
+                and (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) like concat('%',#{unit},'%')
+            </if>
+        </where>
         <include refid="pages">
         </include>
     </select>