Browse Source

网格相关 党建能力

dev_shibei_match
zxc 5 years ago
parent
commit
e5a4f0149e
  1. 178
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/PartyAbilityGridMonthlyFormDTO.java
  2. 25
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/CreateTopicCountResultDTO.java
  3. 45
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridUserCountResultDTO.java
  4. 11
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
  5. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java
  6. 18
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyDao.java
  7. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactRegUserGridMonthlyDao.java
  8. 11
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicMainDailyService.java
  9. 58
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java
  10. 14
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java
  11. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridMonthlyService.java
  12. 13
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserGridMonthlyServiceImpl.java
  13. 15
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
  14. 13
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
  15. 73
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyDao.xml
  16. 17
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml

178
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/PartyAbilityGridMonthlyFormDTO.java

@ -0,0 +1,178 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dto.extract.form;
import java.io.Serializable;
import java.util.Date;
import com.epmet.commons.tools.constant.NumConstant;
import lombok.Data;
import java.math.BigDecimal;
/**
* 党建能力-网格相关事实表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-19
*/
@Data
public class PartyAbilityGridMonthlyFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ID 主键
*/
private String id;
/**
* 客户Id
*/
private String customerId;
/**
* 机关Id
*/
private String agencyId;
/**
* 网格Id
*/
private String gridId;
/**
* 月维度Id:yyyyMM
*/
private String monthId;
/**
* 季度Id yyyyQ1,yyyyQ2,yyyyQ3,yyyyQ4
*/
private String quarterId;
/**
* 年Idyyyy
*/
private String yearId;
/**
* 网格群众用户数
*/
private Integer userCount;
/**
* 网格党员用户数
*/
private Integer partyCount;
/**
* 网格活跃群众用户数
*/
private Integer activeUserCount;
/**
* 网格活跃党员用户数
*/
private Integer activePartyCount;
/**
* 网格党员人均提出话题数
*/
private Integer partyAvgTopicCount;
/**
* 网格群众人均提出话题数
*/
private Integer userAvgTopicCount;
/**
* 网格党员人均提出的议题转项目数
*/
private Integer partyAvgShiftProjectCount;
/**
* 网格群众人均提出的议题转项目数
*/
private Integer userAvgShiftProjectCount;
/**
* 建群党员数累计值 去重
*/
private Integer createGroupPartyCount;
/**
* 网格发文数
*/
private Integer publishArticleCount;
/**
* 网格议题转项目率
*/
private BigDecimal issueToProjectRatio;
/**
* 组织三会一课次数
*/
private Integer createThreeMeetsCount;
/**
* 党员参加三会一课人次
*/
private Integer joinThreeMeetsCount;
/**
* 删除标识 0未删除1已删除
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 更新人
*/
private String updatedBy;
public PartyAbilityGridMonthlyFormDTO() {
this.userCount = NumConstant.ZERO;
this.partyCount = NumConstant.ZERO;
this.activeUserCount = NumConstant.ZERO;
this.activePartyCount = NumConstant.ZERO;
this.partyAvgTopicCount = NumConstant.ZERO;
this.userAvgTopicCount = NumConstant.ZERO;
this.partyAvgShiftProjectCount = NumConstant.ZERO;
this.userAvgShiftProjectCount = NumConstant.ZERO;
this.createGroupPartyCount = NumConstant.ZERO;
this.publishArticleCount = NumConstant.ZERO;
this.issueToProjectRatio = new BigDecimal(NumConstant.ZERO);
this.createThreeMeetsCount = NumConstant.ZERO;
this.joinThreeMeetsCount = NumConstant.ZERO;
this.delFlag = NumConstant.ZERO_STR;
this.revision = NumConstant.ZERO;
this.createdBy = "APP_USER";
this.updatedBy = "APP_USER";
}
}

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

@ -0,0 +1,25 @@
package com.epmet.dto.extract.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2020/9/19 1:55 下午
*/
@Data
public class CreateTopicCountResultDTO implements Serializable {
private static final long serialVersionUID = 500844515980125608L;
/**
* 网格ID
*/
private String gridId;
/**
* 网格 党员/群众 人均提出话题数
*/
private Integer createTopicCount;
}

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

@ -0,0 +1,45 @@
package com.epmet.dto.extract.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2020/9/19 10:59 上午
*/
@Data
public class GridUserCountResultDTO implements Serializable {
private static final long serialVersionUID = -2912049598149499392L;
/**
* 注册居民本月增量
*/
private Integer userCount;
/**
* 注册党员本月增量
*/
private Integer partyCount;
/**
* 网格ID
*/
private String gridId;
/**
* 月份ID
*/
private String monthId;
/**
* 季度ID
*/
private String quarterId;
/**
* 年度ID
*/
private String yearId;
}

11
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java

@ -18,6 +18,7 @@
package com.epmet.dao.evaluationindex.extract; package com.epmet.dao.evaluationindex.extract;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity; import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -64,4 +65,14 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
* @Date 2020/9/18 11:05 * @Date 2020/9/18 11:05
**/ **/
List<Map<String, Integer>> selectPartyCreateTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId); List<Map<String, Integer>> selectPartyCreateTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @Description 查询网格 党员/群众 人均提出话题数
* @param customerId
* @param monthId
* @param isParty
* @author zxc
* @date 2020/9/19 1:58 下午
*/
List<CreateTopicCountResultDTO> selectCreateTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId,@Param("isParty")Integer isParty);
} }

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java

@ -19,6 +19,7 @@ package com.epmet.dao.evaluationindex.indexcoll;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO; import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
import com.epmet.dto.indexcal.CalculateCommonFormDTO; import com.epmet.dto.indexcal.CalculateCommonFormDTO;
import com.epmet.dto.indexcal.PageQueryGridFormDTO; import com.epmet.dto.indexcal.PageQueryGridFormDTO;
import com.epmet.dto.indexcollect.form.GridGovrnAbilityFormDTO; import com.epmet.dto.indexcollect.form.GridGovrnAbilityFormDTO;
@ -110,4 +111,11 @@ public interface FactIndexGovrnAblityGridMonthlyDao extends BaseDao<FactIndexGov
* @date 2020/9/18 10:47 上午 * @date 2020/9/18 10:47 上午
*/ */
List<GovernAbilityGridMonthlyFormDTO> selectAllGridInfo(String customerId); List<GovernAbilityGridMonthlyFormDTO> selectAllGridInfo(String customerId);
/**
* @Description 查询全部网格信息
* @param customerId
* @author zxc
* @date 2020/9/19 10:50 上午
*/
List<PartyAbilityGridMonthlyFormDTO> selectAllGridInfoToParty(String customerId);
} }

18
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyDao.java

@ -18,6 +18,7 @@
package com.epmet.dao.evaluationindex.indexcoll; package com.epmet.dao.evaluationindex.indexcoll;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
import com.epmet.dto.indexcal.CalculateCommonFormDTO; import com.epmet.dto.indexcal.CalculateCommonFormDTO;
import com.epmet.dto.indexcal.PageQueryGridFormDTO; import com.epmet.dto.indexcal.PageQueryGridFormDTO;
import com.epmet.dto.indexcollect.form.GridPartyAbilityFormDTO; import com.epmet.dto.indexcollect.form.GridPartyAbilityFormDTO;
@ -97,4 +98,21 @@ public interface FactIndexPartyAblityGridMonthlyDao extends BaseDao<FactIndexPar
* @Date 2020/9/2 14:45 * @Date 2020/9/2 14:45
**/ **/
String selectTheOneGrid(CalculateCommonFormDTO formDTO); String selectTheOneGrid(CalculateCommonFormDTO formDTO);
/**
* @Description 网格党建能力插入
* @param lists
* @author zxc
* @date 2020/9/19 10:32 上午
*/
void insertPartyAbility(@Param("lists") List<PartyAbilityGridMonthlyFormDTO> lists);
/**
* @Description 删除旧的党建能力记录
* @param customerId
* @param monthId
* @author zxc
* @date 2020/9/19 10:45 上午
*/
void deleteOldPartyAbility(@Param("customerId")String customerId,@Param("monthId")String monthId);
} }

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/user/FactRegUserGridMonthlyDao.java

@ -18,6 +18,7 @@
package com.epmet.dao.stats.user; package com.epmet.dao.stats.user;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.extract.result.GridUserCountResultDTO;
import com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO; import com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO;
import com.epmet.entity.stats.user.FactRegUserGridMonthlyEntity; import com.epmet.entity.stats.user.FactRegUserGridMonthlyEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -38,4 +39,13 @@ public interface FactRegUserGridMonthlyDao extends BaseDao<FactRegUserGridMonthl
void deleteByParams(@Param("monthId")String monthId,@Param("customerId")String customerId); void deleteByParams(@Param("monthId")String monthId,@Param("customerId")String customerId);
/**
* @Description 查询网格下的客户
* @param customerId
* @param monthId
* @author zxc
* @date 2020/9/19 11:10 上午
*/
List<GridUserCountResultDTO> selectGridUserCount(String customerId, String monthId);
} }

11
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicMainDailyService.java

@ -19,6 +19,7 @@ package com.epmet.service.evaluationindex.extract;
import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.dto.extract.form.ExtractFormDTO; import com.epmet.dto.extract.form.ExtractFormDTO;
import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity; import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
import java.util.List; import java.util.List;
@ -50,4 +51,14 @@ public interface FactOriginTopicMainDailyService extends BaseService<FactOriginT
* @Date 2020/9/18 11:03 * @Date 2020/9/18 11:03
**/ **/
List<Map<String, Integer>> selectPartyCreateTopicCount(String customerId, String monthId); List<Map<String, Integer>> selectPartyCreateTopicCount(String customerId, String monthId);
/**
* @Description 查询网格 党员/群众 人均提出话题数
* @param customerId
* @param monthId
* @param isParty
* @author zxc
* @date 2020/9/19 1:58 下午
*/
List<CreateTopicCountResultDTO> selectCreateTopicCount(String customerId, String monthId,Integer isParty);
} }

58
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java

@ -7,13 +7,13 @@ import com.epmet.constant.DataSourceConstant;
import com.epmet.constant.ExtractConstant; import com.epmet.constant.ExtractConstant;
import com.epmet.constant.ProjectEvaluateConstant; import com.epmet.constant.ProjectEvaluateConstant;
import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao; import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao;
import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthlyDao;
import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO; import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
import com.epmet.dto.extract.form.GridIssueCountResultDTO; import com.epmet.dto.extract.form.GridIssueCountResultDTO;
import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
import com.epmet.dto.extract.result.*; import com.epmet.dto.extract.result.*;
import com.epmet.service.evaluationindex.extract.CalGridIndexService; import com.epmet.service.evaluationindex.extract.*;
import com.epmet.service.evaluationindex.extract.FactOriginProjectLogDailyService; import com.epmet.service.stats.user.FactRegUserGridMonthlyService;
import com.epmet.service.evaluationindex.extract.FactOriginProjectMainDailyService;
import com.epmet.service.evaluationindex.extract.IssueExtractService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -41,9 +41,15 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
@Autowired @Autowired
private FactIndexGovrnAblityGridMonthlyDao governAbilityDao; private FactIndexGovrnAblityGridMonthlyDao governAbilityDao;
@Autowired @Autowired
private FactIndexPartyAblityGridMonthlyDao partyAbilityGridDao;
@Autowired
private FactOriginProjectMainDailyService projectMainService; private FactOriginProjectMainDailyService projectMainService;
@Autowired @Autowired
private FactOriginProjectLogDailyService projectLogService; private FactOriginProjectLogDailyService projectLogService;
@Autowired
private FactRegUserGridMonthlyService userGridMonthlyService;
@Autowired
private FactOriginTopicMainDailyService topicMainService;
/** /**
* @Description 计算网格指标党建能力 * @Description 计算网格指标党建能力
@ -54,7 +60,49 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
*/ */
@Override @Override
public Boolean calGridIndexPartyAbility(String customerId, String monthId) { public Boolean calGridIndexPartyAbility(String customerId, String monthId) {
return null; List<PartyAbilityGridMonthlyFormDTO> result = governAbilityDao.selectAllGridInfoToParty(customerId);
if (CollectionUtils.isEmpty(result)){
throw new RenException("客户【"+customerId+"】未查出网格信息");
}
// 网格群众用户数 , 网格党员用户数
List<GridUserCountResultDTO> gridUserCountList = userGridMonthlyService.selectGridUserCount(customerId, monthId);
// 网格党员人均提出话题数
List<CreateTopicCountResultDTO> partyCreateTopicCountList = topicMainService.selectCreateTopicCount(customerId, monthId, NumConstant.ONE);
// 网格群众人均提出话题数
List<CreateTopicCountResultDTO> massCreateTopicCountList = topicMainService.selectCreateTopicCount(customerId, monthId, NumConstant.ZERO);
result.forEach(r -> {
// 1. 网格群众用户数 , 网格党员用户数
if (!CollectionUtils.isEmpty(gridUserCountList)){
gridUserCountList.forEach(count -> {
if (r.getGridId().equals(count.getGridId())){
BeanUtils.copyProperties(count,r);
}
});
}
// 2. 网格党员人均提出话题数
if (!CollectionUtils.isEmpty(partyCreateTopicCountList)){
partyCreateTopicCountList.forEach(party -> {
if (r.getGridId().equals(party.getGridId())){
r.setPartyAvgTopicCount(party.getCreateTopicCount());
}
});
}
// 3. 网格群众人均提出话题数
if (!CollectionUtils.isEmpty(massCreateTopicCountList)){
massCreateTopicCountList.forEach(mass -> {
if (r.getGridId().equals(mass.getGridId())){
r.setUserAvgTopicCount(mass.getCreateTopicCount());
}
});
}
});
return true;
} }
/** /**

14
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginTopicMainDailyServiceImpl.java

@ -29,6 +29,7 @@ import com.epmet.constant.IndexCalConstant;
import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao; import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao;
import com.epmet.dao.evaluationindex.extract.FactOriginTopicMainDailyDao; import com.epmet.dao.evaluationindex.extract.FactOriginTopicMainDailyDao;
import com.epmet.dto.extract.form.ExtractFormDTO; import com.epmet.dto.extract.form.ExtractFormDTO;
import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
import com.epmet.dto.org.GridInfoDTO; import com.epmet.dto.org.GridInfoDTO;
import com.epmet.dto.topic.TopicOriginInfoDTO; import com.epmet.dto.topic.TopicOriginInfoDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity; import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
@ -239,4 +240,17 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
public List<Map<String, Integer>> selectPartyCreateTopicCount(String customerId, String monthId) { public List<Map<String, Integer>> selectPartyCreateTopicCount(String customerId, String monthId) {
return baseDao.selectPartyCreateTopicCount(customerId,monthId); return baseDao.selectPartyCreateTopicCount(customerId,monthId);
} }
/**
* @Description 查询网格 党员/群众 人均提出话题数
* @param customerId
* @param monthId
* @param isParty
* @author zxc
* @date 2020/9/19 1:58 下午
*/
@Override
public List<CreateTopicCountResultDTO> selectCreateTopicCount(String customerId, String monthId,Integer isParty) {
return baseDao.selectCreateTopicCount(customerId, monthId, isParty);
}
} }

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/FactRegUserGridMonthlyService.java

@ -19,6 +19,7 @@ package com.epmet.service.stats.user;
import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.extract.result.GridUserCountResultDTO;
import com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO; import com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO;
import com.epmet.entity.stats.user.FactRegUserGridMonthlyEntity; import com.epmet.entity.stats.user.FactRegUserGridMonthlyEntity;
@ -93,4 +94,13 @@ public interface FactRegUserGridMonthlyService extends BaseService<FactRegUserGr
* @date 2020-06-17 * @date 2020-06-17
*/ */
void delete(String[] ids); void delete(String[] ids);
/**
* @Description 查询网格下的客户
* @param customerId
* @param monthId
* @author zxc
* @date 2020/9/19 11:10 上午
*/
List<GridUserCountResultDTO> selectGridUserCount(String customerId,String monthId);
} }

13
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/user/impl/FactRegUserGridMonthlyServiceImpl.java

@ -24,6 +24,7 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.stats.user.FactRegUserGridMonthlyDao; import com.epmet.dao.stats.user.FactRegUserGridMonthlyDao;
import com.epmet.dto.extract.result.GridUserCountResultDTO;
import com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO; import com.epmet.dto.stats.user.FactRegUserGridMonthlyDTO;
import com.epmet.entity.stats.user.FactRegUserGridMonthlyEntity; import com.epmet.entity.stats.user.FactRegUserGridMonthlyEntity;
import com.epmet.service.stats.user.FactRegUserGridMonthlyService; import com.epmet.service.stats.user.FactRegUserGridMonthlyService;
@ -99,4 +100,16 @@ public class FactRegUserGridMonthlyServiceImpl extends BaseServiceImpl<FactRegUs
baseDao.deleteBatchIds(Arrays.asList(ids)); baseDao.deleteBatchIds(Arrays.asList(ids));
} }
/**
* @Description 查询网格下的客户
* @param customerId
* @param monthId
* @author zxc
* @date 2020/9/19 11:10 上午
*/
@Override
public List<GridUserCountResultDTO> selectGridUserCount(String customerId, String monthId) {
return baseDao.selectGridUserCount(customerId, monthId);
}
} }

15
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml

@ -78,4 +78,19 @@
GROUP BY GROUP BY
T1.CREATE_TOPIC_USER_ID T1.CREATE_TOPIC_USER_ID
</select> </select>
<!-- 查询网格 党员/群众 人均提出话题数 -->
<select id="selectCreateTopicCount" resultType="com.epmet.dto.extract.result.CreateTopicCountResultDTO">
SELECT
ROUND(( COUNT( ID ) / COUNT( DISTINCT ( CREATE_TOPIC_USER_ID ))), 0 ) AS createTopic,
GRID_ID
FROM
fact_origin_topic_main_daily
WHERE
DEL_FLAG = '0'
AND CUSTOMER_ID = #{customerId}
AND MONTH_ID = #{monthId}
AND CREATE_TOPIC_USER_IS_PARTY = #{isParty}
GROUP BY GRID_ID
</select>
</mapper> </mapper>

13
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml

@ -174,4 +174,17 @@
DEL_FLAG = 0 DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId} AND CUSTOMER_ID = #{customerId}
</select> </select>
<!-- 查询全部网格信息 -->
<select id="selectAllGridInfoToParty" resultType="com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO">
SELECT
scg.CUSTOMER_ID,
scg.GRID_ID,
scg.PARENT_AGENCY_ID AS agencyId
FROM
screen_customer_grid scg
WHERE
DEL_FLAG = 0
AND CUSTOMER_ID = #{customerId}
</select>
</mapper> </mapper>

73
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyDao.xml

@ -193,4 +193,77 @@
AND m.CUSTOMER_ID =#{customerId} AND m.CUSTOMER_ID =#{customerId}
AND m.MONTH_ID =#{monthId} AND m.MONTH_ID =#{monthId}
</select> </select>
<!-- 网格党建能力插入 -->
<insert id="insertPartyAbility">
INSERT INTO fact_index_party_ablity_grid_monthly (
ID,
CUSTOMER_ID,
AGENCY_ID,
GRID_ID,
MONTH_ID,
QUARTER_ID,
YEAR_ID,
USER_COUNT,
PARTY_COUNT,
ACTIVE_USER_COUNT,
ACTIVE_PARTY_COUNT,
PARTY_AVG_TOPIC_COUNT,
USER_AVG_TOPIC_COUNT,
PARTY_AVG_SHIFT_PROJECT_COUNT,
USER_AVG_SHIFT_PROJECT_COUNT,
CREATE_GROUP_PARTY_COUNT,
PUBLISH_ARTICLE_COUNT,
ISSUE_TO_PROJECT_RATIO,
CREATE_THREE_MEETS_COUNT,
JOIN_THREE_MEETS_COUNT,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
)
VALUES
<foreach collection="lists" item="item" separator=",">
(
REPLACE ( UUID(), '-', '' ),
#{item.customerId},
#{item.agencyId},
#{item.gridId},
#{item.monthId},
#{item.quarterId},
#{item.yearId},
#{item.userCount},
#{item.partyCount},
#{item.activeUserCount},
#{item.activePartyCount},
#{item.partyAvgTopicCount},
#{item.userAvgTopicCount},
#{item.partyAvgShiftProjectCount},
#{item.userAvgShiftProjectCount},
#{item.createGroupPartyCount},
#{item.publishArticleCount},
#{item.issueToProjectRatio},
#{item.createThreeMeetsCount},
#{item.joinThreeMeetsCount},
#{item.delFlag},
#{item.revision},
#{item.createdBy},
NOW(),
#{item.updatedBy},
NOW()
)
</foreach>
</insert>
<!-- 删除旧的党建能力记录 -->
<delete id="deleteOldPartyAbility">
DELETE
FROM
fact_index_party_ablity_grid_monthly
WHERE
CUSTOMER_ID = #{customerId}
AND MONTH_ID = #{monthId}
</delete>
</mapper> </mapper>

17
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/user/FactRegUserGridMonthlyDao.xml

@ -106,5 +106,22 @@
</if> </if>
</delete> </delete>
<!-- 查询网格下的客户 -->
<select id="selectGridUserCount" resultType="com.epmet.dto.extract.result.GridUserCountResultDTO">
SELECT
REG_INCR,
PARTYMEMBER_INCR,
GRID_ID,
MONTH_ID,
QUARTER_ID,
YEAR_ID
FROM
fact_reg_user_grid_monthly
WHERE
DEL_FLAG = '0'
AND CUSTOMER_ID = #{customerId}
AND MONTH_ID = #{monthId}
</select>
</mapper> </mapper>
Loading…
Cancel
Save