From 28e8c961844548164a252a4af07cda8341951726 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 13 Dec 2023 11:49:57 +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-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessProjectAssessController.java | 24 ++++++++----------- .../projectLibrary/entity/LawsAssess.java | 4 ++-- 2 files changed, 12 insertions(+), 16 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 f5c1d798..b1917bad 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 @@ -116,21 +116,17 @@ public class ProcessProjectAssessController extends JeroController> processProjectAssessGetList(@RequestBody List lawsAssessList) { List allList = new ArrayList<>(); for (LawsAssess lawsAssess : lawsAssessList) { - DecompositionOrderSourceVO decompositionOrderSourceVO = lawsAssess.getDecompositionOrderSourceVO(); - if (decompositionOrderSourceVO != null){ - String sarFileSplitInfoId = decompositionOrderSourceVO.getSarFileSplitInfoId(); - if (StringUtils.isNotBlank(sarFileSplitInfoId)){ - List processProjectAssessTermList = documentSplitService.processProjectAssessGetList(sarFileSplitInfoId); - allList.addAll(processProjectAssessTermList); - continue; - } - ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm(); - processProjectAssessTerm.setTermNumber(lawsAssess.getStandardNumber()); - processProjectAssessTerm.setTermName(lawsAssess.getStandardName()); - processProjectAssessTerm.setCanAssignFlag(true); - allList.add(processProjectAssessTerm); + String sarFileSplitInfoId = lawsAssess.getSarFileSplitInfoId(); + if (StringUtils.isNotBlank(sarFileSplitInfoId)) { + List processProjectAssessTermList = documentSplitService.processProjectAssessGetList(sarFileSplitInfoId); + allList.addAll(processProjectAssessTermList); + continue; } - + ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm(); + processProjectAssessTerm.setTermNumber(lawsAssess.getStandardNumber()); + processProjectAssessTerm.setTermName(lawsAssess.getStandardName()); + processProjectAssessTerm.setCanAssignFlag(true); + allList.add(processProjectAssessTerm); } return Result.OK(allList); } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java index da495324..662999b3 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java @@ -109,8 +109,8 @@ public class LawsAssess implements Serializable { private List decompositionOrderSourceVOList; @TableField(exist = false) - @ApiModelProperty(value = "分解单来源") - private DecompositionOrderSourceVO decompositionOrderSourceVO; + @ApiModelProperty(value = "分解单id") + private String sarFileSplitInfoId; @TableField(exist = false) @Excel(name = "责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id", exportConvert = true)