Merge branch 'dev_bugfix_ljj' into dev

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

@@ -48,7 +48,10 @@ public interface ScreenProjectQuantityOrgMonthlyDao extends BaseDao<ScreenProjec
 	 * @author zxc
 	 * @date 2021/2/2 上午11:09
 	 */
-	List<ProjectOrgMonthlyResultDTO> selectQuantityOrgMonthly(@Param("agencyInfos") List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos, @Param("monthId") String monthId);
+	List<ProjectOrgMonthlyResultDTO> selectQuantityOrgMonthly(
+			@Param("customerId") String customerId,
+			@Param("agencyInfos") List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos,
+			@Param("monthId") String monthId);
 	List<ProjectOrgMonthlyResultDTO> selectQuantityOrgMonthlyByAgency(@Param("agencyInfos") List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos, @Param("monthId") String monthId);
 
 	/**
@@ -58,7 +61,10 @@ public interface ScreenProjectQuantityOrgMonthlyDao extends BaseDao<ScreenProjec
 	 * @author zxc
 	 * @date 2021/2/2 下午3:03
 	 */
-	List<ProjectOrgMonthlyResultDTO> selectQuantityGrandOrgMonthly(@Param("agencyInfos") List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos, @Param("monthId") String monthId);
+	List<ProjectOrgMonthlyResultDTO> selectQuantityGrandOrgMonthly(
+			@Param("customerId") String customerId,
+			@Param("agencyInfos") List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos,
+			@Param("monthId") String monthId);
 	List<ProjectOrgMonthlyResultDTO> selectQuantityGrandOrgMonthlyByAgency(@Param("agencyInfos") List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos, @Param("monthId") String monthId);
 
 

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

@@ -188,7 +188,7 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
                 p.setProjectIncr(p.getProjectIncr());
             });
         }
-        List<ProjectOrgMonthlyResultDTO> projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(agencyInfos, monthId);
+        List<ProjectOrgMonthlyResultDTO> projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(null, agencyInfos, monthId);
         if (!CollectionUtils.isEmpty(projectGrandOrg)){
             projectGrandOrg.forEach(p -> {
                 p.setClosedTotal(p.getClosedTotal());
@@ -252,14 +252,14 @@ public class ScreenProjectQuantityOrgMonthlyServiceImpl extends BaseServiceImpl<
         }
 
         List<ScreenProjectQuantityOrgMonthlyDTO> agencyInfos = ConvertUtils.sourceToTarget(screenProjectOrgDailyDTOS, ScreenProjectQuantityOrgMonthlyDTO.class);
-        List<ProjectOrgMonthlyResultDTO> projectOrg = baseDao.selectQuantityOrgMonthly(agencyInfos, monthId);
+        List<ProjectOrgMonthlyResultDTO> projectOrg = baseDao.selectQuantityOrgMonthly(customerId, agencyInfos, monthId);
         /*if (!CollectionUtils.isEmpty(projectOrg)){
             projectOrg.forEach(p -> {
                 p.setClosedIncr(p.getClosedIncr());
                 p.setProjectIncr(p.getProjectIncr());
             });
         }*/
-        List<ProjectOrgMonthlyResultDTO> projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(agencyInfos, monthId);
+        List<ProjectOrgMonthlyResultDTO> projectGrandOrg = baseDao.selectQuantityGrandOrgMonthly(customerId, agencyInfos, monthId);
         /*if (!CollectionUtils.isEmpty(projectGrandOrg)){
             projectGrandOrg.forEach(p -> {
                 p.setClosedTotal(p.getClosedTotal());

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

@@ -108,6 +108,7 @@
             WHERE g.DEL_FLAG = 0
             AND cg.AREA_CODE LIKE CONCAT(#{a.areaCode},'%')
             AND g.MONTH_ID = #{monthId}
+            AND g.CUSTOMER_ID = #{customerId}
         </foreach>
     </select>