累积更新

oa-back/pom.xml

@@ -178,19 +178,18 @@
                 <version>${cmc.version}</version>
             </dependency>
 
-            <!-- 智能体-->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-agent</artifactId>
-                <version>${cmc.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
                 <version>3.25.5</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>4.12.0</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-flowable</artifactId>
@@ -219,7 +218,6 @@
     <modules>
         <module>ruoyi-admin</module>
         <module>ruoyi-llm</module>
-        <module>ruoyi-agent</module>
         <module>ruoyi-framework</module>
         <module>ruoyi-system</module>
         <module>ruoyi-quartz</module>

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetController.java

@@ -1,10 +1,17 @@
 package com.ruoyi.web.controller.oa;
 
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.oa.domain.CmcSettle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
@@ -61,6 +68,46 @@ public class CmcBudgetController extends BaseController
         return success(cmcBudgetService.selectCmcBudgetByBudgetId(budgetId));
     }
 
+    /**
+     * 获取cmc结算审批详细信息
+     */
+    @GetMapping("/statistic")
+    public AjaxResult getBudgetStatistic(CmcBudget cmcBudget) throws ParseException {
+        JSONObject jsonObject = new JSONObject();
+        JSONArray yearArray = new JSONArray();
+        JSONObject yearObject = new JSONObject();
+        JSONArray amountArray = new JSONArray();
+        JSONObject amountObject = new JSONObject();
+        //每年借款金额
+        if (cmcBudget.getZjlTime() == null) {
+            for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+                cmcBudget.setZjlTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                yearObject.put(String.valueOf(i), cmcBudgetService.selectCmcBudgetList(cmcBudget).size());
+                BigDecimal amount = new BigDecimal(0);
+                for (CmcBudget budget : cmcBudgetService.selectCmcBudgetList(cmcBudget)) {
+                    if (budget.getTotalBudget() != null)
+                        amount = amount.add(budget.getTotalBudget());
+                }
+                amountObject.put(String.valueOf(i), amount);
+            }
+            cmcBudget.setZjlTime(null);
+        }
+        else {
+            yearObject.put(new SimpleDateFormat("yyyy").format(cmcBudget.getZjlTime()), cmcBudgetService.selectCmcBudgetList(cmcBudget).size());
+            BigDecimal amount = new BigDecimal(0);
+            for (CmcBudget budget : cmcBudgetService.selectCmcBudgetList(cmcBudget)) {
+                if (budget.getTotalBudget() != null)
+                    amount = amount.add(budget.getTotalBudget());
+            }
+            amountObject.put(new SimpleDateFormat("yyyy").format(cmcBudget.getZjlTime()), amount);
+        }
+        yearArray.add(yearObject);
+        amountArray.add(amountObject);
+        jsonObject.put("year", yearArray);
+        jsonObject.put("amount", amountArray);
+        return success(jsonObject);
+    }
+
     /**
      * 新增cmc预算管理
      */

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCheckController.java

@@ -1,7 +1,18 @@
 package com.ruoyi.web.controller.oa;
 
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.oa.domain.CmcBudget;
+import com.ruoyi.oa.domain.CmcCheck;
+import com.ruoyi.oa.domain.CmcSettle;
+import com.ruoyi.oa.service.ICmcBudgetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,7 +26,6 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.oa.domain.CmcCheck;
 import com.ruoyi.oa.service.ICmcCheckService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -33,6 +43,9 @@ public class CmcCheckController extends BaseController
     @Autowired
     private ICmcCheckService cmcCheckService;
 
+    @Autowired
+    private ICmcBudgetService cmcBudgetService;
+
     /**
      * 查询cmc项目核算列表
      */
@@ -65,6 +78,55 @@ public class CmcCheckController extends BaseController
         return success(cmcCheckService.selectCmcCheckByCheckId(checkId));
     }
 
+    /**
+     * 获取cmc核算审批详细信息
+     */
+    @GetMapping("/statistic")
+    public AjaxResult getCheckStatistic(CmcCheck cmcCheck) throws ParseException {
+        JSONObject jsonObject = new JSONObject();
+        JSONArray yearArray = new JSONArray();
+        JSONObject yearObject = new JSONObject();
+        JSONArray amountArray = new JSONArray();
+        JSONObject amountObject = new JSONObject();
+        JSONArray yearProjectCountArray = new JSONArray();
+        JSONObject yearProjectCountObject = new JSONObject();
+        JSONArray yearProjectAmountArray = new JSONArray();
+        JSONObject yearProjectAmountObject = new JSONObject();
+        //每年核算金额
+        if (cmcCheck.getCheckTime() == null) {
+            for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+                cmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse(String.valueOf(i)));
+                yearObject.put(String.valueOf(i), cmcCheckService.selectCmcCheckList(cmcCheck).size());
+                BigDecimal amount = new BigDecimal(0);
+                for (CmcCheck check : cmcCheckService.selectCmcCheckList(cmcCheck)) {
+                    if (check.getTotalAdjust() != null)
+                        amount = amount.add(check.getTotalAdjust());
+                }
+                amountObject.put(String.valueOf(i), amount);
+            }
+            cmcCheck.setCheckTime(null);
+        }
+        else {
+            yearObject.put(new SimpleDateFormat("yyyy").format(cmcCheck.getCheckTime()), cmcCheckService.selectCmcCheckList(cmcCheck).size());
+            BigDecimal amount = new BigDecimal(0);
+            for (CmcCheck check : cmcCheckService.selectCmcCheckList(cmcCheck)) {
+                if (check.getTotalAdjust() != null)
+                    amount = amount.add(check.getTotalAdjust());
+            }
+            amountObject.put(new SimpleDateFormat("yyyy").format(cmcCheck.getCheckTime()), amount);
+        }
+        getCheckProjectStatistic(cmcCheck, yearProjectCountObject, yearProjectAmountObject);
+        yearArray.add(yearObject);
+        amountArray.add(amountObject);
+        yearProjectCountArray.add(yearProjectCountObject);
+        yearProjectAmountArray.add(yearProjectAmountObject);
+        jsonObject.put("year", yearArray);
+        jsonObject.put("amount", amountArray);
+        jsonObject.put("yearProjectCount", yearProjectCountArray);
+        jsonObject.put("yearProjectAmount", yearProjectAmountArray);
+        return success(jsonObject);
+    }
+
     /**
      * 新增cmc项目核算
      */
@@ -94,4 +156,21 @@ public class CmcCheckController extends BaseController
     {
         return success(cmcCheckService.deleteCmcCheckByCheckIds(checkIds));
     }
+
+    public void getCheckProjectStatistic(CmcCheck cmcCheck, JSONObject yearProjectCountObject, JSONObject yearProjectAmountObject) throws ParseException {
+        if (cmcCheck.getCheckTime() == null)
+            cmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+        for (int i = 2019; i <= Calendar.getInstance().get(Calendar.YEAR); i++) {
+            BigDecimal pyAmount = new BigDecimal(0);
+            int count = 0;
+            for (CmcCheck check : cmcCheckService.selectCmcCheckList(cmcCheck)) {
+                if (check.getTotalAdjust() != null && check.getProjectNumber() != null && check.getProjectNumber().contains(String.valueOf(i))) {
+                    pyAmount = pyAmount.add(check.getTotalAdjust());
+                    count ++;
+                }
+            }
+            yearProjectCountObject.put(i + "项目", count);
+            yearProjectAmountObject.put(i + "项目", pyAmount);
+        }
+    }
 }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -67,6 +67,9 @@ public class CmcProjectController extends BaseController
     @Autowired
     private ICmcSettleService cmcSettleService;
 
+    @Autowired
+    private ICmcCheckService cmcCheckService;
+
     @Autowired
     private IFilesAchievementService filesAchievementService;
 
@@ -212,6 +215,8 @@ public class CmcProjectController extends BaseController
         JSONObject archiveObject = new JSONObject();
         JSONArray settleArray = new JSONArray();
         JSONObject settleObject = new JSONObject();
+        JSONArray checkArray = new JSONArray();
+        JSONObject checkObject = new JSONObject();
         //整体
         if (cmcProject.getProjectNumber() == null) {
             //每年项目数量
@@ -247,6 +252,12 @@ public class CmcProjectController extends BaseController
                 cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
                 List<CmcSettle> settleList = cmcSettleService.selectCmcSettleList(cmcSettle);
                 settleObject.put(String.valueOf(i), settleList.size());
+                //已核算
+                CmcCheck cmcCheck = new CmcCheck();
+                cmcCheck.setProjectNumber(String.valueOf(i));
+                cmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+                List<CmcCheck> checkList = cmcCheckService.selectCmcCheckList(cmcCheck);
+                checkObject.put(String.valueOf(i), checkList.size());
             }
             cmcProject.setProjectNumber(null);
 
@@ -284,6 +295,12 @@ public class CmcProjectController extends BaseController
             cmcSettle.setGmTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
             List<CmcSettle> settleList = cmcSettleService.selectCmcSettleList(cmcSettle);
             settleObject.put(cmcProject.getProjectNumber(), settleList.size());
+            //已核算
+            CmcCheck cmcCheck = new CmcCheck();
+            cmcCheck.setProjectNumber(cmcProject.getProjectNumber());
+            cmcCheck.setCheckTime(new SimpleDateFormat("yyyy").parse("2000-01-01"));
+            List<CmcCheck> checkList = cmcCheckService.selectCmcCheckList(cmcCheck);
+            checkObject.put(cmcProject.getProjectNumber(), checkList.size());
 
         }
         getProjectSourceStatistic(cmcProject, sourceObject);
@@ -296,6 +313,7 @@ public class CmcProjectController extends BaseController
         completeArray.add(completeObject);
         archiveArray.add(archiveObject);
         settleArray.add(settleObject);
+        checkArray.add(checkObject);
         jsonObject.put("year", yearArray);
         jsonObject.put("source", sourceArray);
         jsonObject.put("dept", deptArray);
@@ -303,6 +321,7 @@ public class CmcProjectController extends BaseController
         jsonObject.put("complete", completeArray);
         jsonObject.put("archive", archiveArray);
         jsonObject.put("settle", settleArray);
+        jsonObject.put("check", checkArray);
         return success(jsonObject);
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.oa.domain.CmcManageDept;
 import com.ruoyi.oa.service.ICmcManageDeptService;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,6 +44,9 @@ public class SysPostController extends BaseController
     @Autowired
     private  ISysUserService userService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     @Autowired
     private  ICmcManageDeptService cmcManageDeptService;
 
@@ -275,6 +279,9 @@ public class SysPostController extends BaseController
 
     public  List<SysUser> getManageId(String deptId, String partyAId) {
         List<SysUser> userList = new ArrayList<>();
+        Long parentId = deptService.selectDeptById(Long.valueOf(deptId)).getParentId();
+        if (parentId > 100)
+            deptId = parentId.toString();
         CmcManageDept cmcManageDept = new CmcManageDept();
         cmcManageDept.setDeptId(deptId);
         cmcManageDept.setPartyAId(partyAId);

oa-back/ruoyi-admin/src/main/resources/application.yml

@@ -7,8 +7,9 @@ cmc:
   # 版权年份
   copyrightYear: 2023
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-#  profile: /home/cmc/Java-server/综合办公/
-  profile: D:/ruoyi/uploadPath
+#  profile: /home/cmc/Java-server/综合办公
+  profile: /home/cmc/projects/cmc-oa
+#  profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -17,8 +18,8 @@ cmc:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
-#  port: 8086
+#  port: 8087
+  port: 8086
   servlet:
     # 应用的访问路径
     context-path: /
@@ -61,7 +62,7 @@ spring:
       # 单个文件大小
       max-file-size: 1024MB
       # 设置总上传的文件大小
-      max-request-size: 10240MB
+      max-request-size: 1024MB
   # 服务模块
   devtools:
     restart:
@@ -71,6 +72,7 @@ spring:
   redis:
     # 地址
     host: localhost
+#    host: cmc-redis
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -97,7 +99,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 240
+  expireTime: 480
 
 # MyBatis配置
 mybatis:
@@ -133,6 +135,12 @@ xss:
 # flowable相关表
 flowable:
   # true 会对数据库中所有表进行更新操作。如果表不存在，则自动创建(建议开发时使用)
-  database-schema-update: false
+#  database-schema-update: false
+  database-schema-update: true
   # 关闭定时任务JOB
-  async-executor-activate: false
+  async-executor-activate: false
+
+llmService:
+  url: http://192.168.28.196:8000/v1/chat/completions
+milvusService:
+  url: http://192.168.28.196:19530

oa-back/ruoyi-agent/src/main/java/com/ruoyi/agent/service/impl/McpServiceImpl.java

@@ -37,9 +37,11 @@ import org.noear.solon.ai.chat.session.InMemoryChatSession;
 import org.noear.solon.ai.mcp.McpChannel;
 import org.noear.solon.ai.mcp.server.annotation.McpServerEndpoint;
 import org.noear.solon.annotation.Param;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.*;
+import java.sql.*;
 import java.util.*;
 
 @Service
@@ -48,12 +50,23 @@ public class McpServiceImpl implements IMcpService {
 
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
 
-    private static final String llmServiceUrl = "http://192.168.28.196:8000/v1/chat/completions";
+    @Value("${llmService.url}")
+    private static String llmServiceUrl;
 
-    private static final MilvusClientV2 milvusClient = new MilvusClientV2(
-            ConnectConfig.builder()
-                    .uri("http://192.168.28.196:19530")
-                    .build());
+    @Value("${lmilvusService.url}")
+    private static String milvusServiceUrl;
+
+    @Value("${mysqlService.jdbcUrl}")
+    private static String url ;
+
+    @Value("${mysqlService.username}")
+    private static String user;
+
+    @Value("${mysqlService.password}")
+    private static String password;
+
+    @Value("${cmc.profile}")
+    private static String profile;
 
     /**
      * 调用LLM+RAG（外部文件+知识库）生成回答
@@ -66,8 +79,8 @@ public class McpServiceImpl implements IMcpService {
     {
             try {
                 if (templatePath.startsWith("/dev-api"))
-                    templatePath = templatePath.replace("/dev-api/profile", Solon.cfg().getProperty("cmc.profile"));
-                templatePath = Solon.cfg().getProperty("cmc.profile") + templatePath;
+                    templatePath = templatePath.replace("/dev-api/profile", profile);
+                templatePath =profile + templatePath;
                 List<String> subTitles = extractSubTitles(templatePath, title);
                 List<JSONObject> contexts = retrieveFromMilvus(collectionName, title, 10);
                 return generateAnswerWithDocumentAndCollection(agentName, templatePath, subTitles, contexts);
@@ -76,6 +89,52 @@ public class McpServiceImpl implements IMcpService {
             }
     }
 
+    /**
+     * 查询OA数据生成回答
+     */
+    @ToolMapping(description = "数据查询")
+    public AssistantMessage SQLQuery(@Param(description = "sql语句") String sqlString) throws Exception
+    {
+            try {
+                List<Map<String, Object>> data = executeQuery(sqlString, 100.0);
+                return ChatMessage.ofAssistant(generateAnswer(sqlString));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+    }
+
+    public static List<Map<String, Object>> executeQuery(String sql, Object... params) {
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        try (Connection conn = DriverManager.getConnection(url, user, password);
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            // 设置参数
+            for (int i = 0; i < params.length; i++) {
+                stmt.setObject(i + 1, params[i]);
+            }
+
+            ResultSet rs = stmt.executeQuery();
+            ResultSetMetaData metaData = rs.getMetaData();
+            int columnCount = metaData.getColumnCount();
+
+            while (rs.next()) {
+                Map<String, Object> row = new HashMap<>();
+                for (int i = 1; i <= columnCount; i++) {
+                    String columnName = metaData.getColumnLabel(i);
+                    Object value = rs.getObject(i);
+                    row.put(columnName, value);
+                }
+                result.add(row);
+            }
+
+        } catch (SQLException e) {
+            throw new RuntimeException("执行 SQL 失败: " + sql, e);
+        }
+
+        return result;
+    }
+
     /**
      * 从Milvus检索相关文档
      * @return
@@ -124,7 +183,7 @@ public class McpServiceImpl implements IMcpService {
             sb.append("针对本项目招标文件内容，补全以下章节部分：\n\n").append(title);
             content.append(generateAnswer(sb.toString()));
         }
-        String absolutePath = templatePath.replace("/dev-api/profile", Solon.cfg().getProperty("cmc.profile"));
+        String absolutePath = templatePath.replace("/dev-api/profile", profile);
         writeContent(content.toString(), titles, absolutePath);
         for (JSONObject context : contexts) {
             sb.append("文件").append(": ")
@@ -133,7 +192,7 @@ public class McpServiceImpl implements IMcpService {
                     .append(context.getString("content")).append("\n\n");
         }
         content.append( "招标文件分析完成，章节内容已写入【<a href='")
-                .append(templatePath.replace(Solon.cfg().getProperty("cmc.profile"), "/dev-api/profile"))
+                .append(templatePath.replace(profile, "/dev-api/profile"))
                 .append("'> 技术文件" + "</a>】，请查阅\n\n")
                 .append("如需修改，请输入技术文件已有内容的章节标题\n\n")
                 .append(extractTitles(templatePath));
@@ -303,6 +362,10 @@ public class McpServiceImpl implements IMcpService {
      * @return
      */
     private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK) {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
         List<BaseVector> queryVector = Collections.singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
 
         //  加载集合

oa-back/ruoyi-agent/src/main/resources/application.yml

@@ -2,4 +2,12 @@
 cmc:
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   #  profile: /home/cmc/projects/cmc-llm
-  profile: E:/home/cmc/projects/cmc-llm
+  profile: /home/cmc/projects/cmc-oa
+  llmService:
+    url: http://192.168.28.196:8000/v1/chat/completions
+  milvusService:
+    url: http://192.168.28.196:19530
+  mysqlService:
+    jdbcUrl: jdbc:mysql://localhost:3306/cmc_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+    username: root
+    password: cmcroot

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/CmcAgentController.java

@@ -5,7 +5,7 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import org.noear.solon.ai.chat.message.AssistantMessage;
+import org.noear.solon.ai.chat.message.ChatMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -76,7 +76,7 @@ public class CmcAgentController extends BaseController
      */
     @GetMapping("/opening")
     public AjaxResult opening(String agentName) {
-        return success(new AssistantMessage(cmcAgentService.getOpening(agentName)));
+        return success(ChatMessage.ofAssistant(cmcAgentService.getOpening(agentName)));
     }
 
     /**

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/McpController.java

@@ -1,18 +1,11 @@
 package com.ruoyi.web.llm.controller;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.llm.domain.CmcChat;
 import com.ruoyi.llm.service.ICmcAgentService;
 import com.ruoyi.llm.service.ICmcChatService;
 import com.ruoyi.llm.service.ICmcTopicService;
-import com.ruoyi.web.llm.service.ILangChainMilvusService;
-import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.model.embedding.onnx.bgesmallzhv15.BgeSmallZhV15EmbeddingModel;
-import io.milvus.client.MilvusServiceClient;
-import io.milvus.param.ConnectParam;
-import org.noear.solon.Solon;
 import org.noear.solon.ai.chat.ChatModel;
 import org.noear.solon.ai.chat.ChatResponse;
 import org.noear.solon.ai.chat.ChatSession;
@@ -22,6 +15,7 @@ import org.noear.solon.ai.chat.session.InMemoryChatSession;
 import org.noear.solon.ai.mcp.McpChannel;
 import org.noear.solon.ai.mcp.client.McpClientProvider;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -40,9 +34,6 @@ import java.util.*;
 @RequestMapping("/llm/mcp")
 public class McpController extends BaseController
 {
-    @Autowired
-    private ILangChainMilvusService langChainMilvusService;
-
     @Autowired
     private ICmcChatService cmcChatService;
 
@@ -52,15 +43,11 @@ public class McpController extends BaseController
     @Autowired
     private ICmcAgentService cmcAgentService;
 
-    private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
-
-    private static final String llmServiceUrl = "http://192.168.28.196:8000/v1/chat/completions";
+    @Value("${llmService.url}")
+    private String llmServiceUrl;
 
-    private static final MilvusServiceClient milvusClient = new MilvusServiceClient(
-            ConnectParam.newBuilder()
-                    .withHost("192.168.28.196")
-                    .withPort(19530)
-                    .build());
+    @Value("${milvusService.url}")
+    private String milvusServiceUrl;
 
     /**
      * 自动调用mcp工具问答
@@ -70,7 +57,7 @@ public class McpController extends BaseController
     public AssistantMessage answer(String topicId, String question) throws IOException {
         McpClientProvider clientProvider = McpClientProvider.builder()
                 .channel(McpChannel.SSE)
-                .apiUrl("http://localhost:8080/mcp/sse")
+                .url("http://localhost:8080/mcp/sse")
                 .build();
         ChatModel chatModel = ChatModel.of(llmServiceUrl)
                 .model("Qwen2.5-7B-Instruct")
@@ -102,7 +89,7 @@ public class McpController extends BaseController
                 arguments.put("title", question);
             }
             resultContent = clientProvider.callToolAsText(name, arguments).getContent();
-            assistantMessage = new AssistantMessage(resultContent);
+            assistantMessage = ChatMessage.ofAssistant(resultContent);
         }
         else
             throw new IOException("模型上下文工具未准备就绪，请重试");

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/RagController.java

@@ -5,11 +5,13 @@ import com.ruoyi.web.llm.service.ILangChainMilvusService;
 import com.ruoyi.common.core.controller.BaseController;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Flux;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -25,14 +27,16 @@ public class RagController extends BaseController
     @Autowired
     private ILangChainMilvusService langChainMilvusService;
 
+    @Value("${llmService.url}")
+    private String llmServiceUrl;
+
     /**
      * 调用LLM+RAG（知识库）生成回答
      */
     @GetMapping("/answer")
-    public Flux<AssistantMessage> answerWithCollection(String collectionName, String topicId, String question)
-    {
+    public Flux<AssistantMessage> answerWithCollection(String collectionName, String topicId, String question) throws IOException {
         List<JSONObject> contexts = langChainMilvusService.retrieveFromMilvus(collectionName, question, 10);
-        return langChainMilvusService.generateAnswerWithCollection(topicId, question, contexts, "http://192.168.28.196:8000/v1/chat/completions");
+        return langChainMilvusService.generateAnswerWithCollection(topicId, question, contexts, llmServiceUrl);
     }
 
     /**

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/controller/SessionController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.web.llm.service.ILangChainMilvusService;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,21 +25,24 @@ public class SessionController extends BaseController
     @Autowired
     private ILangChainMilvusService langChainMilvusService;
 
+    @Value("${llmService.url}")
+    private String llmServiceUrl;
+
     /**
      * 生成回答
      */
     @GetMapping("/answer")
     public Flux<AssistantMessage> answer(String topicId, String question) {
-        return langChainMilvusService.generateAnswer(topicId, question, "http://192.168.28.196:8000/v1/chat/completions");
+        return langChainMilvusService.generateAnswer(topicId, question, llmServiceUrl);
     }
 
     /**
      * 调用LLM+RAG（外部文件）生成回答
      */
     @GetMapping("/answerWithDocument")
-    public Flux<AssistantMessage> answerWithDocument(String topicId, String chatId, String question) throws IOException
+    public Flux<AssistantMessage> answerWithDocument(String topicId, String chatId, String question) throws Exception
     {
-        return langChainMilvusService.generateAnswerWithDocument(topicId, chatId, question, "http://192.168.28.196:8000/v1/chat/completions");
+        return langChainMilvusService.generateAnswerWithDocument(topicId, chatId, question, llmServiceUrl);
     }
 
 }

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/ILangChainMilvusService.java

@@ -5,6 +5,7 @@ import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.springframework.web.multipart.MultipartFile;
 import reactor.core.publisher.Flux;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.List;
 
@@ -51,13 +52,13 @@ public interface ILangChainMilvusService {
      * 调用LLM+RAG（外部文件）生成回答
      * @return
      */
-    public Flux<AssistantMessage> generateAnswerWithDocument(String topicId, String chatId, String question, String llmServiceUrl) throws IOException;
+    public Flux<AssistantMessage> generateAnswerWithDocument(String topicId, String chatId, String question, String llmServiceUrl) throws Exception;
 
     /**
      * 调用LLM+RAG（外部文件+知识库）生成回答
      * @return
      */
-    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(String topicId, String question,  List<JSONObject> requests, String llmServiceUrl) throws IOException;
+    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(String topicId, String question,  List<JSONObject> requests, String llmServiceUrl) throws Exception;
 
     /**
      * 获取二级标题下三级标题列表

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/LangChainMilvusServiceImpl.java

@@ -42,9 +42,9 @@ import org.noear.solon.ai.chat.ChatSession;
 import org.noear.solon.ai.chat.message.AssistantMessage;
 import org.noear.solon.ai.chat.message.ChatMessage;
 import org.noear.solon.ai.chat.session.InMemoryChatSession;
-import org.noear.solon.web.sse.SseEvent;
 import org.reactivestreams.Publisher;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import reactor.core.publisher.Flux;
@@ -61,15 +61,16 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
     @Autowired
     private ICmcDocumentService cmcDocumentService;
 
-    private static final MilvusClientV2 milvusClient = new MilvusClientV2(
-            ConnectConfig.builder()
-                    .uri("http://192.168.28.196:19530")
-                    .build());
-
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
 
     private String processValue = "";
 
+    @Value("${llmService.url}")
+    private String llmServiceUrl;
+
+    @Value("${milvusService.url}")
+    private String milvusServiceUrl;
+
     /**
      * 上传多文件
      *
@@ -86,6 +87,10 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
     @Override
     public int insertLangchainEmbeddingDocument(MultipartFile[] fileList, String collectionName)
     {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(llmServiceUrl)
+                        .build());
         processValue = "";
         int successfullyInsertedFiles = 0;
 
@@ -253,7 +258,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * 调用LLM生成回答
      */
     @Override
-    public Flux<AssistantMessage> generateAnswerWithDocument(String topicId, String chatId, String question, String llmServiceUrl) throws IOException {
+    public Flux<AssistantMessage> generateAnswerWithDocument(String topicId, String chatId, String question, String llmServiceUrl) throws Exception {
         CmcDocument cmcDocument = new CmcDocument();
         cmcDocument.setChatId(chatId);
         List<CmcDocument> documentList = cmcDocumentService.selectCmcDocumentList(cmcDocument);
@@ -286,7 +291,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * 调用LLM生成回答
      */
     @Override
-    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(String topicId, String question, List<JSONObject> contexts, String llmServiceUrl) throws IOException {
+    public Flux<AssistantMessage> generateAnswerWithDocumentAndCollection(String topicId, String question, List<JSONObject> contexts, String llmServiceUrl) throws Exception {
         StringBuilder sb = new StringBuilder("招标文件内容：\n\n");
         CmcChat cmcChat = new CmcChat();
         cmcChat.setTopicId(topicId);
@@ -369,6 +374,10 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
      * @return
      */
     private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK) {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
         List<BaseVector> queryVector = Collections.singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
 
         //  加载集合
@@ -405,7 +414,7 @@ public class LangChainMilvusServiceImpl implements ILangChainMilvusService
     /**
      * 检索知识库
      */
-    private List<TextSegment> splitDocument(File transferFile) throws FileNotFoundException {
+    private List<TextSegment> splitDocument(File transferFile) throws Exception {
         // 加载文档
         Document document;
         InputStream fileInputStream = new FileInputStream(transferFile);

oa-back/ruoyi-llm/src/main/java/com/ruoyi/web/llm/service/impl/MilvusServiceImpl.java

@@ -13,6 +13,7 @@ import io.milvus.v2.service.collection.response.ListCollectionsResp;
 import io.milvus.v2.service.vector.request.DeleteReq;
 import io.milvus.v2.service.vector.request.QueryReq;
 import io.milvus.v2.service.vector.response.QueryResp;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
@@ -22,16 +23,18 @@ import java.util.stream.Collectors;
 @Service
 public class MilvusServiceImpl implements IMilvusService {
 
-    private static final MilvusClientV2 milvusClient = new MilvusClientV2(
-            ConnectConfig.builder()
-                    .uri("http://192.168.28.196:19530")
-                    .build());
+    @Value("${milvusService.url}")
+    private String milvusServiceUrl;
 
     /**
      * 新建知识库Collection（含Schema、Field、Index）
      */
     @Override
     public void createCollection(String collectionName, String description, int dimension) {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
         CreateCollectionReq.CollectionSchema schema = MilvusClientV2.CreateSchema();
 
         schema.addField(AddFieldReq.builder()
@@ -90,6 +93,10 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public JSONArray getCollectionNames() {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
         JSONArray jsonArray = new JSONArray();
         ListCollectionsResp listResponse = milvusClient.listCollections();
         if (listResponse != null) {
@@ -119,9 +126,13 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public JSONArray listKnowLedgeByCollectionName(String collectionName) {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
         JSONArray jsonArray = new JSONArray();
         ListCollectionsResp listResponse = milvusClient.listCollections();
-        
+
         if (listResponse != null) {
             List<String> allCollectionNames = listResponse.getCollectionNames();
             for (String name : allCollectionNames) {
@@ -150,6 +161,10 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public void collectionRename(String collectionName, String newCollectionName) {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
         RenameCollectionReq renameCollectionReq = RenameCollectionReq.builder()
                 .collectionName(collectionName)
                 .newCollectionName(newCollectionName)
@@ -163,6 +178,10 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public void deleteCollectionName(String collectionName) {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
         DropCollectionReq dropCollectionReq = DropCollectionReq.builder()
                 .collectionName(collectionName)
                 .build();
@@ -174,8 +193,15 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public List<String> listDocument(String collectionName, String fileType) {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
         List<String> documentList = new ArrayList<>();
-        loadCollectionName(collectionName);
+        LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
+                .collectionName(collectionName)
+                .build();
+        milvusClient.loadCollection(loadCollectionReq);
         QueryReq queryParam = QueryReq.builder()
                 .collectionName(collectionName)
                 .filter("id > 0")
@@ -195,7 +221,10 @@ public class MilvusServiceImpl implements IMilvusService {
                 documentList.add(rowRecord.getEntity().get("file_name").toString());
             }
         }
-        releaseCollectionName(collectionName);
+        ReleaseCollectionReq releaseCollectionReq = ReleaseCollectionReq.builder()
+                .collectionName(collectionName)
+                .build();
+        milvusClient.releaseCollection(releaseCollectionReq);
         return documentList.stream().distinct().collect(Collectors.toList());
     }
 
@@ -204,7 +233,14 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public void removeDocument(String collectionName, String fileName) {
-        loadCollectionName(collectionName);
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
+        LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
+                .collectionName(collectionName)
+                .build();
+        milvusClient.loadCollection(loadCollectionReq);
         DeleteReq deleteReq = DeleteReq.builder()
                 .collectionName(collectionName)
                 .filter(String.format("file_name == \"%s\"", fileName))
@@ -217,32 +253,19 @@ public class MilvusServiceImpl implements IMilvusService {
      */
     @Override
     public void removeAllDocument(String collectionName) {
-        loadCollectionName(collectionName);
-        DeleteReq deleteReq = DeleteReq.builder()
-                .collectionName(collectionName)
-                .filter("id > 0")
-                .build();
-        milvusClient.delete(deleteReq);
-    }
-
-    /**
-     * 加载知识库Collection
-     */
-    public void loadCollectionName(String collectionName) {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
         LoadCollectionReq loadCollectionReq = LoadCollectionReq.builder()
                 .collectionName(collectionName)
                 .build();
         milvusClient.loadCollection(loadCollectionReq);
-    }
-
-    /**
-     * 释放知识库Collection
-     */
-    public void releaseCollectionName(String collectionName) {
-        ReleaseCollectionReq releaseCollectionReq = ReleaseCollectionReq.builder()
+        DeleteReq deleteReq = DeleteReq.builder()
                 .collectionName(collectionName)
+                .filter("id > 0")
                 .build();
-        milvusClient.releaseCollection(releaseCollectionReq);
+        milvusClient.delete(deleteReq);
     }
 
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/llm/service/impl/CmcAgentServiceImpl.java

@@ -42,6 +42,7 @@ import org.noear.solon.ai.chat.ChatSession;
 import org.noear.solon.ai.chat.message.ChatMessage;
 import org.noear.solon.ai.chat.session.InMemoryChatSession;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -74,12 +75,11 @@ public class CmcAgentServiceImpl implements ICmcAgentService
 
     private static final EmbeddingModel embeddingModel = new BgeSmallZhV15EmbeddingModel();
 
-    private static final String llmServiceUrl = "http://192.168.28.196:8000/v1/chat/completions";
+    @Value("${llmService.url}")
+    private String llmServiceUrl;
 
-    private static final MilvusClientV2 milvusClient = new MilvusClientV2(
-            ConnectConfig.builder()
-                    .uri("http://192.168.28.196:19530")
-                    .build());
+    @Value("${milvusService.url}")
+    private String milvusServiceUrl;
 
     /**
      * 查询智能体
@@ -650,6 +650,10 @@ public class CmcAgentServiceImpl implements ICmcAgentService
      * 检索知识库
      */
     private List<List<SearchResp.SearchResult>> retrieve(String collectionName, String query, int topK) {
+        MilvusClientV2 milvusClient = new MilvusClientV2(
+                ConnectConfig.builder()
+                        .uri(milvusServiceUrl)
+                        .build());
         List<BaseVector> queryVector = Collections.singletonList(new FloatVec(embeddingModel.embed(query).content().vector()));
 
         //  加载集合

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCheck.java

@@ -1,5 +1,6 @@
 package com.ruoyi.oa.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -45,6 +46,10 @@ public class CmcCheck extends BaseEntity
     @Excel(name = "核算说明")
     private String checkComment;
 
+    /** 核算总额 */
+    @Excel(name = "核算总额")
+    private BigDecimal totalAdjust;
+
     /** 财务审核人 */
     @Excel(name = "财务审核人")
     private String cwUserName;
@@ -151,6 +156,15 @@ public class CmcCheck extends BaseEntity
     {
         return checkComment;
     }
+    public void setTotalAdjust(BigDecimal totalAdjust)
+    {
+        this.totalAdjust = totalAdjust;
+    }
+
+    public BigDecimal getTotalAdjust()
+    {
+        return totalAdjust;
+    }
     public void setCwUserId(Long cwUserId) 
     {
         this.cwUserId = cwUserId;
@@ -283,6 +297,15 @@ public class CmcCheck extends BaseEntity
     {
         return project;
     }
+    public void setProjectNumber(String projectNumber)
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber()
+    {
+        return projectNumber;
+    }
 
     @Override
     public String toString() {

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcArchiveMapper.xml

@@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcArchive" id="CmcArchiveResult">
         <result property="archiveId"    column="archive_id"    />
         <result property="projectId"    column="project_id"    />
-        <result property="projectNumber"    column="project_number"    />
         <result property="projectLeader"    column="project_leader"    />
         <result property="submitTime"    column="submit_time"    />
         <result property="submitSituation"    column="submit_situation"    />

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBorrowMapper.xml

@@ -7,8 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcBorrow" id="CmcBorrowResult">
         <result property="borrowId"    column="borrow_id"    />
         <result property="projectId"    column="project_id"    />
-        <result property="projectNumber"    column="project_number"    />
-        <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="borrowUsage"    column="borrow_usage"    />
         <result property="applier"    column="applier"    />

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCheckMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="checker"    column="checker"    />
         <result property="checkTime"    column="check_time"    />
         <result property="checkComment"    column="check_comment"    />
+        <result property="totalAdjust"    column="total_adjust"    />
         <result property="cwUserId"    column="cw_user_id"    />
         <result property="cwTime"    column="cw_time"    />
         <result property="cwComment"    column="cw_comment"    />
@@ -54,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcCheckVo">
-        select c.check_id, c.budget_id, c.project_id, p.project_number, p.project_name, c.checker, u.nick_name as check_nick_name, c.check_time, c.check_comment, c.cw_user_id, u1.nick_name as cw_nick_name, c.cw_time,
+        select c.check_id, c.budget_id, c.project_id, p.project_number, p.project_name, c.checker, u.nick_name as check_nick_name, c.check_time, c.check_comment, c.total_adjust, c.cw_user_id, u1.nick_name as cw_nick_name, c.cw_time,
                c.cw_comment, c.manager_user_id, u2.nick_name as manager_nick_name, c.manager_time, c.manager_comment, c.zjl_user_id, u3.nick_name as zjl_nick_name, c.zjl_time, c.zjl_comment from cmc_check as c
         left join sys_user as u on u.user_id = c.checker
         left join sys_user as u1 on u1.user_id = c.cw_user_id
@@ -68,8 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="budgetId != null  and budgetId != ''"> and c.budget_id = #{budgetId}</if>
             <if test="projectId != null  and projectId != ''"> and c.project_id = #{projectId}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="checker != null "> and c.checker = #{checker}</if>
-            <if test="checkTime != null "> and c.check_time = #{checkTime}</if>
             <if test="checkComment != null  and checkComment != ''"> and c.check_comment = #{checkComment}</if>
             <if test="cwUserId != null "> and c.cw_user_id = #{cwUserId}</if>
             <if test="cwTime != null "> and c.cw_time = #{cwTime}</if>
@@ -78,7 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerTime != null "> and c.manager_time = #{managerTime}</if>
             <if test="managerComment != null  and managerComment != ''"> and c.manager_comment = #{managerComment}</if>
             <if test="zjlUserId != null "> and c.zjl_user_id = #{zjlUserId}</if>
-            <if test="zjlTime != null "> and c.zjl_time = #{zjlTime}</if>
+            <if test="checkTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', checkTime) == '2000' "> and c.check_time is not null</if>
+            <if test="checkTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', checkTime) != '2000' "> and YEAR(c.check_time) = YEAR(#{checkTime})</if>
             <if test="zjlComment != null  and zjlComment != ''"> and c.zjl_comment = #{zjlComment}</if>
         </where>
     </select>
@@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checker != null">checker,</if>
             <if test="checkTime != null">check_time,</if>
             <if test="checkComment != null">check_comment,</if>
+            <if test="totalAdjust != null">total_adjust,</if>
             <if test="cwUserId != null">cw_user_id,</if>
             <if test="cwTime != null">cw_time,</if>
             <if test="cwComment != null">cw_comment,</if>
@@ -114,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checker != null">#{checker},</if>
             <if test="checkTime != null">#{checkTime},</if>
             <if test="checkComment != null">#{checkComment},</if>
+            <if test="totalAdjust != null">#{totalAdjust},</if>
             <if test="cwUserId != null">#{cwUserId},</if>
             <if test="cwTime != null">#{cwTime},</if>
             <if test="cwComment != null">#{cwComment},</if>
@@ -134,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checker != null">checker = #{checker},</if>
             <if test="checkTime != null">check_time = #{checkTime},</if>
             <if test="checkComment != null">check_comment = #{checkComment},</if>
+            <if test="totalAdjust != null">total_adjust = #{totalAdjust},</if>
             <if test="cwUserId != null">cw_user_id = #{cwUserId},</if>
             <if test="cwTime != null">cw_time = #{cwTime},</if>
             <if test="cwComment != null">cw_comment = #{cwComment},</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcPerformanceStaffMapper.xml

@@ -8,7 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="performanceStaffId"    column="performance_staff_id"    />
         <result property="performanceId"    column="performance_id"    />
         <result property="projectId"    column="project_id"    />
-        <result property="projectNumber"    column="project_number"    />
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="nick_name"    />
         <result property="workType"    column="work_type"    />

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleMapper.xml

@@ -7,8 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcSettle" id="CmcSettleResult">
         <result property="settleId"    column="settle_id"    />
         <result property="projectId"    column="project_id"    />
-        <result property="projectNumber"    column="project_number"    />
-        <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="reportDept"    column="report_dept"    />
         <result property="xmName"    column="xm_name"    />
         <result property="workloadReport"    column="workload_report"    />

oa-ui/package.json

@@ -59,6 +59,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "marked": "^4.0.14",
     "nprogress": "0.2.0",
     "ol": "^7.1.0",
     "pdfjs-dist": "^2.0.943",

oa-ui/src/api/oa/budget/check.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: wrh
+ * @Date: 2025-05-15 09:14:39
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-12-25 17:08:07
+ */
 import request from '@/utils/request'
 
 // 查询cmc项目核算列表
@@ -42,3 +48,12 @@ export function delCheck(checkId) {
     method: 'delete'
   })
 }
+
+// 核算统计
+export function getCheckStatistic(query) {
+  return request({
+    url: '/oa/check/statistic',
+    method: 'get',
+    params: query
+  })
+}

oa-ui/src/views/flowable/form/budget/addBudget.vue

@@ -1,14 +1,14 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-07-08 10:23:25
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-12-31 16:41:48
 -->
 <template>
   <div class="app-container">
     <h2 class="text-center">项目直接生产成本预算表</h2>
-    <p style="text-align: center" v-if="taskName == '预算编制'">编制人：{{ $store.getters.name }}</p>
-    <p style="text-align: center" v-else>编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
+    <p style="text-align: center" v-if="taskName == '预算编制'">编制人：{{ $store.getters.name }} | 编制时间：{{ budgetForm.createTime }} </p>
+    <p style="text-align: center" v-else>编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }} | 编制时间：{{ budgetForm.createTime }} </p>
     <el-divider></el-divider>
     <div class="mt20 mb20" v-if="showAlter">
       <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
@@ -142,19 +142,16 @@
         @cancel="returnOpen = false"></return-btn>
     </el-dialog>
     <!-- 选择修改有多个预算的项目中的预算 -->
-    <el-dialog title="选择要修改的预算" :visible.sync="updateData" :close-on-click-modal="false"
-      :close-on-press-escape="false" :show-close="false"  width="30%" append-to-body>
-        <el-select v-model="selectedBudget" placeholder="请选择" style="width:100%">
-          <el-option
-            v-for="item in budgets"
-            :key="item.budgetId"
-            :label="item.project.projectName +'_'+ item.createTime"
-            :value="item.budgetId">
-          </el-option>
-        </el-select>
-        <div style="text-align: center">
-          <el-button type="success" style=" margin-top: 10px;"  @click="getBudgeNeesUpdate()">确定</el-button>
-        </div>
+    <el-dialog title="选择要修改的预算" :visible.sync="updateData" :close-on-click-modal="false" :close-on-press-escape="false"
+      :show-close="false" width="30%" append-to-body>
+      <el-select v-model="selectedBudget" placeholder="请选择" style="width:100%">
+        <el-option v-for="item in budgets" :key="item.budgetId" :label="item.project.projectName + '_' + item.createTime"
+          :value="item.budgetId">
+        </el-option>
+      </el-select>
+      <div style="text-align: center">
+        <el-button type="success" style=" margin-top: 10px;" @click="getBudgeNeesUpdate()">确定</el-button>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -214,9 +211,9 @@ export default {
       viewOpen: false,
       innerSettleLimit: 0, // 内业预算绩效合计限制
       outerUsers: [], // 存储外业人员
-      updateData:false,
-      selectedBudget:"",
-      budgets:{},
+      updateData: false,
+      selectedBudget: "",
+      budgets: {},
     };
   },
   props: {
@@ -250,29 +247,38 @@ export default {
     async initBudgetForm() {
       const params = { pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }
       let res = await listBudget(params)
-      if (res.rows[0] && res.rows[0].budgetId){
-        // 如项目下已有预算，询问是新建预算还是修改原有预算
-        try{
-          await this.$confirm('该项目下已有预算，请选择修改已有预算还是创建新预算','系统提示',{
-                              distinguishCancelAndClose: true,confirmButtonText: '创建新预算',
-                              cancelButtonText: '修改已有预算',showClose: false, 
-                              closeOnClickModal: false, closeOnPressEscape: false});
-          this.flag = false;
-          this.budgetForm.projectId = this.taskForm.formId;
-          this.budgetForm.budgetId = new Snowflake(1n, 1n, 0n).nextId().toString();
-          this.budgetForm.procInstId = this.taskForm.procInsId;
-        }catch(action){
-          if (action === 'cancel') {
-            this.flag = true;
-            this.budgets = res.rows;
-            this.updateData = true;
-            // this.budgetForm = res.rows[0];
-            // this.budgetId = res.rows[0].budgetId;
+      if (res.rows[0] && res.rows[0].budgetId) {
+        if (this.taskName == '预算编制') {
+          // 如项目下已有预算，询问是新建预算还是修改原有预算
+          try {
+            await this.$confirm('该项目下已有预算，请选择修改已有预算还是创建新预算', '系统提示', {
+              distinguishCancelAndClose: true, confirmButtonText: '创建新预算',
+              cancelButtonText: '修改已有预算', showClose: false,
+              closeOnClickModal: false, closeOnPressEscape: false
+            });
+            this.flag = false;
+            this.budgetForm.projectId = this.taskForm.formId;
+            this.budgetForm.budgetId = new Snowflake(1n, 1n, 0n).nextId().toString();
+            this.budgetForm.procInstId = this.taskForm.procInsId;
+          } catch (action) {
+            if (action === 'cancel') {
+              this.flag = true;
+              this.budgets = res.rows;
+              this.updateData = true;
+              // this.budgetForm = res.rows[0];
+              // this.budgetId = res.rows[0].budgetId;
+            }
+          }
+        }
+        else {          
+          this.flag = true;
+          this.budgetForm = res.rows[0];
+          this.budgetId = res.rows[0].budgetId;
         }
-      }}else {
-          this.flag = false;
-          this.budgetForm.projectId = this.taskForm.formId;
-          this.budgetForm.procInstId = this.taskForm.procInsId;
+      } else {
+        this.flag = false;
+        this.budgetForm.projectId = this.taskForm.formId;
+        this.budgetForm.procInstId = this.taskForm.procInsId;
       }
       // listBudget({ pageNum: 1, pageSize: 20, projectId: this.taskForm.formId }).then(
       //   res => {
@@ -483,11 +489,11 @@ export default {
         this.budgetForm.document = ""
       }
     },
-    getBudgeNeesUpdate(){
+    getBudgeNeesUpdate() {
       this.budgetForm = this.budgets.find(item => item.budgetId === this.selectedBudget);
       this.budgetId = this.selectedBudget;
-      this.updateData =false;
-   }
+      this.updateData = false;
+    }
   },
 };
 </script>

oa-ui/src/views/flowable/form/budget/adjust/adjustIndex.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-14 16:09:56
  * @LastEditors: wrh
- * @LastEditTime: 2025-09-30 16:39:33
+ * @LastEditTime: 2025-12-31 16:26:40
 -->
 <template>
   <div class="app-container">
@@ -50,13 +50,13 @@
           </el-table-column>
           <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
           <el-table-column label="项目名称" align="center" prop="project.projectName" />
-          <el-table-column label="提交时间" align="center" prop="createTime" />
           <el-table-column label="预算总额" align="center" prop="totalBudget" />
           <el-table-column label="编制人" align="center" prop="compiler">
             <template slot-scope="scope">
               {{ getUserName(scope.row.compiler) }}
             </template>
           </el-table-column>
+          <el-table-column label="编制时间" align="center" prop="createTime" />
           <el-table-column label="预算当前流程节点" align="center" prop="taskName" />
           <!-- <el-table-column label="审核人" align="center" prop="auditor">
             <template slot-scope="scope">

oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: wrh
- * @LastEditTime: 2025-09-30 16:13:13
+ * @LastEditTime: 2025-12-31 16:45:31
 -->
 <template>
   <div class="main">
@@ -33,7 +33,10 @@
       <el-descriptions-item label="项目备注" :span="3">
         {{ project.remark }}
       </el-descriptions-item>
-      <el-descriptions-item label="预算表单备注" :span="5">
+      <el-descriptions-item label="编制时间" :span="1">
+        {{ budgetForm.createTime }}
+      </el-descriptions-item>
+      <el-descriptions-item label="预算表单备注" :span="3">
         {{ budgetForm.remark }}
       </el-descriptions-item>
       <el-descriptions-item label="预算附件" :span="3" v-if="budgetForm.document">
@@ -820,7 +823,7 @@ export default {
 
         // 并发处理基础数据保存
         const savePromises = [];
-
+        this.checkForm.totalAdjust = this.totalBudgetAdjust
         if (!this.checkForm.checkId) {
           savePromises.push(addCheck(obj));
           this.$emit('preserve');

oa-ui/src/views/flowable/form/budget/adjust/newBudgetInfo.vue

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: wrh
- * @LastEditTime: 2025-09-30 16:23:05
+ * @LastEditTime: 2025-12-31 16:22:00
 -->
 <template>
   <div class="main" v-loading="loading">
     <h2 class="text-center">项目直接生产成本预算表</h2>
-    <p style="text-align: center">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
+    <p style="text-align: center">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }} | 编制时间：{{ budgetForm.createTime }} </p>
     <el-divider></el-divider>
     <div class="mt20 mb20" v-if="showAlter && taskName">
       <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -1,14 +1,14 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-27 15:11:17
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-12-31 16:22:43
 -->
 <template>
   <div class="main">
     <div v-loading="loading">
       <h2 class="text-center">项目直接生产成本预算表（旧版）</h2>
-      <p style="text-align: center;">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}</p>
+      <p style="text-align: center;">编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }} | 编制时间：{{ budgetForm.createTime }} </p>
       <el-descriptions :column="3" border class="descriptions">
         <el-descriptions-item label="项目编号">
           {{ projectForm.projectNumber }}

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-15 09:49:17
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-12-16 11:06:33
 -->
 <template>
   <div class="app-container">
@@ -27,8 +27,7 @@
           <el-form-item label="承接单位" prop="partnerId">
             <el-select allow-create v-model="form.partnerId" multiple filterable placeholder="请选择"
               :style="taskName == '合同拟稿' ? { width: '84%' } : { width: '100%' }" disabled clearable>
-              <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
-                :value="item.partnerId">
+              <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName" :value="item.partnerId">
               </el-option>
             </el-select>
             <el-button type="primary" @click="partnerOpen = true" size="mini" v-if="taskName == '合同拟稿'">选择单位</el-button>
@@ -303,8 +302,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
+              :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
@@ -350,6 +349,9 @@
     <el-dialog title="选择合作单位" :visible.sync="partnerOpen" width="70%" append-to-body>
       <choose-partner @confirm="confirmPartners"></choose-partner>
     </el-dialog>
+    <el-dialog title="选择承接合同" :visible.sync="contractOpen" width="70%" append-to-body>
+      <choose-contract @choose="confirmContract"></choose-contract>
+    </el-dialog>
     <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
       <projectInfo :needReturn="false"></projectInfo>
     </el-drawer>
@@ -390,6 +392,7 @@ import workTable from './components/workTable.vue';
 import paymentTable from './components/paymentTable.vue';
 import projectChoose from '../components/chooseProject.vue';
 import ChoosePartner from '../components/choosePartner.vue';
+import ChooseContract from '@/views/flowable/form/components/chooseContract.vue';
 import contractForm from '@/views/flowable/form/business/contractForm.vue';
 import ReturnBtn from '@/views/flowable/form/components/flowBtn/returnBtn.vue';
 import ReturnComment from '@/views/flowable/form/components/flowBtn/returnComment.vue';
@@ -398,6 +401,7 @@ export default {
   components: {
     flow,
     projectChoose,
+    ChooseContract,
     FileItem,
     ChoosePartner,
     workTable,
@@ -708,17 +712,18 @@ export default {
                   commentTime: undefined
                 },
               ]
-              let num=0;
+              let num = 0;
               for (let comment of this.commentList) {
                 num = num + 1;
-                if(num<=3){
+                if (num <= 3) {
                   getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
                     comment.userId = res.data.userId;
-                })}
-                else{
+                  })
+                }
+                else {
                   getUserByPost({ postName: '专职安全员' }).then(res => {
-                  comment.userId =res.data[0].userId;
-                })
+                    comment.userId = res.data[0].userId;
+                  })
                 }
               }
             }
@@ -833,17 +838,18 @@ export default {
       else if (val == '2') {
         this.commentOpen = true;
         this.meetingOpen = false;
-        let num=0;
+        let num = 0;
         for (let comment of this.commentList) {
           num = num + 1;
-          if(num<=3){
+          if (num <= 3) {
             getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
               comment.userId = res.data.userId;
-          })}
-          else{
+            })
+          }
+          else {
             getUserByPost({ postName: '专职安全员' }).then(res => {
-            comment.userId =res.data[0].userId;
-          })
+              comment.userId = res.data[0].userId;
+            })
           }
         }
       }
@@ -892,6 +898,9 @@ export default {
         this.chooseProjectList.forEach(item => {
           addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId })
         })
+        this.connectContractList.forEach(item => {
+          addContractSubcontract({ subContractId: subContractId, contractId: item.contractId })
+        })
         for (let work of this.workList) {
           work.contractId = subContractId;
           await addContractWork(work);
@@ -996,6 +1005,9 @@ export default {
             this.chooseProjectList.forEach(item => {
               addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId })
             })
+            this.connectContractList.forEach(item => {
+              addContractSubcontract({ subContractId: subContractId, contractId: item.contractId })
+            })
             for (let work of this.workList) {
               work.contractId = subContractId;
               addContractWork(work);
@@ -1065,6 +1077,12 @@ export default {
         for (let item of this.chooseProjectList) {
           await addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId });
         }
+        // 删除承接分包合同
+        await delContractSubcontract(subContractId);
+        // 添加新的承接分包合同
+        for (let item of this.connectContractList) {
+          await addContractSubcontract({ subContractId: subContractId, contractId: item.contractId });
+        }
         // 删除合同工作
         await delContractWork(subContractId);
         // 添加新的合同工作
@@ -1120,6 +1138,19 @@ export default {
         })
       }
     },
+    async confirmContract(val) {
+      let isSame = this.haveSameIds([val], this.connectContractList, 'contractId');
+      if (isSame) {
+        this.$message.error('请勿重复添加已有的合同');
+        return
+      }
+      this.contractOpen = false;
+      this.connectContractList.push(val)
+
+    },
+    haveSameIds(arr1, arr2, key) {
+      return arr1.some(obj1 => arr2.some(obj2 => obj1[key] === obj2[key]))
+    },
     // 获取合同详情
     fetchContracts(projectId) {
       return new Promise((resolve, reject) => {

oa-ui/src/views/llm/chat/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-04-07 14:14:05
  * @LastEditors: wrh
- * @LastEditTime: 2025-11-19 16:23:11
+ * @LastEditTime: 2025-12-17 16:24:24
 -->
 <template>
   <div class="app-container">
@@ -262,7 +262,7 @@
 
             <div class="input-wrapper">
               <el-input v-model="inputMessage" type="textarea" :rows="1" :autosize="{ minRows: 1, maxRows: 6 }"
-                placeholder="输入您的问题..." @keydown.native.enter="handleEnter" @keydown.native.ctrl.enter="handleCtrlEnter"
+                placeholder="输入您的问题..." @keydown.native.enter="handleKeyDown" @keydown.native.ctrl.enter="handleKeyDown"
                 class="message-input" resize="none" />
               <div class="input-actions">
                 <el-button circle size="small" class="action-btn" @click="handleFileUpload" icon="el-icon-paperclip">
@@ -294,6 +294,7 @@ import { listChat, addChat, updateChat } from "@/api/llm/chat";
 import { listDocument, uploadDocument } from "@/api/llm/document";
 import { getAnswer, getAnswerWithDocument } from "@/api/llm/session";
 import logoImg from '@/assets/images/logo.png'
+import { marked } from 'marked';
 
 export default {
   name: 'ChatView',
@@ -679,8 +680,8 @@ export default {
     },
 
     formatMessage(content) {
-      // 简单的消息格式化，可以扩展支持markdown等
-      return content.replace(/\n/g, '<br>');
+      // 使用marked.js解析markdown内容
+      return marked(content);
     },
 
     formatMessageTime(time) {
@@ -1324,4 +1325,134 @@ export default {
     transform: rotate(360deg);
   }
 }
+
+/* Markdown样式 */
+.message-bubble >>> .message-text {
+  /* 标题样式 */
+  h1 {
+    font-size: 24px;
+    font-weight: 700;
+    margin: 16px 0 12px 0;
+    color: #333;
+  }
+
+  h2 {
+    font-size: 20px;
+    font-weight: 600;
+    margin: 14px 0 10px 0;
+    color: #333;
+  }
+
+  h3 {
+    font-size: 18px;
+    font-weight: 600;
+    margin: 12px 0 8px 0;
+    color: #333;
+  }
+
+  h4, h5, h6 {
+    font-size: 16px;
+    font-weight: 600;
+    margin: 10px 0 6px 0;
+    color: #333;
+  }
+
+  /* 段落样式 */
+  p {
+    margin: 8px 0;
+    line-height: 1.6;
+  }
+
+  /* 列表样式 */
+  ul, ol {
+    margin: 8px 0;
+    padding-left: 24px;
+  }
+
+  li {
+    margin: 4px 0;
+    line-height: 1.6;
+  }
+
+  /* 代码块样式 */
+  pre {
+    background-color: #f5f5f5;
+    border-radius: 6px;
+    padding: 12px;
+    overflow-x: auto;
+    margin: 12px 0;
+    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+    font-size: 14px;
+    line-height: 1.5;
+  }
+
+  code {
+    background-color: #f0f0f0;
+    border-radius: 3px;
+    padding: 2px 6px;
+    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+    font-size: 14px;
+  }
+
+  pre code {
+    background-color: transparent;
+    padding: 0;
+  }
+
+  /* 引用样式 */
+  blockquote {
+    border-left: 4px solid #007bff;
+    padding: 8px 12px;
+    margin: 12px 0;
+    background-color: #f8f9fa;
+    color: #666;
+    border-radius: 0 6px 6px 0;
+  }
+
+  /* 表格样式 */
+  table {
+    border-collapse: collapse;
+    width: 100%;
+    margin: 12px 0;
+  }
+
+  th, td {
+    border: 1px solid #e9ecef;
+    padding: 8px 12px;
+    text-align: left;
+  }
+
+  th {
+    background-color: #f8f9fa;
+    font-weight: 600;
+  }
+
+  /* 链接样式 */
+  a {
+    color: #007bff;
+    text-decoration: none;
+    transition: color 0.2s ease;
+  }
+
+  a:hover {
+    color: #0056b3;
+    text-decoration: underline;
+  }
+
+  /* 粗体和斜体样式 */
+  strong {
+    font-weight: 600;
+  }
+
+  em {
+    font-style: italic;
+  }
+
+  /* 水平线样式 */
+  hr {
+    border: none;
+    border-top: 1px solid #e9ecef;
+    margin: 20px 0;
+  }
+}
 </style>

oa-ui/src/views/oa/budget/index.vue

@@ -51,6 +51,7 @@
           {{ getUserName(scope.row.compiler) }}
         </template>
       </el-table-column>
+      <el-table-column label="编制时间" align="center" prop="createTime" />
       <el-table-column label="审核人" align="center" prop="auditor">
         <template slot-scope="scope">
           {{ getUserName(scope.row.auditor) }}

oa-ui/src/views/oa/car/index.vue

@@ -132,18 +132,22 @@
           <el-input v-model="form.expectKm" placeholder="请输入里程" style="width:130px;margin-right:10px;" />
           <span>万千米</span>
         </el-form-item>
-        <el-form-item label="油耗（元/km）" prop="cost">
+        <el-form-item label="油耗（元/km）" prop="fuel">
           <el-input style="width:130px;margin-right:10px;" v-model="form.fuel" placeholder="请输入金额" />
           <span>元</span>
         </el-form-item>
-        <el-form-item label="保险（元/天）" prop="cost">
+        <el-form-item label="保险（元/天）" prop="insurance">
           <el-input style="width:130px;margin-right:10px;" v-model="form.insurance" placeholder="请输入金额" />
           <span>元</span>
         </el-form-item>
-        <el-form-item label="维修（元/天）" prop="cost">
+        <el-form-item label="维修（元/天）" prop="maintenance">
           <el-input style="width:130px;margin-right:10px;" v-model="form.maintenance" placeholder="请输入金额" />
           <span>元</span>
         </el-form-item>
+        <el-form-item label="单日成本" prop="dayCost">
+          <el-input style="width:130px;margin-right:10px;" v-model="form.dayCost" placeholder="请输入金额" />
+          <span>元</span>
+        </el-form-item>
         <el-form-item label="驾驶员" prop="driver">
           <el-select v-model="form.driver" filterable placeholder="请选择" clearable>
             <el-option v-for="item in driverList" :key="item.userId" :label="item.nickName" :value="item.userId">

oa-ui/src/views/oa/study/components/studyHead.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2025-03-05 14:19:02
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-12 16:40:17
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-01-04 11:30:16
 -->
 <template>
   <div class="head-bg">
@@ -22,7 +22,7 @@
         <div class="user-item">
           <div class="u-info-learn" style="cursor:pointer;">
             <em>{{ hours }}h</em>
-            <span>2025学时</span>
+            <span>{{new Date().getFullYear()+"学时"}}</span>
           </div>
         </div>
       </div>

oa-ui/src/views/oa/study/record.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2025-03-12 10:06:03
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-08-12 16:39:40
+ * @LastEditors: wrh
+ * @LastEditTime: 2026-01-05 09:22:11
 -->
 <template>
   <div class="app-container">
@@ -83,7 +83,7 @@
                   <!-- 人员节点 -->
                   <span v-else class="user-node">
                     <i class="el-icon-user"></i>
-                    {{ `${data.user.nickName} (学时：${data.getHours}h)` }}
+                    {{ `${data.user.nickName} (学时：${data.getHours.toFixed(1)}h)` }}
                   </span>
                 </div>
               </el-tree>
@@ -186,7 +186,7 @@ export default {
       getStudyStatistic(this.rankParams).then(res => {
         this.rankList = res.rows.map((item, index) => ({
           ...item,
-          getHours: item.getHours ? item.getHours : 0,
+          getHours: item.getHours ? item.getHours.toFixed(1) : 0,
           rankIndex: (this.rankParams.pageNum - 1) * this.rankParams.pageSize + index + 1
         }));
         this.rankTotal = res.total;

oa-ui/src/views/statistics/components/borrowStatistics.vue

@@ -1,12 +1,12 @@
 <!--
  * @Author: ysh
  * @Date: 2024-10-18 11:17:48
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-20 10:00:35
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-12-26 15:00:24
 -->
 <template>
   <div style="width:100%;" v-loading="loading">
-    <div class="titles">借款和结算统计</div>
+    <div class="titles">借款统计</div>
     <div class="warpper">
       <div class="left">
         <div class="left-top" id="borrowBar"></div>
@@ -318,7 +318,7 @@ export default {
         yAxis: [
           {
             type: 'value',
-            name: '金额',
+            name: '单位：元',
           }
         ],
         series: [

oa-ui/src/views/statistics/components/projectStatistics.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-10-11 16:41:17
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-24 16:16:05
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-12-24 19:13:16
 -->
 <template>
   <div style="width:100%;" v-loading="loading">
@@ -48,6 +48,7 @@ export default {
       archive:{},
       complete:{},
       settle:{},
+      check:{},
       loading: true,
       activeYear: '',
       dataLoading: false,
@@ -93,6 +94,7 @@ export default {
         this.archive = this.datas.archive[0];
         this.complete = this.datas.complete[0];
         this.settle = this.datas.settle[0];
+        this.check = this.datas.check[0];
         this.loading = false;
       }
 
@@ -189,6 +191,18 @@ export default {
             },
             z:3
           },
+          {
+            name:'已核算',
+            type: 'line',
+            data: Object.values(this.check),
+            smooth: true,
+            areaStyle: {},
+            label: {
+              show: true,
+              position: 'top',
+            },
+            z:5
+          },
           {
             name:'总数',
             type: 'line',

oa-ui/src/views/statistics/components/settleStatistics.vue

@@ -1,12 +1,12 @@
 <!--
  * @Author: ysh
  * @Date: 2024-10-18 11:17:48
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-20 10:11:56
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-12-26 14:47:09
 -->
 <template>
   <div style="width:100%;" v-loading="loading">
-    <div class="titles">结算和结算统计</div>
+    <div class="titles">结算和核算统计</div>
     <div class="warpper">
       <div class="left">
         <div class="left-top" id="settleBar"></div>
@@ -30,35 +30,45 @@ export default {
       type: Object,
       require: true,
     },
+    checkData: {
+      type: Object,
+      require: true,
+    },
   },
   watch: {
     settleType() {
       this.initSettleTypePie(this.activeYear)
     },
     settleData() {
-      this.initDatas();
+      this.initSettleDatas();
+    },
+    checkData() {
+      this.initCheckDatas();
     }
   },
   data() {
     return {
       loading: false,
-      settleAmount: {},
       settleType: {},
       settleTypeAmount: {},
       settleYear: {},
-      settleYear: {},
       settleAmount: {},
-      yearProjectAmount: {},
-      yearProjectCount: {},
-      sumSettleAmount: 0,
+      yearSettleProjectAmount: {},
+      yearSettleProjectCount: {},
+      yearCheckProjectAmount: {},
+      yearCheckProjectCount: {},
       sumSettleAmount: 0,
+      sumCheckAmount: 0,
+      checkYear: {},
+      checkAmount: {},
       dataLoading: false,
       activeYear: ''
     }
   },
   created() {
     this.loading = true;
-    this.initDatas();
+    this.initSettleDatas();
+    this.initCheckDatas();
   },
   mounted() {
     this.initSettleYearBar();
@@ -66,17 +76,16 @@ export default {
     this.initSettleTypePie('');
     // this.initSettleTypeAmountPie('');
     this.initSettleProjectLineBar();
-    this.initSettleAmountLine();
   },
   methods: {
-    initDatas() {
+    initSettleDatas() {
       if (Object.keys(this.settleData).length !== 0) {
         this.settleAmount = this.settleData.amount[0];
         this.settleType = this.settleData.type[0];
         this.settleTypeAmount = this.settleData.typeAmount[0];
         this.settleYear = this.settleData.year[0];
-        this.yearProjectAmount = this.settleData.yearProjectAmount[0];
-        this.yearProjectCount = this.settleData.yearProjectCount[0];
+        this.yearSettleProjectAmount = this.settleData.yearProjectAmount[0];
+        this.yearSettleProjectCount = this.settleData.yearProjectCount[0];
         let sum = Object.values(this.settleAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0);
         this.sumSettleAmount = (sum / 10000).toFixed(1)
         this.loading = false;
@@ -84,6 +93,19 @@ export default {
         this.loading = true;
       }
     },
+    initCheckDatas() {
+      if (Object.keys(this.checkData).length !== 0) {
+        this.checkAmount = this.checkData.amount[0];
+        this.checkYear = this.checkData.year[0];
+        this.yearCheckProjectAmount = this.checkData.yearProjectAmount[0];
+        this.yearCheckProjectCount = this.checkData.yearProjectCount[0];
+        let sum = Object.values(this.checkAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0);
+        this.sumCheckAmount = (sum / 10000).toFixed(1)
+        this.loading = false;
+      } else {
+        this.loading = true;
+      }
+    },
     clickYear(charts) {
       let that = this;
       charts.on('click', function (event) {
@@ -115,6 +137,7 @@ export default {
           height: '60%',
           containLabel: true
         },
+        legend: {},
         graphic: [
           {
             type: 'text',
@@ -149,6 +172,7 @@ export default {
         },
         series: [
           {
+            name: "结算",
             data: Object.values(this.settleYear),
             type: 'bar',
             smooth: true,
@@ -159,6 +183,19 @@ export default {
             itemStyle: {
               color: '#3498DB'
             }
+          },
+          {
+            name: "核算",
+            data: Object.values(this.checkYear),
+            type: 'bar',
+            smooth: true,
+            label: {
+              show: true,
+              position: 'top'
+            },
+            itemStyle: {
+              color: '#46CB2B'
+            }
           }
         ]
       };
@@ -170,7 +207,10 @@ export default {
         title: {
           text: '各年结算金额',
           subtext: '结算总额：' + (Object.values(this.settleAmount).reduce((accumulator, currentValue) => {return accumulator + currentValue}, 0)).toFixed(2) + '元' +
-            '（约' + this.sumSettleAmount + '万元）'
+            '（约' + this.sumSettleAmount + '万元）' +
+            "\n" + 
+            '核算总额：' + (Object.values(this.checkAmount).reduce((accumulator, currentValue) => {return accumulator + currentValue}, 0)).toFixed(2) + '元' +
+            '（约' + this.sumCheckAmount + '万元）'
         },
         grid: {
           left: '1%',
@@ -178,6 +218,10 @@ export default {
           bottom: '0%',
           height: '60%',
           containLabel: true
+        },        
+        legend: {
+          right: '0%',
+          orient: 'vertical'
         },
         tooltip: {
           trigger: 'axis',
@@ -198,7 +242,7 @@ export default {
         },
         series: [
           {
-            min: 0,
+            name: "结算",
             data: Object.values(this.settleAmount),
             type: 'line',
             smooth: true,
@@ -212,6 +256,22 @@ export default {
                 }
               }
             }
+          },
+          {
+            name: "核算",
+            data: Object.values(this.checkAmount),
+            type: 'line',
+            smooth: true,
+            label: {
+              show: true,
+              position: 'top',
+              formatter: function (params) {
+                let value = params.value;
+                if (value >= 10000) {
+                  return '约' + (value / 10000).toFixed(1) + '万元'
+                }
+              }
+            }
           }
         ]
       };
@@ -315,7 +375,7 @@ export default {
         xAxis: [
           {
             type: 'category',
-            data: Object.keys(this.yearProjectAmount),
+            data: Object.keys(this.yearSettleProjectAmount),
             axisPointer: {
               type: 'shadow'
             }
@@ -324,11 +384,12 @@ export default {
         yAxis: [
           {
             type: 'value',
-            name: '金额',
+            name: '单位：元',
           }
         ],
         series: [
           {
+            name: "结算",
             type: 'line',
             tooltip: {
               valueFormatter: function (value) {
@@ -336,7 +397,7 @@ export default {
               }
             },
             smooth: true,
-            data: Object.values(this.yearProjectAmount),
+            data: Object.values(this.yearSettleProjectAmount),
             label: {
               show: true,
               position: 'top',
@@ -348,47 +409,16 @@ export default {
               }
             }
           },
-        ]
-      };
-      ehcartsInit(settleProjectChart, 'settleProject', option);
-    },
-    initSettleAmountLine() {
-      let option = {
-        title: {
-          text: '各年结算金额',
-          subtext: '结算总额：' + Object.values(this.settleAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '元' +
-            '（约' + this.sumSettleAmount + '万元）'
-        },
-        grid: {
-          left: '1%',
-          right: '1%',
-          bottom: '0%',
-          height: '60%',
-          containLabel: true
-        },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'none',
-            label: {
-              backgroundColor: '#6a7985'
-            }
-          }
-        },
-        xAxis: {
-          type: 'category',
-          data: Object.keys(this.settleAmount),
-        },
-        yAxis: {
-          type: 'value',
-          name: '单位：元'
-        },
-        series: [
           {
-            min: 0,
-            data: Object.values(this.settleAmount),
+            name: "核算",
             type: 'line',
+            tooltip: {
+              valueFormatter: function (value) {
+                return value + ' 元';
+              }
+            },
             smooth: true,
+            data: Object.values(this.yearCheckProjectAmount),
             label: {
               show: true,
               position: 'top',
@@ -402,8 +432,8 @@ export default {
           }
         ]
       };
-      ehcartsInit(settleAmountChart, 'settleLine', option);
-    }
+      ehcartsInit(settleProjectChart, 'settleProject', option);
+    },
   },
 }
 </script>

oa-ui/src/views/statistics/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-10-11 09:23:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-25 09:50:41
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-12-25 18:31:30
 -->
 <template>
   <div class="app-container bg">
@@ -16,7 +16,7 @@
       <car-device-statistics v-else-if="isActive == 'device'" :deviceData="deviceInfo"
         :carData="carInfo"></car-device-statistics>
       <borrow-statistics v-else-if="isActive == 'borrow'" :borrowData="borrowInfo"></borrow-statistics>
-      <settle-statistics v-else-if="isActive == 'settle'" :settleData="settleInfo"></settle-statistics>
+      <settle-statistics v-else-if="isActive == 'settle'" :settleData="settleInfo" :checkData="checkInfo"></settle-statistics>
     </div>
   </div>
 </template>
@@ -28,6 +28,7 @@ import { getCarStatistic } from '@/api/oa/car/car';
 import { getDeviceStatistic } from '@/api/oa/device/device';
 import { getBorrowStatistic } from '@/api/oa/borrow/borrow';
 import { getSettleStatistic } from '@/api/oa/settle/settle';
+import { getCheckStatistic } from '@/api/oa/budget/check';
 import ProjectStatistics from './components/projectStatistics.vue';
 import contractStatistics from './components/contractStatistics.vue';
 import topHead from './components/topHead.vue';
@@ -45,6 +46,7 @@ export default {
       deviceInfo: {},
       borrowInfo: {},
       settleInfo:{},
+      checkInfo:{},
       dataLoading: true,
     }
   },
@@ -56,6 +58,7 @@ export default {
     this.getDeviceInfo();
     this.getBorrowInfo();
     this.getSettleInfo();
+    this.getCheckInfo();
   },
   mounted() {
 
@@ -90,6 +93,10 @@ export default {
       let res = await getSettleStatistic();
       this.settleInfo = res.data;
     },
+    async getCheckInfo(){
+      let res = await getCheckStatistic();
+      this.checkInfo = res.data;
+    },
     changeClick(val) {
       this.isActive = val
     }

package-lock.json

@@ -1,6 +0,0 @@
-{
-  "name": "cmc-oa",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}