完成合同审核的优化和调整

ruoyi-admin/src/main/resources/application-dev.yml

@@ -108,7 +108,7 @@ spring.data:
     # 数据库索引
     database: 0
     # redis 密码必须配置
-#    password: root
+#    password: F*Nx=BZli+ZCCI-Fil+3
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualCaseFilesController.java

@@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/productManagement/ContractualCaseFiles")
+@RequestMapping("/contractreview/contractualCaseFiles")
 public class ContractualCaseFilesController extends BaseController {
 
     private final IContractualCaseFilesService contractualCaseFilesService;

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualRegulationArticlesController.java

@@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/productManagement/regulationArticles")
+@RequestMapping("/contractreview/regulationArticles")
 public class ContractualRegulationArticlesController extends BaseController {
 
     private final IContractualRegulationArticlesService contractualRegulationArticlesService;

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualRegulationNamesController.java

@@ -32,7 +32,7 @@ import org.dromara.productManagement.domain.vo.ContractualRegulationArticlesVo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/productManagement/ContractualRegulationNames")
+@RequestMapping("/contractreview/contractualRegulationNames")
 public class ContractualRegulationNamesController extends BaseController {
 
     private final IContractualRegulationNamesService contractualRegulationNamesService;

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskChecklistController.java

@@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/productManagement/ContractualTaskChecklist")
+@RequestMapping("/contractreview/contractualTaskChecklist")
 public class ContractualTaskChecklistController extends BaseController {
 
     private final IContractualTaskChecklistService contractualTaskChecklistService;

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskResultsController.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/productManagement/ContractualTaskResults")
+@RequestMapping("/contractreview/contractualTaskResults")
 public class ContractualTaskResultsController extends BaseController {
 
     private final IContractualTaskResultsService contractualTaskResultsService;

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTaskTypeController.java

@@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/productManagement/ContractualTaskType")
+@RequestMapping("/contractreview/contractualTaskType")
 public class ContractualTaskTypeController extends BaseController {
 
     private final IContractualTaskTypeService contractualTaskTypeService;

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualTasksController.java

@@ -37,7 +37,7 @@ import org.dromara.productManagement.domain.StartContractReviewRequest;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/productManagement/ContractualTasks")
+@RequestMapping("/contractreview/contractualTasks")
 public class ContractualTasksController extends BaseController {
 
     private final IContractualTasksService contractualTasksService;

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocumentTaskResultsController.java

@@ -32,7 +32,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/productManagement/DocumentTaskResults")
+@RequestMapping("/documentreview/documentTaskResults")
 public class DocumentTaskResultsController extends BaseController {
 
     private final IDocumentTaskResultsService documentTaskResultsService;

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/DocumentTasksController.java

@@ -38,7 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/productManagement/DocumentTasks")
+@RequestMapping("/documentreview/documentTasks")
 public class DocumentTasksController extends BaseController {
 
     private final IDocumentTasksService documentTasksService;

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualRegulationNamesServiceImpl.java

@@ -64,7 +64,6 @@ public class ContractualRegulationNamesServiceImpl implements IContractualRegula
 
     private final ContractualRegulationNamesMapper baseMapper;
     private final ContractualRegulationArticlesMapper articlesMapper;
-    private final IContractualRegulationArticlesService articlesService;
     private final ISysOssService ossService;
     private static final Logger log = LoggerFactory.getLogger(ContractualRegulationNamesServiceImpl.class);
 

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTaskResultsServiceImpl.java

@@ -653,6 +653,18 @@ public class ContractualTaskResultsServiceImpl implements IContractualTaskResult
                         return arrayNode.get(0).asText();
                     }
                 }
+            } else if (fieldName.equals("review_points_all")) {
+                if (jsonNode.has("review_points") && jsonNode.get("review_points").isArray()) {
+                    JsonNode arrayNode = jsonNode.get("review_points");
+                    StringBuilder result = new StringBuilder();
+                    for (int i = 0; i < arrayNode.size(); i++) {
+                        if (i > 0) {
+                            result.append("\n");
+                        }
+                        result.append(arrayNode.get(i).asText());
+                    }
+                    return result.toString();
+                }
             } else if (fieldName.equals("review_content")) {
                 if (jsonNode.has("review_content") && !jsonNode.get("review_content").isNull()) {
                     return jsonNode.get("review_content").asText();
@@ -675,6 +687,27 @@ public class ContractualTaskResultsServiceImpl implements IContractualTaskResult
         }
 
         XWPFParagraph paragraph = cell.addParagraph();
+        
+        if (text != null && text.contains("\n")) {
+            // 处理包含换行符的文本
+            String[] lines = text.split("\n");
+            for (int i = 0; i < lines.length; i++) {
+                XWPFRun run = paragraph.createRun();
+                run.setText(lines[i]);
+                run.setFontFamily("Microsoft YaHei");
+                run.setFontSize(12);
+                
+                if (isHeader) {
+                    run.setBold(true);
+                }
+                
+                // 除了最后一行，其他行都添加换行符
+                if (i < lines.length - 1) {
+                    run.addBreak();
+                }
+            }
+        } else {
+            // 处理普通文本
             XWPFRun run = paragraph.createRun();
             run.setText(text != null ? text : "");
             run.setFontFamily("Microsoft YaHei");
@@ -682,6 +715,10 @@ public class ContractualTaskResultsServiceImpl implements IContractualTaskResult
             
             if (isHeader) {
                 run.setBold(true);
+            }
+        }
+
+        if (isHeader) {
             // 设置表头背景色
             cell.setColor("E6E6E6");
         }
@@ -729,7 +766,7 @@ public class ContractualTaskResultsServiceImpl implements IContractualTaskResult
                 // 法规依据标签行（跨两列合并）
                 config.addCellConfig(new CellConfiguration(2, 0).header("法规依据").mergeHorizontal(2));
                 // 法规依据内容行（跨两列合并）
-                config.addCellConfig(new CellConfiguration(3, 0).field("review_points[0]").mergeHorizontal(2));
+                config.addCellConfig(new CellConfiguration(3, 0).field("review_points_all").mergeHorizontal(2));
                 break;
 
             case "一致性审查":
@@ -792,6 +829,8 @@ public class ContractualTaskResultsServiceImpl implements IContractualTaskResult
                 return formatReviewBasisCombined(item.getReviewBasis());
             case "review_points[0]":
                 return formatReviewBasisField(item.getReviewBasis(), "review_points[0]");
+            case "review_points_all":
+                return formatReviewBasisField(item.getReviewBasis(), "review_points_all");
             case "review_content":
                 return formatReviewBasisField(item.getReviewBasis(), "review_content");
             case "":

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/ContractualTasksServiceImpl.java

@@ -127,6 +127,7 @@ public class ContractualTasksServiceImpl extends AbstractTaskProcessor<Contractu
         lqw.like(bo.getDocumentName() != null, ContractualTasks::getDocumentName, bo.getDocumentName());
         lqw.like(bo.getReviewTypes() != null, ContractualTasks::getReviewTypes, bo.getReviewTypes());
         lqw.eq(bo.getProgressStatus() != null, ContractualTasks::getProgressStatus, bo.getProgressStatus());
+        lqw.orderByDesc(ContractualTasks::getCreateTime);
         return lqw;
     }
 

zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/service/impl/DocumentTasksServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.productManagement.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.io.FileUtil;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.productManagement.common.service.AbstractTaskProcessor;
 import org.dromara.productManagement.domain.*;
 import org.dromara.productManagement.enums.TaskEnum;
@@ -134,6 +136,9 @@ public class DocumentTasksServiceImpl extends AbstractTaskProcessor<DocumentTask
         if (taskNames != null && !taskNames.isEmpty()) {
             lqw.in(DocumentTasks::getTaskName, taskNames);
         }
+        if (!StpUtil.hasRole("superadmin")) {
+            lqw.eq(DocumentTasks::getCreateBy, LoginHelper.getUserId());
+        }
         lqw.like(StringUtils.isNotBlank(bo.getDocumentName()), DocumentTasks::getDocumentName, bo.getDocumentName());
         lqw.eq(StringUtils.isNotBlank(bo.getProgressStatus()), DocumentTasks::getProgressStatus, bo.getProgressStatus());
         lqw.orderByDesc(DocumentTasks::getCreateTime);