二保添加流转节点

lyh

4 天以前 548de3053898bc6571c90d014a40050c39a7d195

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportThreeNoSpareController.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;

import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -9,10 +10,16 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.util.StrUtil;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.dto.EamReportThreeNoSpareDto;
import org.jeecg.modules.eam.entity.EamReportThreeNoSpare;
import org.jeecg.modules.eam.request.EamReportThreeNoSpareQuery;
import org.jeecg.modules.eam.service.IEamReportThreeNoSpareService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -53,7 +60,7 @@
   /**
    * 分页列表查询
    *
    * @param eamReportThreeNoSpare
    * @param eamReportThreeNoSpareQuery
    * @param pageNo
    * @param pageSize
    * @param req
@@ -62,13 +69,12 @@
   //@AutoLog(value = "“三不放过的原则”分析表-分页列表查询")
   @ApiOperation(value="“三不放过的原则”分析表-分页列表查询", notes="“三不放过的原则”分析表-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<EamReportThreeNoSpare>> queryPageList(EamReportThreeNoSpare eamReportThreeNoSpare,
   public Result<IPage<EamReportThreeNoSpareQuery>> queryPageList(EamReportThreeNoSpareQuery eamReportThreeNoSpareQuery,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
      QueryWrapper<EamReportThreeNoSpare> queryWrapper = QueryGenerator.initQueryWrapper(eamReportThreeNoSpare, req.getParameterMap());
      Page<EamReportThreeNoSpare> page = new Page<EamReportThreeNoSpare>(pageNo, pageSize);
      IPage<EamReportThreeNoSpare> pageList = eamReportThreeNoSpareService.page(page, queryWrapper);
      Page<EamReportThreeNoSpareQuery> page = new Page<EamReportThreeNoSpareQuery>(pageNo, pageSize);
      IPage<EamReportThreeNoSpareQuery> pageList = eamReportThreeNoSpareService.pageList(page, eamReportThreeNoSpareQuery);
      return Result.OK(pageList);
   }

@@ -98,10 +104,43 @@
   //@RequiresPermissions("org.jeecg.modules.mdc:eam_report_three_no_spare:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody EamReportThreeNoSpare eamReportThreeNoSpare) {
      LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
      eamReportThreeNoSpare.setTrainingUser(user.getUsername());
      eamReportThreeNoSpare.setTrainingUserTime(new Date());
      eamReportThreeNoSpareService.updateById(eamReportThreeNoSpare);
      return Result.OK("编辑成功!");
   }

    /**
     * 操作工提交-发起流程
     * @param id
     * @return
     */
    @ApiOperation(value = "“三不放过的原则”分析表--提交", notes = "“三不放过的原则”分析表--提交")
    @GetMapping(value = "/submit")
    public Result<?> submit(String id){
       eamReportThreeNoSpareService.submit(id);
       return Result.OK("提交成功！");
    }

    /**
     * 流程审核
     * @param eamReportThreeNoSpareDto
     */
    @AutoLog(value = "“三不放过的原则”分析表--执行/审批")
    @ApiOperation(value = "“三不放过的原则”分析表--执行/审批", notes = "“三不放过的原则”分析表--执行/审批")
    @PostMapping(value = "/perform")
    public Result<?> audit(@RequestBody EamReportThreeNoSpareDto eamReportThreeNoSpareDto){
       if (eamReportThreeNoSpareDto == null) {
          return Result.error("审批的对象不能为空！");
       }
       // 检查请求参数
       if (StrUtil.isBlank(eamReportThreeNoSpareDto.getTaskId()) || StrUtil.isBlank(eamReportThreeNoSpareDto.getDataId()) || StrUtil.isBlank(eamReportThreeNoSpareDto.getInstanceId())) {
          return Result.error("审批任务错误或不存在！");
       }
       return eamReportThreeNoSpareService.audit(eamReportThreeNoSpareDto);
    }

   /**
    *   通过id删除
    *