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 15:51:29 +08:00
parent 11d16531db
commit 8b02326393
3 changed files with 25 additions and 5 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
+2 -1
View File
@@ -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);
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java
+18 -2
View File
@@ -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;
}
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+5 -2
View File
@@ -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);
}
}