修改partyuserrankdata

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java

@@ -14,11 +14,6 @@ public class PartyUserRankDataFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 客户id
-     */
-    private String customerId;
-
     /**
      * 年Id ：yyyy
      */

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -68,6 +68,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-extapp-auth</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java

@@ -1,5 +1,7 @@
 package com.epmet.controller;
 
+import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
+import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.screencoll.form.*;
 import com.epmet.service.screen.ScreenCollService;
@@ -32,9 +34,11 @@ public class ScreenCollController {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
+    @ExternalAppRequestAuth
     @PostMapping("partyuserrankdata")
-    public Result partyUserRankData(@RequestBody List<PartyUserRankDataFormDTO> formDTO) {
+    public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam,@RequestBody List<PartyUserRankDataFormDTO> formDTO) {
-        return screenCollService.insertPartyUserRankData(formDTO);
+        screenCollService.insertPartyUserRankData(formDTO,externalAppRequestParam.getCustomerId());
+        return new Result();
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java

@@ -58,5 +58,5 @@ public interface ScreenPartyUserRankDataDao extends BaseDao<ScreenPartyUserRankD
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-    void batchInsertPartyUserRankData(@Param("list") List<PartyUserRankDataFormDTO> list);
+    void batchInsertPartyUserRankData(@Param("list") List<PartyUserRankDataFormDTO> list,@Param("customerId")String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java

@@ -17,7 +17,7 @@ public interface ScreenCollService {
      * @Author zhangyong
      * @Date 10:52 2020-08-18
      **/
-	Result insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO);
+    void insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO,String customerId);
 
     /**
      * 8、党建引领-党员联系群众数据

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java

@@ -75,20 +75,19 @@ public class ScreenCollServiceImpl implements ScreenCollService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO) {
+    public void insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO,String customerId) {
         if (null != formDTO && formDTO.size() > NumConstant.ZERO){
             String[] orgIds = new String[formDTO.size()];
             for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
                 orgIds[i] = formDTO.get(i).getOrgId();
             }
-            screenPartyUserRankDataDao.deletePartyUserRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
+            screenPartyUserRankDataDao.deletePartyUserRankData(customerId,
                     formDTO.get(NumConstant.ZERO).getYearId(),
                     formDTO.get(NumConstant.ZERO).getMonthId(),
                     orgIds);
 
-            screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO);
+            screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO,customerId);
         }
-        return new Result();
     }
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@@ -12,7 +12,7 @@
         </foreach>
     </delete>
 
-    <insert id="batchInsertPartyUserRankData" parameterType="java.util.List">
+    <insert id="batchInsertPartyUserRankData" parameterType="map">
         insert into screen_party_user_rank_data
         (
         ID,
@@ -37,7 +37,7 @@
         <foreach collection="list" item="item" index="index" separator=",">
             (
             (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{item.customerId},
+            #{customerId},
             #{item.yearId},
             #{item.monthId},
             #{item.orgType},