查询添加客户Id

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 {}
 
 }

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));
     }

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>

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}