Merge branch 'dev_bugfix_ljj' into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovProjectController.java

@@ -114,9 +114,9 @@ public class GovProjectController {
 	 * @author sun
 	 */
 	@PostMapping("categoryprojectlist")
-	public Result<CategoryProjectResultDTO> categoryProjectList(@RequestBody CategoryProjectFormDTO formDTO) {
+	public Result<CategoryProjectResultDTO> categoryProjectList(@LoginUser TokenDto tokenDto, @RequestBody CategoryProjectFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO, CategoryProjectFormDTO.Category.class);
-        //formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        formDTO.setCustomerId(tokenDto.getCustomerId());
 		return new Result<CategoryProjectResultDTO>().ok(govProjectService.categoryProjectList(formDTO));
 	}
 

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

@@ -192,7 +192,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         do {
             //1.一千条一循环查询节点数据，封装每个组织对应数据
             projectEntity.setPageNo(pageNo);
-            processList = projectProcessService.getProcessList(projectEntity);
+            processList = projectProcessService.getProcessAgencyList(projectEntity);
             size = processList.size();
             pageNo++;
             //遍历删除项目节点表查询的无效数据
@@ -247,8 +247,8 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                 if (mapList.containsKey(agency.getId())) {
                     entity = mapList.get(agency.getId());
                     entity.setProjectTotal(entity.getProjectTotal() + projectTotal.intValue());
-                    entity.setPendingTotal(entity.getProjectTotal() - closedTotal.intValue());
                     entity.setClosedTotal(entity.getClosedTotal() + closedTotal.intValue());
+                    entity.setPendingTotal(entity.getProjectTotal() - entity.getClosedTotal());
                     if (projectTotal.intValue() > NumConstant.ZERO) {
                         entity.setPendingRatio(new BigDecimal(numberFormat.format((float) entity.getPendingTotal() / (float) entity.getProjectTotal())));
                         entity.setClosedRatio(new BigDecimal(numberFormat.format((float) entity.getClosedTotal() / (float) entity.getProjectTotal())));
@@ -286,7 +286,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         do {
             //3.一千条一循环查询项目数据，封装每个组织对应数据
             projectEntity.setPageNo(num);
-            projectList = projectService.getProjectList(projectEntity);
+            projectList = projectService.getProjectAgencyList(projectEntity);
             size = projectList.size();
             num++;
             //遍历删除项目主表查询的无效数据

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java

@@ -45,6 +45,7 @@ public interface ProjectProcessService extends BaseService<ProjectProcessEntity>
      * @Description 查询客户项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy-mm-dd格式字段值)
      **/
     List<ProjectProcessEntity> getProcessList(ProjectEntity projectEntity);
+    List<ProjectProcessEntity> getProcessAgencyList(ProjectEntity projectEntity);
 
     /**
      * 根据客户查询项目处理进展

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java

@@ -47,6 +47,7 @@ public interface ProjectService extends BaseService<ProjectEntity> {
      * @Description 根据客户Id查询客户项目业务表有效数据
      **/
     List<ProjectEntity> getProjectList(ProjectEntity projectEntity);
+    List<ProjectEntity> getProjectAgencyList(ProjectEntity projectEntity);
 
     /**
      * 已结案项目统计

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java

@@ -63,6 +63,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
      **/
     @Override
     public List<ProjectProcessEntity> getProcessList(ProjectEntity projectEntity) {
+        return baseDao.selectProcessList(projectEntity);
+    }
+    @Override
+    public List<ProjectProcessEntity> getProcessAgencyList(ProjectEntity projectEntity) {
         PageHelper.startPage(projectEntity.getPageNo(), projectEntity.getPageSize());
         return baseDao.selectProcessList(projectEntity);
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -55,6 +55,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 **/
 	@Override
 	public List<ProjectEntity> getProjectList(ProjectEntity projectEntity) {
+		return baseDao.selectProjectList(projectEntity);
+	}
+	@Override
+	public List<ProjectEntity> getProjectAgencyList(ProjectEntity projectEntity) {
 		PageHelper.startPage(projectEntity.getPageNo(), projectEntity.getPageSize());
 		return baseDao.selectProjectList(projectEntity);
 	}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java

@@ -140,7 +140,7 @@ public interface IssueVoteDetailDao extends BaseDao<IssueVoteDetailEntity> {
      * @author zxc
      * @date 2021/12/29 2:02 下午
      */
-    List<DailyStatisticalVoteJobResultDTO> statisticVote(@Param("customerId")String customerId,@Param("dateId")String dateId);
+    List<DailyStatisticalVoteJobResultDTO> statisticVote(@Param("customerId")String customerId,@Param("dateId")String dateId,@Param("status")Boolean status);
 
     /**
      * @Description  根据议题ID查询折线图一天的数据

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -339,12 +340,12 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
             List<String> daysBetween = DateUtils.getDaysBetween(form.getStartDate(), form.getEndDate());
             customerIds.forEach(customerId -> {
                 daysBetween.forEach(dateId -> {
-                    statisticVote(customerId,dateId);
+                    statisticVote(customerId,yyyyMMddToLine(dateId));
                 });
             });
         }else {
             if (StringUtils.isBlank(form.getDateId())){
-                form.setDateId(LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", ""));
+                form.setDateId(LocalDate.now().minusDays(NumConstant.ONE).toString());
             }
             customerIds.forEach(customerId -> {
                 statisticVote(customerId, form.getDateId());
@@ -352,6 +353,14 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
         }
     }
 
+    public String yyyyMMddToLine(String dateId){
+        StringBuilder sb = new StringBuilder();
+        sb.append(dateId.substring(0,4)).append(StrConstant.HYPHEN);
+        sb.append(dateId.substring(4,6)).append(StrConstant.HYPHEN);
+        sb.append(dateId.substring(6,8));
+        return sb.toString();
+    }
+
     /**
      * @Description  统计 issue_vote_statistical_daily 表
      *               只统计表决日增存在的，不存在的不写入，查询程序补全
@@ -360,19 +369,24 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
      * @author zxc
      * @date 2021/12/29 1:46 下午
      */
-    @Transactional(rollbackFor = Exception.class)
     public void statisticVote(String customerId,String dateId){
         // 日增
-        List<DailyStatisticalVoteJobResultDTO> dayAdd = issueVoteDetailDao.statisticVote(customerId, dateId);
+        List<DailyStatisticalVoteJobResultDTO> dayAdd = issueVoteDetailDao.statisticVote(customerId, dateId, true);
         if (CollectionUtils.isNotEmpty(dayAdd)){
             //累计
-            List<DailyStatisticalVoteJobResultDTO> allDayAdd = issueVoteDetailDao.statisticVote(customerId, null);
+            List<DailyStatisticalVoteJobResultDTO> allDayAdd = issueVoteDetailDao.statisticVote(customerId, dateId, false);
             dayAdd.forEach(d -> allDayAdd.stream().filter(a -> a.getIssueId().equals(d.getIssueId())).forEach(a -> {
                 d.setOppositionCount(a.getOppositionCount());
                 d.setSupportCount(a.getSupportCount());
                 d.setTotalCount(a.getTotalCount());
             }));
             List<IssueVoteStatisticalDailyEntity> needInsert = ConvertUtils.sourceToTarget(dayAdd, IssueVoteStatisticalDailyEntity.class);
+            delAndInsert(needInsert,customerId,dateId);
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void delAndInsert(List<IssueVoteStatisticalDailyEntity> needInsert,String customerId,String dateId){
         Integer delNum;
         do {
             delNum = baseDao.delHistoryData(customerId, dateId);
@@ -382,6 +396,5 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
             baseDao.insertBatch(p);
         });
     }
-    }
 
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml

@@ -186,10 +186,10 @@
     <select id="statisticVote" resultType="com.epmet.dto.result.DailyStatisticalVoteJobResultDTO">
         SELECT
                vs.votable_count,
-               <if test="dateId == null">
+               <if test="status == false">
                    (t.oppositionCount + t.supportCount) AS totalCount,
                </if>
-               <if test="dateId != null">
+               <if test="status == true">
                     (t.oppositionIncrement + t.supportIncrement) AS todayIncrement,
                </if>
                t.* FROM
@@ -203,9 +203,12 @@
         FROM issue_vote_detail vd
         WHERE vd.DEL_FLAG = '0'
           AND vd.CUSTOMER_ID = #{customerId}
-          <if test="dateId != null">
+          <if test="status == true">
               AND DATE_FORMAT(vd.CREATED_TIME,'%Y-%m-%d') = #{dateId}
           </if>
+          <if test="status == false">
+              AND DATE_FORMAT(vd.CREATED_TIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{dateId}
+          </if>
         GROUP BY vd.ISSUE_ID)t
         INNER JOIN issue_vote_statistical vs ON (vs.ISSUE_ID = t.ISSUE_ID AND vs.DEL_FLAG = '0')
     </select>