ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 标准征求意见流程-查询条款列表

Browse Source
This commit is contained in:
lijiarao
2023-12-13 11:49:57 +08:00
parent b8ec9bb8fb
commit 28e8c96184
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessController.java
+10 -14
View File
@@ -116,21 +116,17 @@ public class ProcessProjectAssessController extends JeroController<ProcessProjec
public Result<List<ProcessProjectAssessTerm>> processProjectAssessGetList(@RequestBody List<LawsAssess> lawsAssessList) { public Result<List<ProcessProjectAssessTerm>> processProjectAssessGetList(@RequestBody List<LawsAssess> lawsAssessList) {
List<ProcessProjectAssessTerm> allList = new ArrayList<>(); List<ProcessProjectAssessTerm> allList = new ArrayList<>();
for (LawsAssess lawsAssess : lawsAssessList) { for (LawsAssess lawsAssess : lawsAssessList) {
DecompositionOrderSourceVO decompositionOrderSourceVO = lawsAssess.getDecompositionOrderSourceVO(); String sarFileSplitInfoId = lawsAssess.getSarFileSplitInfoId();
if (decompositionOrderSourceVO != null){ if (StringUtils.isNotBlank(sarFileSplitInfoId)) {
String sarFileSplitInfoId = decompositionOrderSourceVO.getSarFileSplitInfoId(); List<ProcessProjectAssessTerm> processProjectAssessTermList = documentSplitService.processProjectAssessGetList(sarFileSplitInfoId);
if (StringUtils.isNotBlank(sarFileSplitInfoId)){ allList.addAll(processProjectAssessTermList);
List<ProcessProjectAssessTerm> processProjectAssessTermList = documentSplitService.processProjectAssessGetList(sarFileSplitInfoId); continue;
allList.addAll(processProjectAssessTermList);
continue;
}
ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm();
processProjectAssessTerm.setTermNumber(lawsAssess.getStandardNumber());
processProjectAssessTerm.setTermName(lawsAssess.getStandardName());
processProjectAssessTerm.setCanAssignFlag(true);
allList.add(processProjectAssessTerm);
} }
ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm();
processProjectAssessTerm.setTermNumber(lawsAssess.getStandardNumber());
processProjectAssessTerm.setTermName(lawsAssess.getStandardName());
processProjectAssessTerm.setCanAssignFlag(true);
allList.add(processProjectAssessTerm);
} }
return Result.OK(allList); return Result.OK(allList);
} }
laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssess.java
+2 -2
View File
@@ -109,8 +109,8 @@ public class LawsAssess implements Serializable {
private List<DecompositionOrderSourceVO> decompositionOrderSourceVOList; private List<DecompositionOrderSourceVO> decompositionOrderSourceVOList;
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "分解单来源") @ApiModelProperty(value = "分解单id")
private DecompositionOrderSourceVO decompositionOrderSourceVO; private String sarFileSplitInfoId;
@TableField(exist = false) @TableField(exist = false)
@Excel(name = "责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id", exportConvert = true) @Excel(name = "责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id", exportConvert = true)