From 36b6bba9cdd3105235f3148485aeab8a4d7e7abe Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 21 May 2021 16:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/screen/dto/form/IndexScoreFormDTO.java  | 3 ++-
 .../epmet/datareport/controller/screen/IndexController.java | 3 ++-
 .../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml   | 6 ++++++
 .../resources/mapper/screen/ScreenIndexDataYearlyDao.xml    | 3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/IndexScoreFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/IndexScoreFormDTO.java
index e75abb9f63..9cd0d8cf49 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/IndexScoreFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/IndexScoreFormDTO.java
@@ -3,7 +3,6 @@ package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
@@ -31,6 +30,8 @@ public class IndexScoreFormDTO implements Serializable {
      */
     //@NotBlank(message = "月份Id不能为空",groups = {IndexScoreFormDTO.AddUserInternalGroup.class})
     private String monthId;
+
+    private String customerId;
     public interface AddUserInternalGroup {}
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
index cb851647af..55543e1e70 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
@@ -134,7 +134,8 @@ public class IndexController {
      * @author sun
      */
     @PostMapping("month/indexscore")
-    public Result<IndexScoreResultDTO> indexScore(@RequestBody IndexScoreFormDTO formDTO) {
+    public Result<IndexScoreResultDTO> indexScore(@RequestHeader("CustomerId") String customerId,@RequestBody IndexScoreFormDTO formDTO) {
+        formDTO.setCustomerId(customerId);
         ValidatorUtils.validateEntity(formDTO, IndexScoreFormDTO.AddUserInternalGroup.class);
         return new Result<IndexScoreResultDTO>().ok(indexService.indexScore(formDTO));
     }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index ccd8c9f82b..d5ca3cf33c 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -87,6 +87,9 @@
         del_flag = '0'
         AND parent_id = #{agencyId}
         AND month_id = #{monthId,jdbcType=VARCHAR}
+        <if test="customerId != null and customerId != ''">
+            AND  CUSTOMER_ID = #{customerId}
+        </if>
         <choose>
             <when test="orgType != null and orgType != ''">
                 AND ORG_TYPE = #{orgType,jdbcType=VARCHAR}
@@ -186,6 +189,9 @@
         WHERE
             del_flag = '0'
         AND org_id = #{orgId}
+        <if test="customerId != null and customerId != ''">
+            AND customer_id = #{customerId}
+        </if>
         <if test="orgType != null and orgType != '' ">
             AND org_type = #{orgType}
         </if>
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index 7cf197a054..301954275f 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -35,6 +35,9 @@
         del_flag = '0'
         AND parent_id = #{agencyId}
         AND year_id = YEAR(CURDATE())
+        <if test="customerId != null and customerId != ''">
+            AND  CUSTOMER_ID = #{customerId}
+        </if>
         <choose>
             <when test="orgType != null and orgType != ''">
                 AND ORG_TYPE = #{orgType,jdbcType=VARCHAR}