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-20 16:30:31 +08:00
parent 7749232292
commit fdb486d05a
5 changed files with 4 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+3 -1
View File
@@ -493,7 +493,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
queryWrapper.eq(ProcessNode::getIsView, 1);
queryWrapper.eq(ProcessNode::getXmlNodeId, nodeId);
ProcessNode processNode = processNodeService.getOne(queryWrapper, false);
if (processNode == null){
return;
}
List<ProcessNodeLink> linkList = new ArrayList<>();
userIdList.forEach(userId -> {
ProcessNodeLink link = new ProcessNodeLink();
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessLinkController.java
-162
View File
@@ -1,162 +0,0 @@
package com.jero.modules.activiti.process.projectassess.controller;
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessLink;
import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessLinkService;
import com.jero.common.api.vo.ResultCommon;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.*;
import com.jero.modules.system.vo.IdMapBody;
import com.jero.modules.system.vo.IdsMapBody;
import org.apache.commons.lang3.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
/**
* 项目合规评估流程关联标准(process_project_assess_link)表控制层
*
* @author xxxxx
*/
@Slf4j
@Api(tags = "项目合规评估流程关联标准")
@RestController
@RequestMapping("ProcessProjectAssessLink")
public class ProcessProjectAssessLinkController extends JeroController<ProcessProjectAssessLink, ProcessProjectAssessLinkService> {
/**
* 服务对象
*/
@Resource
private ProcessProjectAssessLinkService processProjectAssessLinkService;
/**
* 分页列表查询
*/
@ApiOperation(value = "项目合规评估流程关联标准-分页列表查询", notes = "项目合规评估流程关联标准-分页列表查询")
@GetMapping(value = "/page")
public Result<IPage<ProcessProjectAssessLink>> queryPageList(ProcessProjectAssessLink processProjectAssessLink,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ProcessProjectAssessLink> queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessLink, req.getParameterMap());
Page<ProcessProjectAssessLink> page = new Page<>(pageNo, pageSize);
IPage<ProcessProjectAssessLink> pageList = processProjectAssessLinkService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*/
@ApiOperation(value = "项目合规评估流程关联标准-列表查询", notes = "项目合规评估流程关联标准-列表查询")
@GetMapping(value = "/list")
public Result<List<ProcessProjectAssessLink>> queryList(ProcessProjectAssessLink processProjectAssessLink,
HttpServletRequest req) {
QueryWrapper<ProcessProjectAssessLink> queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessLink, req.getParameterMap());
List<ProcessProjectAssessLink> list = processProjectAssessLinkService.list(queryWrapper);
return Result.OK(list);
}
/**
* 添加
*/
@AutoLog(value = "项目合规评估流程关联标准-添加")
@ApiOperation(value = "项目合规评估流程关联标准-添加", notes = "项目合规评估流程关联标准-添加")
@PostMapping(value = "/add")
public Result<String> add(@Validated @RequestBody ProcessProjectAssessLink processProjectAssessLink) {
processProjectAssessLinkService.add(processProjectAssessLink);
return Result.OK(ResultCommon.OK);
}
/**
* 编辑
*/
@AutoLog(value = "项目合规评估流程关联标准-编辑")
@ApiOperation(value = "项目合规评估流程关联标准-编辑", notes = "项目合规评估流程关联标准-编辑")
@PostMapping(value = "/edit")
public Result<String> edit(@Validated @RequestBody ProcessProjectAssessLink processProjectAssessLink) {
processProjectAssessLinkService.editById(processProjectAssessLink);
return Result.OK(ResultCommon.EDIT_OK);
}
/**
* 通过id删除
*/
@AutoLog(value = "项目合规评估流程关联标准-通过id删除")
@ApiOperation(value = "项目合规评估流程关联标准-通过id删除", notes = "项目合规评估流程关联标准-通过id删除")
@PostMapping(value = "/delete")
public Result<String> delete(@RequestBody IdMapBody map) {
String id = map.getId();
if (StringUtils.isBlank(id)) {
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
}
processProjectAssessLinkService.deleteById(id);
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED);
}
/**
* 批量删除
*/
@AutoLog(value = "项目合规评估流程关联标准-批量删除")
@ApiOperation(value = "项目合规评估流程关联标准-批量删除", notes = "项目合规评估流程关联标准-批量删除")
@PostMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestBody IdsMapBody map) {
String ids = map.getIds();
if (StringUtils.isBlank(ids)) {
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
}
List<String> idList = Arrays.asList(map.getIds().split(","));
this.processProjectAssessLinkService.deleteByIds(idList);
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK);
}
/**
* 通过id查询
*/
@AutoLog(value = "项目合规评估流程关联标准-通过id查询")
@ApiOperation(value = "项目合规评估流程关联标准-通过id查询", notes = "项目合规评估流程关联标准-通过id查询")
@GetMapping(value = "/queryById")
public Result<ProcessProjectAssessLink> queryById(@RequestParam(name = "id") String id) {
ProcessProjectAssessLink processProjectAssessLink = processProjectAssessLinkService.queryById(id);
if (processProjectAssessLink == null) {
return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
}
return Result.OK(processProjectAssessLink);
}
/**
* 导出excel
*/
@ApiOperation(value = "项目合规评估流程关联标准-导出excel")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ProcessProjectAssessLink processProjectAssessLink) {
return super.exportXls(request, processProjectAssessLink, ProcessProjectAssessLink.class, "项目合规评估流程关联标准");
}
/**
* 通过excel导入数据
*/
@ApiOperation(value = "项目合规评估流程关联标准-通过excel导入数据")
@PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ProcessProjectAssessLink.class);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessTermController.java
-162
View File
@@ -1,162 +0,0 @@
package com.jero.modules.activiti.process.projectassess.controller;
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm;
import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessTermService;
import com.jero.common.api.vo.ResultCommon;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.*;
import com.jero.modules.system.vo.IdMapBody;
import com.jero.modules.system.vo.IdsMapBody;
import org.apache.commons.lang3.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
/**
* 项目合规评估流程关联条款(process_project_assess_term)表控制层
*
* @author xxxxx
*/
@Slf4j
@Api(tags = "项目合规评估流程关联条款")
@RestController
@RequestMapping("ProcessProjectAssessTerm")
public class ProcessProjectAssessTermController extends JeroController<ProcessProjectAssessTerm, ProcessProjectAssessTermService> {
/**
* 服务对象
*/
@Resource
private ProcessProjectAssessTermService processProjectAssessTermService;
/**
* 分页列表查询
*/
@ApiOperation(value = "项目合规评估流程关联条款-分页列表查询", notes = "项目合规评估流程关联条款-分页列表查询")
@GetMapping(value = "/page")
public Result<IPage<ProcessProjectAssessTerm>> queryPageList(ProcessProjectAssessTerm processProjectAssessTerm,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ProcessProjectAssessTerm> queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessTerm, req.getParameterMap());
Page<ProcessProjectAssessTerm> page = new Page<>(pageNo, pageSize);
IPage<ProcessProjectAssessTerm> pageList = processProjectAssessTermService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*/
@ApiOperation(value = "项目合规评估流程关联条款-列表查询", notes = "项目合规评估流程关联条款-列表查询")
@GetMapping(value = "/list")
public Result<List<ProcessProjectAssessTerm>> queryList(ProcessProjectAssessTerm processProjectAssessTerm,
HttpServletRequest req) {
QueryWrapper<ProcessProjectAssessTerm> queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessTerm, req.getParameterMap());
List<ProcessProjectAssessTerm> list = processProjectAssessTermService.list(queryWrapper);
return Result.OK(list);
}
/**
* 添加
*/
@AutoLog(value = "项目合规评估流程关联条款-添加")
@ApiOperation(value = "项目合规评估流程关联条款-添加", notes = "项目合规评估流程关联条款-添加")
@PostMapping(value = "/add")
public Result<String> add(@Validated @RequestBody ProcessProjectAssessTerm processProjectAssessTerm) {
processProjectAssessTermService.add(processProjectAssessTerm);
return Result.OK(ResultCommon.OK);
}
/**
* 编辑
*/
@AutoLog(value = "项目合规评估流程关联条款-编辑")
@ApiOperation(value = "项目合规评估流程关联条款-编辑", notes = "项目合规评估流程关联条款-编辑")
@PostMapping(value = "/edit")
public Result<String> edit(@Validated @RequestBody ProcessProjectAssessTerm processProjectAssessTerm) {
processProjectAssessTermService.editById(processProjectAssessTerm);
return Result.OK(ResultCommon.EDIT_OK);
}
/**
* 通过id删除
*/
@AutoLog(value = "项目合规评估流程关联条款-通过id删除")
@ApiOperation(value = "项目合规评估流程关联条款-通过id删除", notes = "项目合规评估流程关联条款-通过id删除")
@PostMapping(value = "/delete")
public Result<String> delete(@RequestBody IdMapBody map) {
String id = map.getId();
if (StringUtils.isBlank(id)) {
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
}
processProjectAssessTermService.deleteById(id);
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED);
}
/**
* 批量删除
*/
@AutoLog(value = "项目合规评估流程关联条款-批量删除")
@ApiOperation(value = "项目合规评估流程关联条款-批量删除", notes = "项目合规评估流程关联条款-批量删除")
@PostMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestBody IdsMapBody map) {
String ids = map.getIds();
if (StringUtils.isBlank(ids)) {
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
}
List<String> idList = Arrays.asList(map.getIds().split(","));
this.processProjectAssessTermService.deleteByIds(idList);
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK);
}
/**
* 通过id查询
*/
@AutoLog(value = "项目合规评估流程关联条款-通过id查询")
@ApiOperation(value = "项目合规评估流程关联条款-通过id查询", notes = "项目合规评估流程关联条款-通过id查询")
@GetMapping(value = "/queryById")
public Result<ProcessProjectAssessTerm> queryById(@RequestParam(name = "id") String id) {
ProcessProjectAssessTerm processProjectAssessTerm = processProjectAssessTermService.queryById(id);
if (processProjectAssessTerm == null) {
return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
}
return Result.OK(processProjectAssessTerm);
}
/**
* 导出excel
*/
@ApiOperation(value = "项目合规评估流程关联条款-导出excel")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ProcessProjectAssessTerm processProjectAssessTerm) {
return super.exportXls(request, processProjectAssessTerm, ProcessProjectAssessTerm.class, "项目合规评估流程关联条款");
}
/**
* 通过excel导入数据
*/
@ApiOperation(value = "项目合规评估流程关联条款-通过excel导入数据")
@PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ProcessProjectAssessTerm.class);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/controller/ProcessProjectAssessTermUserController.java
-162
View File
@@ -1,162 +0,0 @@
package com.jero.modules.activiti.process.projectassess.controller;
import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTermUser;
import com.jero.modules.activiti.process.projectassess.service.ProcessProjectAssessTermUserService;
import com.jero.common.api.vo.ResultCommon;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.*;
import com.jero.modules.system.vo.IdMapBody;
import com.jero.modules.system.vo.IdsMapBody;
import org.apache.commons.lang3.StringUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
/**
* 项目合规评估流程关联条款关联用户(process_project_assess_term_user)表控制层
*
* @author xxxxx
*/
@Slf4j
@Api(tags = "项目合规评估流程关联条款关联用户")
@RestController
@RequestMapping("ProcessProjectAssessTermUser")
public class ProcessProjectAssessTermUserController extends JeroController<ProcessProjectAssessTermUser, ProcessProjectAssessTermUserService> {
/**
* 服务对象
*/
@Resource
private ProcessProjectAssessTermUserService processProjectAssessTermUserService;
/**
* 分页列表查询
*/
@ApiOperation(value = "项目合规评估流程关联条款关联用户-分页列表查询", notes = "项目合规评估流程关联条款关联用户-分页列表查询")
@GetMapping(value = "/page")
public Result<IPage<ProcessProjectAssessTermUser>> queryPageList(ProcessProjectAssessTermUser processProjectAssessTermUser,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ProcessProjectAssessTermUser> queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessTermUser, req.getParameterMap());
Page<ProcessProjectAssessTermUser> page = new Page<>(pageNo, pageSize);
IPage<ProcessProjectAssessTermUser> pageList = processProjectAssessTermUserService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*/
@ApiOperation(value = "项目合规评估流程关联条款关联用户-列表查询", notes = "项目合规评估流程关联条款关联用户-列表查询")
@GetMapping(value = "/list")
public Result<List<ProcessProjectAssessTermUser>> queryList(ProcessProjectAssessTermUser processProjectAssessTermUser,
HttpServletRequest req) {
QueryWrapper<ProcessProjectAssessTermUser> queryWrapper = QueryGenerator.initQueryWrapper(processProjectAssessTermUser, req.getParameterMap());
List<ProcessProjectAssessTermUser> list = processProjectAssessTermUserService.list(queryWrapper);
return Result.OK(list);
}
/**
* 添加
*/
@AutoLog(value = "项目合规评估流程关联条款关联用户-添加")
@ApiOperation(value = "项目合规评估流程关联条款关联用户-添加", notes = "项目合规评估流程关联条款关联用户-添加")
@PostMapping(value = "/add")
public Result<String> add(@Validated @RequestBody ProcessProjectAssessTermUser processProjectAssessTermUser) {
processProjectAssessTermUserService.add(processProjectAssessTermUser);
return Result.OK(ResultCommon.OK);
}
/**
* 编辑
*/
@AutoLog(value = "项目合规评估流程关联条款关联用户-编辑")
@ApiOperation(value = "项目合规评估流程关联条款关联用户-编辑", notes = "项目合规评估流程关联条款关联用户-编辑")
@PostMapping(value = "/edit")
public Result<String> edit(@Validated @RequestBody ProcessProjectAssessTermUser processProjectAssessTermUser) {
processProjectAssessTermUserService.editById(processProjectAssessTermUser);
return Result.OK(ResultCommon.EDIT_OK);
}
/**
* 通过id删除
*/
@AutoLog(value = "项目合规评估流程关联条款关联用户-通过id删除")
@ApiOperation(value = "项目合规评估流程关联条款关联用户-通过id删除", notes = "项目合规评估流程关联条款关联用户-通过id删除")
@PostMapping(value = "/delete")
public Result<String> delete(@RequestBody IdMapBody map) {
String id = map.getId();
if (StringUtils.isBlank(id)) {
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
}
processProjectAssessTermUserService.deleteById(id);
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED);
}
/**
* 批量删除
*/
@AutoLog(value = "项目合规评估流程关联条款关联用户-批量删除")
@ApiOperation(value = "项目合规评估流程关联条款关联用户-批量删除", notes = "项目合规评估流程关联条款关联用户-批量删除")
@PostMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestBody IdsMapBody map) {
String ids = map.getIds();
if (StringUtils.isBlank(ids)) {
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
}
List<String> idList = Arrays.asList(map.getIds().split(","));
this.processProjectAssessTermUserService.deleteByIds(idList);
return Result.OK(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK);
}
/**
* 通过id查询
*/
@AutoLog(value = "项目合规评估流程关联条款关联用户-通过id查询")
@ApiOperation(value = "项目合规评估流程关联条款关联用户-通过id查询", notes = "项目合规评估流程关联条款关联用户-通过id查询")
@GetMapping(value = "/queryById")
public Result<ProcessProjectAssessTermUser> queryById(@RequestParam(name = "id") String id) {
ProcessProjectAssessTermUser processProjectAssessTermUser = processProjectAssessTermUserService.queryById(id);
if (processProjectAssessTermUser == null) {
return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
}
return Result.OK(processProjectAssessTermUser);
}
/**
* 导出excel
*/
@ApiOperation(value = "项目合规评估流程关联条款关联用户-导出excel")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ProcessProjectAssessTermUser processProjectAssessTermUser) {
return super.exportXls(request, processProjectAssessTermUser, ProcessProjectAssessTermUser.class, "项目合规评估流程关联条款关联用户");
}
/**
* 通过excel导入数据
*/
@ApiOperation(value = "项目合规评估流程关联条款关联用户-通过excel导入数据")
@PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ProcessProjectAssessTermUser.class);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+1 -1
View File
@@ -541,7 +541,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
LawsProjectLibrary lawsProjectLibrary = lawsProjectLibraryService.getById(projectId);
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
String carbonCopyPersonnels = businessInfoDTO.getCarbonCopyPersonnels();
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_ASSESS_COMPLETE);
sendMessageDTO.setToUserId(carbonCopyPersonnels);
@@ -605,6 +604,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
processProjectAssessTermUserService.saveBatch(allTermUserList);
moduleOwnerIds = moduleOwnerIds.stream().distinct().collect(Collectors.toList());
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, moduleOwnerIds);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, moduleOwnerIds);
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
// 完成任务
String taskId = processDTO.getTaskId();