From 8b023263930ba07a2f6ea53b82e6f298d54e5a98 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 13 Dec 2023 15:51:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B-=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=97=B6=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessProjectAssessController.java       |  3 ++-
 .../entity/ProcessProjectAssessTerm.java      | 20 +++++++++++++++++--
 .../impl/DocumentSplitServiceImpl.java        |  7 +++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java
index b1917bad..6d9c347d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java
@@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.projectassess.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.jero.common.aspect.annotation.DictPoint;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess;
@@ -125,7 +126,7 @@ public class ProcessProjectAssessController extends JeroController<ProcessProjec
             ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm();
             processProjectAssessTerm.setTermNumber(lawsAssess.getStandardNumber());
             processProjectAssessTerm.setTermName(lawsAssess.getStandardName());
-            processProjectAssessTerm.setCanAssignFlag(true);
+            processProjectAssessTerm.setCanAssignFlag(YesOrNoEnum.YES.getInteger());
             allList.add(processProjectAssessTerm);
         }
         return Result.OK(allList);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java
index 6a2b5c48..f315c9b4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java
@@ -91,9 +91,25 @@ public class ProcessProjectAssessTerm {
     @ApiModelProperty(value = "条款内容")
     private String termText;
 
-    @TableField(exist = false)
+    @ApiModelProperty(value = "拆分单id")
+    private String splitInfoId;
+
     @ApiModelProperty(value = "可以分派标识")
-    private Boolean canAssignFlag;
+    private Integer canAssignFlag;
+
+    /**
+     * 责任单位id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "责任单位id")
+    private String responsibleUnits;
+
+    /**
+     * 责任单位负责人id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "责任单位负责人id")
+    private String responsibleUnitLeaders;
 
 
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
index a1329b6b..e90b9cc4 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -986,7 +986,9 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             DocumentSplitInfo documentSplitInfo1 = documentSplitMapper.queryDocumentSplitInfoById(id);
             processProjectAssessTerm.setTermNumber(documentSplitInfo1.getSerialNumber());
             processProjectAssessTerm.setTermName(documentSplitInfo1.getTitle());
-            processProjectAssessTerm.setCanAssignFlag(false);
+            processProjectAssessTerm.setSplitInfoId(id);
+            processProjectAssessTerm.setTermText(documentSplitInfo1.getFileType());
+            processProjectAssessTerm.setCanAssignFlag(YesOrNoEnum.NO.getInteger());
             processProjectAssessTermList.add(processProjectAssessTerm);
             // 文档拆分详情
             Map<String, Object> parameter = new HashMap<>();
@@ -997,7 +999,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
                 processProjectAssessTerm1.setTermNumber(String.valueOf(map.get("item_num")));
                 processProjectAssessTerm1.setTermName(String.valueOf(map.get("item_title")));
                 processProjectAssessTerm1.setTermText(String.valueOf(map.get("item_content")));
-                processProjectAssessTerm1.setCanAssignFlag(true);
+                processProjectAssessTerm1.setSplitInfoId(id);
+                processProjectAssessTerm1.setCanAssignFlag(YesOrNoEnum.YES.getInteger());
                 processProjectAssessTermList.add(processProjectAssessTerm1);
             }
         }