模版更新

search-tool/src/main/java/com/bonus/tool/controller/search/StateGridController.java

@@ -117,4 +117,22 @@ public class StateGridController extends BaseController {
     }
 
 
+    /**
+     * 国网模版下载
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "国网模版下载")
+    //   @PreAuthorize("@ss.hasPermi('key:people:add')")
+    @PostMapping("/downloadStateGridTemp")
+    public AjaxResult downloadStateGridTemp(@RequestBody TbGwModelDto o) {
+        try {
+            return service.downloadStateGridTemp(o);
+        }catch (Exception e){
+            log.info("国网模版修改失败{}",e.getMessage());
+            return  error(e.getMessage());
+        }
+    }
+
+
 }

search-tool/src/main/java/com/bonus/tool/dto/ComCorePersonBean.java

@@ -20,6 +20,11 @@ public class ComCorePersonBean {
    */
   private Long id;
 
+  /**
+   * 用户id
+   */
+  private String userId;
+
   /**
    * 姓名
    */

search-tool/src/main/java/com/bonus/tool/dto/ComOtherPersonBean.java

@@ -22,6 +22,10 @@ public class ComOtherPersonBean {
    */
   private String postName;
 
+  /**
+   * 用户ID
+   */
+  private Long userId;
 
   /**
    * 姓名

search-tool/src/main/java/com/bonus/tool/dto/ComPerformanceBean.java

@@ -24,6 +24,11 @@ public class ComPerformanceBean {
      */
     private Long id;
 
+    /**
+     * 主键
+     */
+    private Long perfId;
+
     /**
      * 工程名称
      */

search-tool/src/main/java/com/bonus/tool/dto/SubOtherPeopleBean.java

@@ -25,6 +25,11 @@ public class SubOtherPeopleBean {
      */
     private Long subId;
 
+    /**
+     * 用户id
+     */
+    private Long userId;
+
     /**
      * 姓名
      */

search-tool/src/main/java/com/bonus/tool/dto/SubPerformanceBean.java

@@ -29,6 +29,11 @@ public class SubPerformanceBean {
      */
     private Long subId;
 
+    /**
+     * 业绩id
+     */
+    private Long perfId;
+
     /**
      * 项目名称
      */

search-tool/src/main/java/com/bonus/tool/service/StateGridService.java

@@ -42,4 +42,11 @@ public interface StateGridService {
      * @return
      */
     AjaxResult updateStateGridTemp(TbGwModelDto o);
+
+    /**
+     * 国网模版下载
+     * @param
+     * @return
+     */
+    AjaxResult downloadStateGridTemp(TbGwModelDto o);
 }

search-tool/src/main/java/com/bonus/tool/service/impl/StateGridServiceImpl.java

@@ -184,6 +184,26 @@ public class StateGridServiceImpl implements StateGridService {
         return AjaxResult.success("国网模板修改成功");
     }
 
+    /**
+     * 国网模版下载
+     * @param
+     * @return
+     */
+    @Override
+    public AjaxResult downloadStateGridTemp(TbGwModelDto o) {
+        AjaxResult ajaxResult = getStateGridTempById(o);
+        if (ajaxResult.isSuccess()) {
+            TbGwModelVo data = (TbGwModelVo) ajaxResult.get("data");
+            //将每种数据的文件查出来封装进去
+
+        }
+        return null;
+    }
+
+    private List<TbFileSourceVo> getFileSourceList(TbGwModelDto o) {
+        return null;
+    }
+
     /**
      * 删除国网模版关联数据
      *

search-tool/src/main/resources/mapper/StateGridMapper.xml

@@ -160,6 +160,7 @@
     </select>
     <select id="selectComPerfList" resultType="com.bonus.tool.dto.ComPerformanceBean">
         SELECT id,
+               tgpr.perf_id,
                pro_name,
                voltage,
                station_num,
@@ -174,6 +175,7 @@
     </select>
     <select id="selectComCoreList" resultType="com.bonus.tool.dto.ComCorePersonBean">
         SELECT tgku.id,
+               tkp.id as userId,
                tkp.user_name,
                tkp.id_card,
                tkp.title,
@@ -188,6 +190,7 @@
     </select>
     <select id="selectComOtherList" resultType="com.bonus.tool.dto.ComOtherPersonBean">
         SELECT tgou.id,
+               tkp.id as userId,
                tkp.user_name,
                tkp.id_card,
                tkp.title,
@@ -211,6 +214,7 @@
         SELECT tbsr.id,
                tbsr.gw_id,
                tbsr.sub_id,
+               tbsr.perf_id,
                tsp.pro_name,
                tsp.voltage,
                tsp.cons_unit,
@@ -225,6 +229,7 @@
     </select>
     <select id="selectSubOtherList" resultType="com.bonus.tool.dto.SubOtherPeopleBean">
         SELECT tgsu.id,
+               tkp.id as userId,
                tkp.user_name,
                tkp.id_card,
                tkp.title,