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

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java

@@ -104,7 +104,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
     @Override
     public PublicPartiProfileResultDTO publicPartiProfile(AgencyFormDTO param) {
 
-        String monthId = dateUtils.getPreviousMonthId();
+        String monthId = dateUtils.getCurrentMonthId();
         UserJoinIndicatorGrowthRateResultDTO latest = screenUserJoinDao.selectUserJoinData(param.getAgencyId(), monthId);
         if(null == latest) return new PublicPartiProfileResultDTO();
         PublicPartiProfileResultDTO result = ConvertUtils.sourceToTarget(latest,PublicPartiProfileResultDTO.class);
@@ -154,7 +154,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         if(NumConstant.ZERO == param.getTopNum()) param.setTopNum(NumConstant.MAX);
         PageHelper.startPage(NumConstant.ONE,param.getTopNum());
         List<GovernCapacityResultDTO> orderList =
-                screenGovernRankDataDao.selectGovernCapacityRatio(dateUtils.getPreviousMonthId(),param.getAgencyId());
+                screenGovernRankDataDao.selectGovernCapacityRatio(dateUtils.getCurrentMonthId(),param.getAgencyId());
         if(null == orderList || orderList.isEmpty()) return new ArrayList<>();
         List<GovernCapacityRankResultDTO> result = new LinkedList<>();
         orderList.forEach(o -> {

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java

@@ -7,6 +7,7 @@ import com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao;
 import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao;
 import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
 import com.epmet.datareport.service.screen.GrassrootsPartyDevService;
+import com.epmet.datareport.utils.DateUtils;
 import com.epmet.datareport.utils.ModuleConstant;
 import com.epmet.screen.dto.form.BranchBuildRankFormDTO;
 import com.epmet.screen.dto.form.BranchBuildTrendFormDTO;
@@ -42,6 +43,8 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
     private ScreenCpcBaseDataDao screenCpcBaseDataDao;
     @Autowired
     private ScreenPartyBranchDataDao screenPartyBranchDataDao;
+    @Autowired
+    private DateUtils dateUtils;
 
     /**
      * @Description 1、党员基本情况-饼状图概况
@@ -178,7 +181,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
             param.setCategory(ModuleConstant.KEY_BRANCH_CATEGORY_PARTY);
         }
         if(StringUtils.isBlank(param.getMonthId())){
-            param.setMonthId(getPreviousMonthId());
+            param.setMonthId(dateUtils.getCurrentMonthId());
         }
         if(NumConstant.ZERO == param.getTopNum()) param.setTopNum(NumConstant.MAX);
         PageHelper.startPage(NumConstant.ONE,param.getTopNum());
@@ -215,7 +218,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
         SimpleDateFormat format = new SimpleDateFormat("yyyyMM");
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date()); // 设置为当前时间
-        calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月
+        //calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月
         String currentMonth = format.format(calendar.getTime());
         Integer monthCounter = Integer.parseInt(currentMonth);
         Map<String,String> monthMap = new HashMap<>();

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java

@@ -158,7 +158,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
     public List<String> getXPro(){
         List<String> xAxis = new ArrayList<>();
         LocalDate today = LocalDate.now();
-        for(int i = NumConstant.TWELVE;i >= NumConstant.ONE; i--){
+        for(int i = NumConstant.ELEVEN;i >= NumConstant.ZERO; i--){
             LocalDate localDate = today.minusMonths(i);
             String s = localDate.getMonth().getValue() + ScreenConstant.MONTH;
             xAxis.add(s);
@@ -184,7 +184,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
         }
         PageHelper.startPage(NumConstant.ONE,param.getTopNum());
         List<OrgRankDataResultDTO> gridData =
-            screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),dateUtils.getPreviousMonthId());
+            screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),dateUtils.getCurrentMonthId());
         List<AdvanceBranchRankResultDTO> result = new LinkedList<>();
         if(null == gridData || gridData.isEmpty()) return result;
         gridData.forEach( data -> {

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java

@@ -31,7 +31,7 @@ public class DateUtils {
     public Map<String,String> getX(){
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date()); // 设置为当前时间
-        calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月
+        //calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1); // 设置为上一个月
         String currentMonth = defaultFormat.format(calendar.getTime());
         Integer monthCounter = Integer.parseInt(currentMonth);
         Map<String,String> monthMap = new HashMap<>();
@@ -64,7 +64,7 @@ public class DateUtils {
         Map<String,String> xAxis = new HashMap<>();
         LocalDate today = LocalDate.now();
 
-        for(int i = NumConstant.TWELVE;i >= NumConstant.ONE; i--){
+        for(int i = NumConstant.ELEVEN;i >= NumConstant.ZERO; i--){
             LocalDate localDate = today.minusMonths(i);
             String s = localDate.getMonth().getValue() + "月";
             xAxis.put(localDate.format(fmt),s);
@@ -108,6 +108,19 @@ public class DateUtils {
         return format.format(c.getTime());
     }
 
+    /**
+     * @Description 得到当前月份的monthId
+     * @param
+     * @return
+     * @author wangc
+     * @date 2020.08.27 13:43
+    **/
+    public String getCurrentMonthId(){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date()); // 设置为当前时间
+        return defaultFormat.format(calendar.getTime());
+    }
+
     public static void main(String[] args) {
         DateUtils util = new DateUtils();
         Map<String,String> result = util.getXpro();

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@@ -28,7 +28,6 @@
             screen_customer_grid
         WHERE
             del_flag = 0
-            AND parent_agency_id = #{agencyId}
             AND all_parent_ids LIKE concat('%', #{agencyId}, '%')
     </select>
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml

@@ -7,9 +7,9 @@
     <select id="selectDifficulty" resultType="com.epmet.screen.dto.result.DifficultProjectResultDTO">
          SELECT
             diff.EVENT_ID AS projectId,
-            eve.EVENT_TITLE AS title,
+            diff.EVENT_CONTENT AS title,
             diff.EVENT_STATUS_CODE AS STATUS,
-            diff.EVENT_COST_TIME AS totalHours,
+            FORMAT(diff.EVENT_COST_TIME/60,2) AS totalHours,
             DATE_FORMAT( eve.EVENT_CREATE_TIME, '%Y-%m-%d %H:%i' ) AS createDateTime,
             diff.EVENT_SOURCE AS gridName,
             diff.EVENT_IMG_URL AS imgUrl,

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml

@@ -6,7 +6,7 @@
     <!-- 查询事件 -->
     <select id="selectEvent" resultType="com.epmet.screen.dto.result.ProjectResultDTO">
         SELECT
-            event_title AS projectTitle,
+            IFNULL(event_title,'') AS projectTitle,
             event_level AS color,
             event_id AS projectId,
             org_name AS orgName,
@@ -16,7 +16,7 @@
             screen_event_data
         WHERE
             del_flag = '0'
-            AND parent_id = #{parentId}
+            AND all_parent_ids LIKE concat('%', #{parentId}, '%')
     </select>
 
     <!-- 项目详情 -->

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml

@@ -15,7 +15,7 @@
             screen_govern_rank_data
         WHERE
             DEL_FLAG = '0'
-            AND ORG_ID = #{agencyId}
+            AND PARENT_ID = #{agencyId}
             AND MONTH_ID = #{monthId}
         ORDER BY
             (RESPONSE_RATIO + RESOLVED_RATIO + GOVERN_RATIO + SATISFACTION_RATIO) DESC,RESPONSE_RATIO DESC,RESOLVED_RATIO DESC,GOVERN_RATIO DESC,SATISFACTION_RATIO DESC

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml

@@ -17,7 +17,7 @@
             screen_org_rank_data
         WHERE
             DEL_FLAG = '0'
-            AND all_parent_ids LIKE  CONCAT('%',#{agencyId},'%')
+            AND PARENT_ID = #{agencyId}
             AND MONTH_ID = #{monthId}
             ORDER BY
             (PARTY_TOTAL + GROUP_TOTAL + ISSUE_TOTAL + PROJECT_TOTAL + CLOSE_PROJECT_RATIO + SATISFACTION_RATIO) DESC,

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

@@ -12,7 +12,7 @@
             screen_party_user_rank_data
         WHERE
             del_flag = '0'
-            AND all_parent_ids LIKE  CONCAT('%',#{agencyId},'%')
+            AND all_parent_ids LIKE CONCAT('%',#{agencyId},'%')
         ORDER BY
             point_total DESC,
             user_name
@@ -30,7 +30,7 @@
             screen_party_user_rank_data
         WHERE
             DEL_FLAG = '0'
-            AND all_parent_ids LIKE  CONCAT('%',#{agencyId},'%')
+            AND ORG_ID = #{agencyId}
             AND PARTY_FLAG = '1'
         ORDER BY
             POINT_TOTAL DESC

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

@@ -334,9 +334,10 @@ public class ScreenCollServiceImpl implements ScreenCollService {
 
             String[] lastMonth = this.lastMonthDate();
             // 获取上个月的基本数据
+            String moneth = lastMonth[NumConstant.ZERO] + lastMonth[NumConstant.ONE];
             List<ScreenUserJoinEntity> lastMonthJoinList = screenUserJoinDao.selectLastMonthScreenUserJoinList(customerId,
                     lastMonth[NumConstant.ZERO],
-                    lastMonth[NumConstant.ONE],
+                    moneth,
                     orgIds);
 
             // 定义本月待添加数据的集合