From 3274fd1f8f2a1324c0e55e673afe286a21445211 Mon Sep 17 00:00:00 2001
From: 79493 <794930212@qq.com>
Date: Thu, 18 May 2023 23:26:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=8A=E4=BC=A0=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/InPostListMapper.xml  |  5 +++--
 .../resources/mapper/ent/InListItemMapper.xml   |  6 ++++--
 .../com/rzyc/controller/UploadController.java   |  4 ++--
 .../easyexcel/EntEnterprisePostListener.java    | 17 ++++++++++++-----
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/inventory-dao/src/main/resources/mapper/InPostListMapper.xml b/inventory-dao/src/main/resources/mapper/InPostListMapper.xml
index c9a5b3c..10ce5ce 100644
--- a/inventory-dao/src/main/resources/mapper/InPostListMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/InPostListMapper.xml
@@ -27,7 +27,7 @@
         public_post_list_id, public_post_id, list_id, public_item_title, public_item_content, sort_id, year_num, standard, frequency, red_alert, yellow_alert, del_state, create_time, create_by, modify_time, modify_by
     </sql>
     <insert id="insertList">
-        insert into in_post_list (public_post_list_id,public_post_id,list_id,public_item_title,public_item_content, sort_id,standard, frequency,create_time, create_by)values
+        insert into in_post_list (public_post_list_id,public_post_id,list_id,public_item_title,public_item_content, sort_id,standard, frequency,create_time, create_by,year_num)values
         <foreach collection="list" item="list" separator=",">
             (#{list.publicPostListId},
             #{list.publicPostId},
@@ -37,7 +37,8 @@
             #{list.sortId},#{list.standard},
              #{list.frequency},
              #{list.createTime},
-             #{list.createBy})
+             #{list.createBy},
+             #{list.yearNum})
         </foreach>
     </insert>
     <select id="selectByListId" resultMap="BaseResultMap">
diff --git a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml
index 668f73c..87560e9 100644
--- a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml
@@ -30,7 +30,7 @@ item_basis, item_proof, item_law, sort_id, del_state,create_time, create_by, mod
     </sql>
 
     <insert id="insertItem">
-        insert into in_list_item (item_id,list_id,industry_id, item_title,item_content,standard,frequency, del_state,sort_id)values
+        insert into in_list_item (item_id,list_id,industry_id, item_title,item_content,standard,frequency, del_state,sort_id,create_by,create_time)values
         <foreach collection="list" item="list" separator=",">
             (#{list.itemId},
             #{list.listId},
@@ -40,7 +40,9 @@ item_basis, item_proof, item_law, sort_id, del_state,create_time, create_by, mod
             #{list.standard},
             #{list.frequency},
             1,
-             #{list.sortId})
+             #{list.sortId},
+            #{list.createBy},
+            #{list.createTime})
         </foreach>
     </insert>
 
diff --git a/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java b/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java
index 4254632..ecd1a9e 100644
--- a/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java
+++ b/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java
@@ -313,7 +313,7 @@ public class UploadController extends com.rzyc.controller.BaseController {
      */
     @ApiOperation(value = "EasyExcel读取行业清单", notes = "EasyExcel读取行业清单")
     @ResponseBody
-    @RequestMapping(value = "/readEasyExcel", method = RequestMethod.GET)
+    @RequestMapping(value = "/readEasyExcel", method = RequestMethod.POST)
     public String readEasyExcel(MultipartFile file)throws Exception{
         pcBusinessService.repeatedRead(file);
         return "success";
@@ -326,7 +326,7 @@ public class UploadController extends com.rzyc.controller.BaseController {
      */
     @ApiOperation(value = "EasyExcel读取企业", notes = "EasyExcel读取企业")
     @ResponseBody
-    @RequestMapping(value = "/readEasyExcelOfEnterprise", method = RequestMethod.GET)
+    @RequestMapping(value = "/readEasyExcelOfEnterprise", method = RequestMethod.POST)
     @Transactional
     public String readEasyExcelOfEnterprise(MultipartFile file)throws Exception{
         pcBusinessService.readEasyExcelOfEnterprise(file);
diff --git a/inventory-gov/src/main/java/com/rzyc/utils/easyexcel/EntEnterprisePostListener.java b/inventory-gov/src/main/java/com/rzyc/utils/easyexcel/EntEnterprisePostListener.java
index aaf071e..e71a037 100644
--- a/inventory-gov/src/main/java/com/rzyc/utils/easyexcel/EntEnterprisePostListener.java
+++ b/inventory-gov/src/main/java/com/rzyc/utils/easyexcel/EntEnterprisePostListener.java
@@ -19,6 +19,7 @@ import com.rzyc.model.InPostList;
 import com.rzyc.model.ent.BaseInClass;
 import com.rzyc.model.ent.InListItem;
 
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -102,6 +103,8 @@ public class EntEnterprisePostListener  implements ReadListener<EasyExcelPostLis
 
     private String industryName = "null";
 
+    private LocalDate current_date = LocalDate.now();
+
 
 
     /**
@@ -156,6 +159,8 @@ public class EntEnterprisePostListener  implements ReadListener<EasyExcelPostLis
             inListItem.setItemContent(postList);
             inListItem.setCreateBy("系统导入");
             inListItem.setCreateTime(new Date());
+            inListItem.setFrequency(1);
+            inListItem.setStandard(1);
             inListItem.setSortId(listSortId);
             cacheItem.add(inListItem);
         }
@@ -169,6 +174,7 @@ public class EntEnterprisePostListener  implements ReadListener<EasyExcelPostLis
         InPostList inPostList = new InPostList();
         inPostList.setPublicPostListId(RandomNumber.getUUid());
         inPostList.setPublicPostId(uuidPost);
+        inPostList.setYearNum(current_date.getYear());
         inPostList.setListId(inPostItemId);
         //截取其中的频率参数
         String str = easyExcelPostList.getPostItem();
@@ -191,15 +197,16 @@ public class EntEnterprisePostListener  implements ReadListener<EasyExcelPostLis
                 //获取考核指标
                 inPostList.setStandard(1);
                 //获取频率
-                inPostList.setStandard(1);
+                inPostList.setFrequency(1);
             }
             inPostList.setPublicItemTitle(easyExcelPostList.getPostItem().replace(" ",""));
             inPostList.setPublicItemContent(easyExcelPostList.getPostItem().replace(" ",""));
+            inPostList.setSortId(sortId);
+            inPostList.setCreateBy("系统导入");
+            inPostList.setCreateTime(new Date());
+            cachePostList.add(inPostList);
         }
-        inPostList.setSortId(sortId);
-        inPostList.setCreateBy("系统导入");
-        inPostList.setCreateTime(new Date());
-        cachePostList.add(inPostList);
+
 
         //排序
         sortId++;