Merge branch 'xjchen' into 'develop'

首页echart图20230807

See merge request !27

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/IndexController.java

 package com.censoft.censoftrongtong.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.LedgerProject;
 import com.censoft.censoftrongtong.service.ILedgerBuildingService;
 import com.censoft.censoftrongtong.service.ILedgerProjectService;
@@ -130,47 +129,41 @@ public class IndexController extends BaseController {
         Map<String, Object> map_rs = new HashMap<>();
         List<Map<String,String>> list_rs=new ArrayList<>();
         List<String> legendList=new ArrayList<>();
-        List<LedgerBuilding> list1=new ArrayList<>();
-        List<LedgerProject> list2=new ArrayList<>();
-        MPJLambdaWrapper<LedgerBuilding> queryWrapper=new MPJLambdaWrapper<>();
-        MPJLambdaWrapper<LedgerProject> queryWrapper1=new MPJLambdaWrapper<>();
+        List<LedgerProject> list=new ArrayList<>();
+        MPJLambdaWrapper<LedgerProject> queryWrapper=new MPJLambdaWrapper<>();
         if(statisticsType!=null&&statisticsType.equals("city")){
             queryWrapper=new MPJLambdaWrapper<>();
-            queryWrapper.select("count(*) num").select(LedgerProject::getCity).leftJoin(LedgerProject.class,LedgerProject::getId,LedgerBuilding::getProjectId).groupBy(LedgerBuilding::getCity);
-            //.eq(LedgerBuilding::getProjectId,1);
-             list1=ledgerBuildingService.selectJoinList(LedgerBuilding.class,queryWrapper);
-            if (list1!=null&&list1.size() > 0) {
-                for (int i = 0; i < list1.size(); i++) {
-                    Map<String,String> map_item=new HashMap<>();
-                    LedgerBuilding ledgerBuilding=list1.get(i);
-                    map_item.put("name",ledgerBuilding.getCity());
-                    legendList.add(ledgerBuilding.getCity());
-
-                    map_item.put("value",ledgerBuilding.getNum());
-                    list_rs.add(map_item);
+            queryWrapper.select("count(*) num").select(LedgerProject::getCity).groupBy(LedgerProject::getCity);
 
-                }
-            }
+             list=ledgerProjectService.selectJoinList(LedgerProject.class,queryWrapper);
 
         }else{
-            queryWrapper1=new MPJLambdaWrapper<>();
-            queryWrapper1.select("count(*) num").select(SysDept::getDeptName).leftJoin(SysDept.class,SysDept::getDeptId,LedgerProject::getDeptId).groupBy(LedgerProject::getDeptId);
-            //.eq(LedgerBuilding::getProjectId,1);
-            list2=ledgerProjectService.selectJoinList(LedgerProject.class,queryWrapper1);
-            if (list2!=null&&list2.size() > 0) {
-                for (int i = 0; i < list2.size(); i++) {
-                    Map<String,String> map_item=new HashMap<>();
-                    LedgerProject ledgerProject=list2.get(i);
+            queryWrapper=new MPJLambdaWrapper<>();
+            queryWrapper.select("count(*) num").select(SysDept::getDeptName).leftJoin(SysDept.class,SysDept::getDeptId,LedgerProject::getDeptId).groupBy(LedgerProject::getDeptId);
+            list=ledgerProjectService.selectJoinList(LedgerProject.class,queryWrapper);
 
-                        map_item.put("name",ledgerProject.getDeptName());
-                        legendList.add(ledgerProject.getDeptName());
 
-                    map_item.put("value",ledgerProject.getNum());
-                    list_rs.add(map_item);
+        }
+
+        if (list!=null&&list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                Map<String,String> map_item=new HashMap<>();
+                LedgerProject ledgerProject=list.get(i);
 
+                if(statisticsType!=null&&statisticsType.equals("city")){
+                    map_item.put("name",ledgerProject.getCity());
+                    legendList.add(ledgerProject.getCity());
+                }else{
+                    map_item.put("name",ledgerProject.getDeptName());
+                    legendList.add(ledgerProject.getDeptName());
                 }
-            }
 
+
+
+                map_item.put("value",ledgerProject.getNum());
+                list_rs.add(map_item);
+
+            }
         }
 
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -20,6 +20,8 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
+
 /**
  * 风险计划Service业务层处理
  *
@@ -62,6 +64,7 @@ public class RiskPlanServiceImpl extends MPJBaseServiceImpl<RiskPlanMapper, Risk
      */
     @Override
     public List<RiskPlanAppTaskDetailsDto> selectRiskPlanList(RiskPlan riskPlan) {
+        riskPlan.setCreateUserId(getLoginUser().getUserId());
         return riskPlanMapper.selectRiskPlanList(riskPlan);
     }
 

censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml

@@ -54,7 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ( SELECT GROUP_CONCAT( nick_name ) FROM sys_user WHERE FIND_IN_SET( user_id, rp.work_user_ids ) ) AS workUserNames,
         rp.start_time AS startTime,
         rp.end_time AS endTime,
-        rp.status
+        rp.status,
+        rp.create_user_id
         FROM
         risk_plan rp
         LEFT JOIN sys_user su1 ON su1.user_id = rp.create_user_id