1.Dnc产品结构树检索nc文件 2.新增批次功能 3.新增审签查询流程 4.修改刀具系统查询

lyh

2025-05-28 1930b4e59d60c015ffa7bfee92e4bc227b90dcb3

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java

@@ -13,12 +13,15 @@
import org.jeecg.modules.dncFlow.entity.DispatchFile;
import org.jeecg.modules.dncFlow.service.IDispatchFileService;
import org.jeecg.modules.dncFlow.vo.DispatchFileFlowTaskVo;
import org.jeecg.modules.flowable.domain.dto.FlowTaskDto;
import org.jeecg.modules.flowable.service.IHisWorkTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;

 /**
@@ -35,6 +38,8 @@
   @Autowired
   private IDispatchFileService dispatchFileService;

   @Autowired
   private IHisWorkTaskService hisWorkTaskService;
   /**
    * 分页列表查询
    *
@@ -44,7 +49,6 @@
    * @param req
    * @return
    */
   //@AutoLog(value = "nc程序与电子图版签派-分页列表查询")
   @ApiOperation(value="nc程序与电子图版签派-分页列表查询", notes="nc程序与电子图版签派-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<DispatchFile>> queryPageList(DispatchFile dispatchFile,
@@ -58,15 +62,29 @@
   }

    /**
     * 文件查询审签流程
     * @param attributionId,attributionType,docId
     * @return
     */
    @AutoLog(value = "nc程序与电子图版签派-文件查询审签流程")
    @ApiOperation(value="nc程序与电子图版签派-文件查询审签流程", notes="nc程序与电子图版签派-文件查询审签流程")
    @GetMapping(value = "/queryDispatchDocFile")
    public Result<?> queryDispatchDocFile(@RequestParam(name="attributionId") String attributionId,
                                  @RequestParam(name="attributionType") String attributionType,
                                  @RequestParam(name="docId") String docId){
       return dispatchFileService.queryDispatchDocFile(attributionId,attributionType,docId);
    }

    /**
     * 重新启动
     * @param id
     * @param dispatchFileFlowTaskVo
     * @return
     */
    @AutoLog(value = "nc程序与电子图版签派-重新启动")
    @ApiOperation(value="nc程序与电子图版签派-重新启动", notes="nc程序与电子图版签派-重新启动")
    @GetMapping(value = "/saveDispatchFile")
    public Result<?> saveDispatchFile(String id){
       return dispatchFileService.reStartDispatchFile(id);
    @PostMapping(value = "/saveDispatchFile")
    public Result<?> saveDispatchFile(@RequestBody DispatchFileFlowTaskVo dispatchFileFlowTaskVo){
       return dispatchFileService.reStartDispatchFile(dispatchFileFlowTaskVo);
    }


@@ -77,9 +95,28 @@
     */
    @AutoLog(value = "nc程序与电子图版签派-审批操作")
    @ApiOperation(value="nc程序与电子图版签派-审批操作", notes="nc程序与电子图版签派-审批操作")
    @GetMapping(value = "/approval")
    public Result<?> approval(DispatchFileFlowTaskVo dispatchFileFlowTaskVo){
    @PostMapping(value = "/approval")
    public Result<?> approval(@RequestBody DispatchFileFlowTaskVo dispatchFileFlowTaskVo){
       return dispatchFileService.auditDispatchFile(dispatchFileFlowTaskVo);
    }

    /**
     * 批量审批操作
     * @param dispatchFileFlowTaskVo
     * @return
     */
    @AutoLog(value = "nc程序与电子图版签派-批量审批操作")
    @ApiOperation(value="nc程序与电子图版签派-批量审批操作", notes="nc程序与电子图版签派-批量审批操作")
    @PostMapping(value = "/approvalBatch")
    public Result<?> approvalBatch(@RequestBody DispatchFileFlowTaskVo dispatchFileFlowTaskVo) throws InvocationTargetException, IllegalAccessException {
      return dispatchFileService.auditBatchDispatchFile(dispatchFileFlowTaskVo);
    }


    @ApiOperation(value = "获取工作流历史任务", response = FlowTaskDto.class)
    @GetMapping(value = "/queryHisTaskList")
    public Result<?> queryHisTaskList(@RequestParam(name = "procInstId") String procInstId) {
       return Result.OK(hisWorkTaskService.queryHisTaskByProcInstId(procInstId));
    }

   /**
@@ -159,10 +196,16 @@
      return Result.OK(dispatchFile);
   }

    @GetMapping(value = "/selectVoById")
    public Result<?> selectVoById(@RequestParam(name="id") String id){
       return dispatchFileService.queryDispatchFile(id);
    }
   /**
    * 查询审签基本信息
    * @param id
    * @return
    */
   @ApiOperation(value = "查询审签基本信息", notes = "查询审签基本信息")
   @GetMapping(value = "/selectVoById")
   public Result<?> selectVoById(@RequestParam(name="id") String id){
      return dispatchFileService.queryDispatchFile(id);
   }

    /**
    * 导出excel