Merge remote-tracking branch 'origin/dev' into dev

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/AgencyMonthCountResultDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.extract.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/5/8 9:34 上午
+ * @DESC
+ */
+@Data
+public class AgencyMonthCountResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3473299876562651080L;
+
+    private String orgId;
+
+    private Integer monthCount = NumConstant.ZERO;
+}

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

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
 import com.epmet.dto.extract.form.ScreenPartyBranchDataFormDTO;
 import com.epmet.dto.extract.form.ScreenPartyLinkMassesDataFormDTO;
+import com.epmet.dto.extract.result.AgencyMonthCountResultDTO;
 import com.epmet.dto.extract.result.CustomerAgencyInfoResultDTO;
 import com.epmet.dto.extract.result.OrgNameResultDTO;
 import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO;
@@ -204,4 +205,12 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      * @date 2021/3/9 上午9:41
      */
     List<ScreenProjectOrgDailyDTO> selectAgencyByParentAreaCode(@Param("areaCode") String areaCode);
+
+    /**
+     * @Description  根据客户ID查询客户下所有org【agency，grid，dept】
+     * @Param customerId
+     * @author zxc
+     * @date 2021/5/8 9:03 上午
+     */
+    List<AgencyMonthCountResultDTO> selectAllOrgByCustomerId(@Param("customerId")String customerId);
 }

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

@@ -18,6 +18,7 @@
 package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.extract.result.AgencyMonthCountResultDTO;
 import com.epmet.dto.screencoll.form.IndexDataMonthlyFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenIndexDataMonthlyEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -81,6 +82,15 @@ public interface ScreenIndexDataMonthlyDao extends BaseDao<ScreenIndexDataMonthl
     Integer selectCountIndexDataMonthly(@Param("customerId") String customerId,
                                         @Param("yearId") String yearId);
 
+    /**
+     * @Description  根据orgIds查询在 screen_index_data_monthly 表里本年度有多少条记录
+     * @Param yearId
+     * @Param orgIds
+     * @author zxc
+     * @date 2021/5/8 9:37 上午
+     */
+    List<AgencyMonthCountResultDTO> selectMonthCountByOrgId(@Param("yearId") String yearId,@Param("orgIds")List<AgencyMonthCountResultDTO> orgIds);
+
     /**
      * 批量删除月表数据
      *    根据CUSTOMER_ID、MONTH_ID、ORG_TYPE进行查询，如果有数据，则先进行物理删除, 一次删除1000条

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -17,6 +17,7 @@ import com.epmet.dao.evaluationindex.indexcal.GridScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.*;
 import com.epmet.dao.evaluationindex.screen.*;
 import com.epmet.dto.ScreenCustomerGridDTO;
+import com.epmet.dto.extract.result.AgencyMonthCountResultDTO;
 import com.epmet.dto.indexcal.AgencyScoreDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.indexcal.DeptScoreDTO;
@@ -851,8 +852,41 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
      **/
     private void insertIndexDataYear(String monthId, String customerId){
         // 查询今年，上报了几个月的指数统计
+        List<AgencyMonthCountResultDTO> orgIds = screenCustomerAgencyDao.selectAllOrgByCustomerId(customerId);
+        if (CollectionUtils.isEmpty(orgIds)){
+            throw new RenException("客户下没有查到agencyId，gridId，deptId");
+        }
+        List<AgencyMonthCountResultDTO> agencyMonthCount = screenIndexDataMonthlyDao.selectMonthCountByOrgId(getYearStr(monthId), orgIds);
+        if (!CollectionUtils.isEmpty(agencyMonthCount)){
+            agencyMonthCount.forEach(a -> {
+                orgIds.forEach(o -> {
+                    if (a.getOrgId().equals(o.getOrgId())){
+                        o.setMonthCount(a.getMonthCount());
+                    }
+                });
+            });
+        }
         Integer monthCount = screenIndexDataMonthlyDao.selectCountIndexDataMonthly(customerId, getYearStr(monthId));
         List<IndexDataMonthlyFormDTO> monthlyFormList = screenIndexDataMonthlyDao.selectListIndexDataMonthlyByYear(customerId, getYearStr(monthId), monthCount);
+        BigDecimal monthCountBd = new BigDecimal(monthCount);
+        monthlyFormList.forEach(m -> {
+            orgIds.forEach(o -> {
+                if (m.getOrgId().equals(o.getOrgId())){
+                    BigDecimal selfCount = new BigDecimal(o.getMonthCount());
+                    if (o.getMonthCount() == NumConstant.ZERO){
+                        m.setIndexTotal(monthCountBd.multiply(m.getIndexTotal()));
+                        m.setPartyDevAblity(monthCountBd.multiply(m.getPartyDevAblity()));
+                        m.setServiceAblity(monthCountBd.multiply(m.getServiceAblity()));
+                        m.setGovernAblity(monthCountBd.multiply(m.getGovernAblity()));
+                    }else {
+                        m.setIndexTotal(monthCountBd.multiply(m.getIndexTotal()).divide(selfCount));
+                        m.setPartyDevAblity(monthCountBd.multiply(m.getPartyDevAblity()).divide(selfCount));
+                        m.setServiceAblity(monthCountBd.multiply(m.getServiceAblity()).divide(selfCount));
+                        m.setGovernAblity(monthCountBd.multiply(m.getGovernAblity()).divide(selfCount));
+                    }
+                }
+            });
+        });
         if (monthlyFormList.size() > NumConstant.ZERO){
             int deleteNum;
             do {

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

@@ -85,12 +85,14 @@ public class ScreenUserJoinServiceImpl extends BaseServiceImpl<ScreenUserJoinDao
                 for (int j = NumConstant.ZERO; j < lastMonthJoinList.size(); j++) {
                     if (list.get(i).getOrgId().equals(lastMonthJoinList.get(j).getOrgId())) {
                         ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(list.get(i), ScreenUserJoinEntity.class);
-                        ScreenUserJoinEntity lastJoinEntity = lastMonthJoinList.get(i);
+                        ScreenUserJoinEntity lastJoinEntity = null;
-                        if (lastJoinEntity == null){
+                        if (i > lastMonthJoinList.size()){
                             lastJoinEntity = new ScreenUserJoinEntity();
                             lastJoinEntity.setJoinTotal(NumConstant.ZERO);
                             lastJoinEntity.setAvgIssue(NumConstant.ZERO_DECIMAL);
                             lastJoinEntity.setAvgJoin(NumConstant.ZERO_DECIMAL);
+                        }else{
+                            lastJoinEntity = lastMonthJoinList.get(i);
                         }
                         entity.setJoinTotalUpRate(this.calculateGrowthRateNumber(lastJoinEntity.getJoinTotal(), list.get(j).getJoinTotal()));
                         entity.setJoinTotalUpFlag(this.calculateGrowthRateFlag(lastJoinEntity.getJoinTotal(), list.get(j).getJoinTotal()));

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml

@@ -162,16 +162,16 @@
                  fics.year_id AS yearId,
                  ROUND(AVG( fics.score ),6) AS score,
                  fics.customer_id AS customerId,
-                 (SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode}) AS parentId
+                 (SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0) AS parentId
              FROM
                  fact_index_agency_score fics
              WHERE
                  fics.del_flag = '0'
                AND fics.month_id = #{monthId}
                AND fics.index_code = #{indexCode}
-               AND  fics.agency_id IN (SELECT AGENCY_ID FROM screen_customer_agency WHERE PARENT_AREA_CODE = #{areaCode})
+               AND  fics.agency_id IN (SELECT AGENCY_ID FROM screen_customer_agency WHERE PARENT_AREA_CODE = #{areaCode} AND DEL_FLAG = 0)
              GROUP BY agencyId) a
-                LEFT JOIN screen_customer_agency a2 ON a2.AGENCY_ID = a.parentId
+                LEFT JOIN screen_customer_agency a2 ON a2.AGENCY_ID = a.parentId AND a2.DEL_FLAG = 0
         GROUP BY a2.AGENCY_ID
     </select>
 

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

@@ -419,4 +419,11 @@
         where  sca.DEL_FLAG = '0'
          and sca.AREA_CODE= #{areaCode}
     </select>
+
+    <!-- 根据客户ID查询客户下所有org【agency，grid，dept】 -->
+    <select id="selectAllOrgByCustomerId" resultType="com.epmet.dto.extract.result.AgencyMonthCountResultDTO">
+        (SELECT AGENCY_ID AS orgId FROM screen_customer_agency WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId}) UNION ALL
+        (SELECT GRID_ID AS orgId FROM screen_customer_grid WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId}) UNION ALL
+        (SELECT DEPT_ID AS orgId FROM screen_customer_dept WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId})
+    </select>
 </mapper>

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

@@ -96,6 +96,21 @@
         ) monthCount
     </select>
 
+    <!-- 根据orgIds查询在 screen_index_data_monthly 表里本年度有多少条记录 -->
+    <select id="selectMonthCountByOrgId" resultType="com.epmet.dto.extract.result.AgencyMonthCountResultDTO">
+        SELECT
+            ORG_ID,
+            COUNT(DISTINCT MONTH_ID) AS monthCount
+        FROM screen_index_data_monthly
+        WHERE DEL_FLAG = '0'
+          AND  YEAR_ID = #{yearId}
+          AND
+            (<foreach collection="orgIds" item="o" separator=" OR ">
+                ORG_ID = #{o.orgId}
+            </foreach>)
+        GROUP BY ORG_ID
+    </select>
+
     <delete id="deleteIndexDataMonthlyByOrgType">
         delete from screen_index_data_monthly
         where CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId} AND ORG_TYPE = #{orgType}

epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.11__groupAchievementRule.sql

@@ -1 +1,2 @@
-INSERT INTO `epmet_point`.`point_rule_default`(`ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `RULE_PERIOD`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10', '组长解决话题', '组长解决组内话题', 'leader_resolve_topic', '1', 'plus', 0, '无上限', NULL, 'day', 2, 'time', '0', '0', 0, 'APP_USER', '2021-04-19 15:55:18', 'APP_USER', '2021-04-19 15:55:18');
+#INSERT INTO `epmet_point`.`point_rule_default`(`ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `RULE_PERIOD`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10', '组长解决话题', '组长解决组内话题', 'leader_resolve_topic', '1', 'plus', 0, '无上限', NULL, 'day', 2, 'time', '0', '0', 0, 'APP_USER', '2021-04-19 15:55:18', 'APP_USER', '2021-04-19 15:55:18');
+select 1;