update 标准征求意见流程-发起流程时传参
This commit is contained in:
+2
-1
@@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.projectassess.controller;
|
|||||||
|
|
||||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
||||||
import com.jero.common.aspect.annotation.DictPoint;
|
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.ProcessFbStandardConsultationVO;
|
||||||
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
||||||
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess;
|
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess;
|
||||||
@@ -125,7 +126,7 @@ public class ProcessProjectAssessController extends JeroController<ProcessProjec
|
|||||||
ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm();
|
ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm();
|
||||||
processProjectAssessTerm.setTermNumber(lawsAssess.getStandardNumber());
|
processProjectAssessTerm.setTermNumber(lawsAssess.getStandardNumber());
|
||||||
processProjectAssessTerm.setTermName(lawsAssess.getStandardName());
|
processProjectAssessTerm.setTermName(lawsAssess.getStandardName());
|
||||||
processProjectAssessTerm.setCanAssignFlag(true);
|
processProjectAssessTerm.setCanAssignFlag(YesOrNoEnum.YES.getInteger());
|
||||||
allList.add(processProjectAssessTerm);
|
allList.add(processProjectAssessTerm);
|
||||||
}
|
}
|
||||||
return Result.OK(allList);
|
return Result.OK(allList);
|
||||||
|
|||||||
+18
-2
@@ -91,9 +91,25 @@ public class ProcessProjectAssessTerm {
|
|||||||
@ApiModelProperty(value = "条款内容")
|
@ApiModelProperty(value = "条款内容")
|
||||||
private String termText;
|
private String termText;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@ApiModelProperty(value = "拆分单id")
|
||||||
|
private String splitInfoId;
|
||||||
|
|
||||||
@ApiModelProperty(value = "可以分派标识")
|
@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;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
+5
-2
@@ -986,7 +986,9 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
|||||||
DocumentSplitInfo documentSplitInfo1 = documentSplitMapper.queryDocumentSplitInfoById(id);
|
DocumentSplitInfo documentSplitInfo1 = documentSplitMapper.queryDocumentSplitInfoById(id);
|
||||||
processProjectAssessTerm.setTermNumber(documentSplitInfo1.getSerialNumber());
|
processProjectAssessTerm.setTermNumber(documentSplitInfo1.getSerialNumber());
|
||||||
processProjectAssessTerm.setTermName(documentSplitInfo1.getTitle());
|
processProjectAssessTerm.setTermName(documentSplitInfo1.getTitle());
|
||||||
processProjectAssessTerm.setCanAssignFlag(false);
|
processProjectAssessTerm.setSplitInfoId(id);
|
||||||
|
processProjectAssessTerm.setTermText(documentSplitInfo1.getFileType());
|
||||||
|
processProjectAssessTerm.setCanAssignFlag(YesOrNoEnum.NO.getInteger());
|
||||||
processProjectAssessTermList.add(processProjectAssessTerm);
|
processProjectAssessTermList.add(processProjectAssessTerm);
|
||||||
// 文档拆分详情
|
// 文档拆分详情
|
||||||
Map<String, Object> parameter = new HashMap<>();
|
Map<String, Object> parameter = new HashMap<>();
|
||||||
@@ -997,7 +999,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
|||||||
processProjectAssessTerm1.setTermNumber(String.valueOf(map.get("item_num")));
|
processProjectAssessTerm1.setTermNumber(String.valueOf(map.get("item_num")));
|
||||||
processProjectAssessTerm1.setTermName(String.valueOf(map.get("item_title")));
|
processProjectAssessTerm1.setTermName(String.valueOf(map.get("item_title")));
|
||||||
processProjectAssessTerm1.setTermText(String.valueOf(map.get("item_content")));
|
processProjectAssessTerm1.setTermText(String.valueOf(map.get("item_content")));
|
||||||
processProjectAssessTerm1.setCanAssignFlag(true);
|
processProjectAssessTerm1.setSplitInfoId(id);
|
||||||
|
processProjectAssessTerm1.setCanAssignFlag(YesOrNoEnum.YES.getInteger());
|
||||||
processProjectAssessTermList.add(processProjectAssessTerm1);
|
processProjectAssessTermList.add(processProjectAssessTerm1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user