Commit 074c3b78 by 赵剑炜

调整流程搭配设置

parent adfd12ea
...@@ -49,5 +49,9 @@ public class SysFormController { ...@@ -49,5 +49,9 @@ public class SysFormController {
public ApiRes<PageResult<TemplateGroupVo>> GetFormList(@RequestBody BaseRequest br) { public ApiRes<PageResult<TemplateGroupVo>> GetFormList(@RequestBody BaseRequest br) {
return ApiRes.success(SysFormService.getFormList(br)); return ApiRes.success(SysFormService.getFormList(br));
} }
@ApiOperation("检查配置是否可用")
@PostMapping(value = "CheckConfig")
public ApiRes<Boolean> CheckConfig(@RequestBody String br) {
return ApiRes.success(SysFormService.CheckConfig(br));
}
} }
...@@ -55,6 +55,7 @@ public class ProcessTemplates { ...@@ -55,6 +55,7 @@ public class ProcessTemplates {
private String remark; private String remark;
private String notify; private String notify;
private String config;
/** /**
* 是否已停用 * 是否已停用
......
...@@ -51,4 +51,10 @@ public interface ISysFormService { ...@@ -51,4 +51,10 @@ public interface ISysFormService {
*/ */
PageResult<TemplateGroupVo> getFormList(BaseRequest br); PageResult<TemplateGroupVo> getFormList(BaseRequest br);
/**
* 获取用户可见表单
*
* @return
*/
Boolean CheckConfig(String br);
} }
...@@ -136,9 +136,25 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc ...@@ -136,9 +136,25 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
processTemplates.setFormName(process.getFormName()); processTemplates.setFormName(process.getFormName());
processTemplates.setRemark(process.getRemark()); processTemplates.setRemark(process.getRemark());
processTemplates.setUpdated(new Date()); processTemplates.setUpdated(new Date());
processTemplates.setConfig(process.getConfig());
// processTemplates.
return processTemplateService.updateById(processTemplates);//更新表单明细表信息 return processTemplateService.updateById(processTemplates);//更新表单明细表信息
} }
public Boolean CheckConfig(String config)
{
ProcessTemplates process= this.getOne(new LambdaQueryWrapper<ProcessTemplates>()
.eq(ProcessTemplates::getConfig, config)
);
if (process!=null)
{
return false;
}
else
{
return true;
}
}
public PageResult<TemplateGroupVo> getFormList(BaseRequest br) public PageResult<TemplateGroupVo> getFormList(BaseRequest br)
{ {
Map<String, Object> params = br.getParams(); Map<String, Object> params = br.getParams();
...@@ -178,6 +194,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc ...@@ -178,6 +194,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
} }
templates.add(TemplateGroupVo.builder() templates.add(TemplateGroupVo.builder()
.formId(v.getTemplateId()) .formId(v.getTemplateId())
.config(v.getConfig())
.remark(v.getRemark()) .remark(v.getRemark())
.formName(v.getFormName()) .formName(v.getFormName())
.orgId(String.valueOf(v.getOrgId())) .orgId(String.valueOf(v.getOrgId()))
......
...@@ -21,6 +21,7 @@ public class TemplateGroupVo { ...@@ -21,6 +21,7 @@ public class TemplateGroupVo {
private String processDefinitionId; private String processDefinitionId;
private String formName; private String formName;
private String orgId; private String orgId;
private String config;
private Boolean isStop; private Boolean isStop;
private String remark; private String remark;
private String updated; private String updated;
......
...@@ -8,5 +8,6 @@ public class UpdateProcessVO { ...@@ -8,5 +8,6 @@ public class UpdateProcessVO {
private String formJson; private String formJson;
private String formName; private String formName;
private String processJson; private String processJson;
private String config;
private String remark; private String remark;
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论