From 2ba13f1c4d7dc61752e1d759c01bde72d8ae3055 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 23 Feb 2023 18:03:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93-=E5=88=86=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E5=AE=9E=E6=96=BD=E8=AF=A6=E6=83=85=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_2nd_period.sql                 | 2 ++
 .../document/entity/PhasedImplementationDetailsEO.java      | 4 ++++
 .../service/impl/BussDocumentLibraryEOServiceImpl.java      | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
index 3d73e6dfa..3cfae8b3a 100644
--- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
@@ -223,3 +223,5 @@ INSERT INTO `laws_weilai`.`sys_dict` (`id`, `dict_name`, `dict_code`, `descripti
 INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1628228171473039361', '1628227874969300994', '在产车', '34e90bd6a000471bbdcd0ff325898740', NULL, 1, 1, 'admin', '2023-02-22 11:00:22', NULL, NULL, 1, NULL, NULL, '0', 'Car in production');
 INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1628228101830815745', '1628227874969300994', '新车型', '2148610ff06641849106321531656bfc', NULL, 2, 1, 'admin', '2023-02-22 11:00:05', 'admin', '2023-02-22 11:00:27', 1, NULL, NULL, '0', 'New car model');
 
+-- 文档库-分阶段实施详情表-增加排序号字段  2023-02-23 未同步生产环境
+ALTER TABLE `phased_implementation_details` ADD COLUMN `order_num` int(10) NULL COMMENT '排序号' AFTER `remarks`;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java
index f21131815..977e144f3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/PhasedImplementationDetailsEO.java
@@ -86,4 +86,8 @@ public class PhasedImplementationDetailsEO implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    /**排序号*/
+    @Excel(name = "排序号", width = 15)
+    @ApiModelProperty(value = "排序号")
+    private Integer orderNum;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 689eb6cb0..d9e7635dc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -1737,6 +1737,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             for (Map.Entry<String, Object> entry : map.entrySet()) {
 
                 String key = entry.getKey();
+                if(StringUtils.equals(key,"phasedImplementationDetailsEOList")){
+                    continue;
+                }
                 Object value = entry.getValue();
                 //es全文新增数据(数据转换)
                 esFullText(cut, fieldList, categoryList, dictItemList, mapList, sbCn,sbEn, entry);
@@ -6727,10 +6730,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         if(map.containsKey("phasedImplementationDetailsEOList")){
             PhasedImplementationDetailsEO phasedImplDetailsEO = null;
             JSONArray phasedImplDetailsEOJsonArr = JSONObject.parseArray(JSONObject.toJSONString(map.get("phasedImplementationDetailsEOList")));
+            Integer orderNum = 1;
             for (Object phasedImplDetailsEOJson : phasedImplDetailsEOJsonArr) {
                 phasedImplDetailsEO = JSONObject.parseObject(JSONObject.toJSONString(phasedImplDetailsEOJson),PhasedImplementationDetailsEO.class);
                 phasedImplDetailsEO.setBussDocumentLibraryId(id);
+                phasedImplDetailsEO.setOrderNum(orderNum);
                 phasedImplDetailsEOList.add(phasedImplDetailsEO);
+                orderNum ++;
             }
 
             boolean insertPhasedBatchFlag = this.phasedImplementationDetailsEOService.insertBatch(phasedImplDetailsEOList);