fit:配置文件！

assembly/src/main/resources/application-dev.yml

@@ -95,7 +95,8 @@ security:
       - /druid/*
       - /hystrix/*
       - /api/file/v1/*
-      - /api/fdTemplateExport/v1/importExcel
+      - /api/surveyFdTemplateExport/v1/*
+      - /api/surveyTemplateExport/v1/*
 
 #业务中台 配置信息
 qzSetting:

assistMg/src/main/java/com/hotent/enterpriseDeclare/controller/HomeController.java

@@ -5,6 +5,7 @@ import com.hotent.base.annotation.ApiGroup;
 import com.hotent.base.constants.ApiGroupConsts;
 import com.hotent.base.model.CommonResult;
 import com.hotent.project.manager.CostProjectTaskManager;
+import com.hotent.project.model.CostNotice;
 import com.hotent.project.model.CostProjectTask;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,10 +15,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 @Api(tags = "首页")
 @RestController
-@RequestMapping("/api/enterprise/home")
+@RequestMapping("/api/enterprise/home/")
 @ApiGroup(group = {ApiGroupConsts.GROUP_COST})
 public class HomeController {
 
@@ -25,13 +27,35 @@ public class HomeController {
     @Autowired
     private CostProjectTaskManager costProjectTaskManager;
 
+
     /**
-     * 代办
+     * 办理统计
+     */
+    @GetMapping(value = "/doChartList")
+    public CommonResult<List<Map<String, Object>>> getDoChartList(
+            @RequestParam(required = false) String year,
+            @RequestParam(required = false) String region
+    ) {
+        return CommonResult.<List<Map<String, Object>>>ok().value(costProjectTaskManager.getDoChartList(year,region));
+    }
 
+
+    /**
+     * 消息接口
+     */
+    @GetMapping(value = "/doMsgList")
+    public CommonResult<List<CostNotice>> getDoMsgList() {
+        return CommonResult.<List<CostNotice>>ok().value(costProjectTaskManager.getDoMsgList());
+
+    }
+
+    /**
+     * 代办
      */
     @GetMapping(value = "/doList")
     public CommonResult<List<CostProjectTask>> getDoList(@RequestParam(required = false) String projectId) {
         return CommonResult.<List<CostProjectTask>>ok().value(costProjectTaskManager.getDoList(projectId));
-
     }
+
+
 }

assistMg/src/main/java/com/hotent/project/manager/CostProjectTaskManager.java

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hotent.baseInfo.req.CostTaskSearchReq;
 import com.hotent.enterpriseDeclare.req.CostTaskPageReq;
 import com.hotent.enterpriseDeclare.req.CostTaskReviewPageReq;
+import com.hotent.project.model.CostNotice;
 import com.hotent.project.model.CostProjectTask;
 import com.hotent.base.manager.BaseManager;
 import com.hotent.project.model.CostProjectTaskPreliminaryOpinion;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目任务表 服务类
@@ -37,4 +39,9 @@ public interface CostProjectTaskManager extends BaseManager<CostProjectTask> {
 	Integer countForReviewTask(CostTaskReviewPageReq req);
 
     List<CostProjectTask> getDoList(String projectId);
+
+	List<Map<String, Object>> getDoChartList(String year, String region);
+
+	List<CostNotice> getDoMsgList();
+
 }

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskManagerImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hotent.base.manager.impl.BaseManagerImpl;
 import com.hotent.base.util.AuthenticationUtil;
 import com.hotent.base.util.StringUtil;
+import com.hotent.baseInfo.manager.CostCatalogManager;
+import com.hotent.baseInfo.model.CostCatalog;
 import com.hotent.baseInfo.req.CostTaskSearchReq;
 import com.hotent.constant.NodeConstant;
 import com.hotent.constant.TaskStatusConstant;
@@ -13,10 +15,7 @@ import com.hotent.enterpriseDeclare.req.CostTaskPageReq;
 import com.hotent.enterpriseDeclare.req.CostTaskReviewPageReq;
 import com.hotent.project.dao.CostProjectTaskDao;
 import com.hotent.project.manager.*;
-import com.hotent.project.model.CostProjectApproval;
-import com.hotent.project.model.CostProjectTask;
-import com.hotent.project.model.CostProjectTaskMaterial;
-import com.hotent.project.model.CostProjectTaskPreliminaryOpinion;
+import com.hotent.project.model.*;
 import com.hotent.project.resp.CostProjectApprovalDetailResp;
 import com.hotent.surveyinfo.manager.CostSurveyTemplateUploadManager;
 import com.hotent.surveyinfo.model.CostSurveyTemplateUpload;
@@ -75,6 +74,9 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
     @Autowired
     private OrgManager orgManager;
 
+    @Autowired
+    private CostCatalogManager costCatalogManager;
+
 
     @Override
     public List<CostProjectTask> getTaskList(CostTaskSearchReq req) throws Exception {
@@ -752,4 +754,90 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
 
     }
 
+    @Override
+    public List<Map<String, Object>> getDoChartList(String year, String region) {
+        List<CostCatalog> list = costCatalogManager.list(
+            new LambdaQueryWrapper<CostCatalog>().eq( CostCatalog::getParentId,"1969351600934948833")
+        );
+        List<Map<String, Object>> maps = new ArrayList<>();
+
+        for (CostCatalog costCatalog : list) {
+            // 递归获取所有下级目录ID
+            List<String> allCatalogIds = getAllChildCatalogIds(costCatalog.getCatalogId());
+
+            // 通过项目立项表关联查询目录
+            List<CostProjectApproval> approvals = costProjectApprovalManager.list(
+                new LambdaQueryWrapper<CostProjectApproval>()
+                    .in(CostProjectApproval::getCatalogId, allCatalogIds)
+                    .eq(CostProjectApproval::getIsDeleted, "0")
+            );
+
+            if (approvals.isEmpty()) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("name", costCatalog.getCatalogName());
+                map.put("finish", 0);
+                map.put("nFinish", 0);
+                maps.add(map);
+                continue;
+            }
+
+            List<String> projectIds = approvals.stream()
+                .map(CostProjectApproval::getProjectId)
+                .collect(Collectors.toList());
+
+            // 查询子任务
+            LambdaQueryWrapper<CostProjectTask> taskQuery = new LambdaQueryWrapper<>();
+            taskQuery.eq(CostProjectTask::getIsDeleted, "0")
+                    .ne(CostProjectTask::getPid, "0")
+                    .in(CostProjectTask::getProjectId, projectIds);
+            if (StringUtil.isNotEmpty(year)) {
+                taskQuery.eq(CostProjectTask::getYear, year);
+            }
+
+            List<CostProjectTask> tasks = this.list(taskQuery);
+
+            // 统计完成和未完成的任务
+            long finishCount = tasks.stream()
+                .filter(task -> TaskStatusConstant.COMPLETED.getStatusCode().equals(task.getStatus()))
+                .count();
+            long nFinishCount = tasks.size() - finishCount;
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("name", costCatalog.getCatalogName());
+            map.put("finish", finishCount);
+            map.put("nFinish", nFinishCount);
+            maps.add(map);
+        }
+        return maps;
+    }
+
+    @Override
+    public List<CostNotice> getDoMsgList() {
+        // 获取当前用户
+        IUser currentUser = ContextUtil.getCurrentUser();
+        String currentUserId = currentUser.getUserId();
+
+        // 查询发送给当前用户的消息
+        LambdaQueryWrapper<CostNotice> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CostNotice::getIsDeleted, "0")
+//                   .eq(CostNotice::getSendTarget, currentUserId)
+                   .orderByDesc(CostNotice::getCreateTime)
+                    .last("limit 8");
+        return costNoticeManager.list(queryWrapper);
+    }
+
+    private List<String> getAllChildCatalogIds(String catalogId) {
+        List<String> result = new ArrayList<>();
+        result.add(catalogId);
+
+        List<CostCatalog> children = costCatalogManager.list(
+            new LambdaQueryWrapper<CostCatalog>().eq(CostCatalog::getParentId, catalogId)
+        );
+
+        for (CostCatalog child : children) {
+            result.addAll(getAllChildCatalogIds(child.getCatalogId()));
+        }
+
+        return result;
+    }
 }

assistMg/src/main/resources/application-dev.yml

@@ -21,7 +21,7 @@ spring:
               multiStatementAllow: true
             #public-key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAIobgl5Uq9fEW2V6dLXqWJKDUZGAA3CCVasj1Yxge3STiWZ1plhxBUQgNgyRYeEUrUHzYPozfm0kL/zLlHMzcnUCAwEAAQ==
   redis:
-    database: 1
+    database: 3
     host: 192.168.5.233
     port: 6379
     password: 123456
@@ -41,7 +41,7 @@ spring:
     namesrvAddr: 127.0.0.1:9876
 
 server:
-  port: 8089
+  port: 9506
 
 # 1. redis.enable=false 时无论redis.caffeine.enabled配置为true还是false均使用caffeine作为缓存
 # 2. redis.enable=true 且 redis.caffeine.enabled=false 仅仅使用redis作为缓存

auth-server/src/main/resources/application-dev.yml

@@ -21,7 +21,7 @@ spring:
   #              #开启druid允许执行多条SQL
   #              multiStatementAllow: true
   redis:
-    database: 6
+    database: 3
     host: 127.0.0.1
     port: 6379
     password:

base/src/main/resources/config/application.yml

@@ -72,7 +72,7 @@ spring:
 
 # 服务端端口
 server:
-  port: 8089
+  port: 9506
   address: 0.0.0.0
   # 链接建立超时时间（单位：毫秒）
   connection-timeout: 30000
@@ -231,6 +231,15 @@ system:
       - cost_project_task_material
       - cost_project_task_node
       - cost_project_task_proccess
+      - cost_project_task_evidence
+      - cost_project_task_adjustment_record
+      - cost_project_task_draft
+      - cost_project_task_preliminary_opinion
+      - cost_project_task_material_detail
+      - cost_project_task_material_summary
+      - cost_survey_template_upload
+      - cost_audit_period_record
+      - cost_survey_fd_template_upload_data
   # 异步线程池配置
   thread:
     # 连接池最小线程数（设部署应用的服务器CPU内核数为N，该值设置为：2N+1）

portal/src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ spring:
 #              #开启druid允许执行多条SQL
 #              multiStatementAllow: true
   redis:
-    database: 6
+    database: 3
     host: localhost
     port: 6379
     password:

uc/src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ spring:
 #              #开启druid允许执行多条SQL
 #              multiStatementAllow: true
   redis:
-    database: 6
+    database: 3
     host: 192.168.1.211
     port: 6379
     password:
@@ -42,7 +42,7 @@ spring:
     namesrvAddr: 192.168.1.31:9876
 
 server:
-  port: 8089
+  port: 9506
 
 jms:
   enable: true