LY 预约票 bugfix

master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -75,8 +75,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @RequestMapping("/ehs/approvedanger")
-public class TApproveDangerController extends BaseController
-{
+public class TApproveDangerController extends BaseController {
     @Autowired
     private ITApproveDangerService tApproveDangerService;
 
@@ -113,6 +112,7 @@ public class TApproveDangerController extends BaseController
     private ITKekaoApproveService tKekaoApproveService;
     @Autowired
     private ITApproveReserveInvoiceService tApproveReserveInvoiceService;
+
     /**
      * 任务申请
      */
@@ -163,7 +163,7 @@ public class TApproveDangerController extends BaseController
             ProcessInstance pi = null;
             if (tApprove.getHiddendangerLevel() == 2) {
                 pi = runtimeService.startProcessInstanceByKey("commonProcess", String.valueOf(bussniseeKey), variables);
-            }else if (tApprove.getHiddendangerLevel() == 3) {
+            } else if (tApprove.getHiddendangerLevel() == 3) {
                 //初始化会签人员
                 List<Long> confirmlist = new ArrayList<>();
                 confirmlist.add(tApprove.getConfirmoneId());
@@ -181,7 +181,7 @@ public class TApproveDangerController extends BaseController
 
             logger.info("tApprove:" + tApprove);
             tApproveDangerService.updateTApproveDanger(tApprove);
-        }catch (Exception e) {
+        } catch (Exception e) {
             logger.info("e:" + e);
         }
         return AjaxResult.success("申请成功", tApprove);
@@ -197,7 +197,7 @@ public class TApproveDangerController extends BaseController
             tApprove.setRecorderId(userid);
             logger.info("tApprove:" + tApprove);
             //tApproveDangerService.insertTApproveDanger(tApprove);
-        }catch (Exception e) {
+        } catch (Exception e) {
             logger.info("e:" + e);
             return AjaxResult.error(e.toString());
         }
@@ -230,51 +230,55 @@ public class TApproveDangerController extends BaseController
                     continue;
                 }
                 DevProcess devProcess = new DevProcess();
-                logger.info("审批类型" +pi.getProcessDefinitionName());
-                if (pi.getProcessDefinitionName().equals("特种设备审核")){
-                    TApprove approve = tApproveService.selectTApproveById(Long.parseLong(h.getBusinessKey()));
-                    devProcess.setSpecApprove(approve);
-                    devProcess.setApNo(approve.getApNo());
-                }else if (pi.getProcessDefinitionName().equals("年度检查报告申请")){
-                    TApprove approve = tApproveService.selectTApproveById(Long.parseLong(h.getBusinessKey()));
-                    devProcess.setSpecApprove(approve);
-                    devProcess.setApNo(approve.getApNo());
-                }else if (pi.getProcessDefinitionName().equals("月度检查")){
-                    TApprove approve = tApproveService.selectTApproveById(Long.parseLong(h.getBusinessKey()));
-                    devProcess.setSpecApprove(approve);
-                    devProcess.setApNo(approve.getApNo());
-                }else if (pi.getProcessDefinitionName().equals("设备修改/删除审核")){
-                    TApproveSpecModify approve = tApproveSpecModifyService.selectTApproveSpecModifyById(Long.parseLong(pi.getBusinessKey()));
-                    devProcess.setApproveSpecModify(approve);
-                    devProcess.setApNo(approve.getApNo());
-                }else if(pi.getProcessDefinitionName().equals("事件审批流程")){
-                    TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(h.getBusinessKey()));
-                    devProcess.settApprove(approveDanger);
-                    devProcess.setApNo(approveDanger.getApproveNo());
-                }else if(pi.getProcessDefinitionName().equals("重大隐患审批流程") || pi.getProcessDefinitionName().equals("普通隐患审批流程")){
-                    TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(h.getBusinessKey()));
-                    devProcess.settApprove(approveDanger);
-                    devProcess.setApNo(approveDanger.getApproveNo());
-                }else if(pi.getProcessDefinitionName().equals("专项培训计划审核")){
-                    TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
-                    devProcess.setApproveObject(approve);
-                    devProcess.setApNo(approve.getApNo());
-                }else if(pi.getProcessDefinitionName().equals("设备维修审批流程")){
-                    TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
-                    devProcess.setApproveObject(approve);
-                    devProcess.setApNo(approve.getApNo());
-                }else if(pi.getProcessDefinitionName().equals("设备变更申请")){
-                    TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
-                    devProcess.setApproveObject(approve);
-                    devProcess.setApNo(approve.getApNo());
-                }else if(pi.getProcessDefinitionName().equals("可靠性管理申请")){
-                    TKekaoApprove approve = tKekaoApproveService.selectTKekaoApproveById(Long.parseLong(pi.getBusinessKey()));
-                    devProcess.setApproveObject(approve);
-                    devProcess.setApNo(approve.getApNo());
-                }else if(pi.getProcessDefinitionName().equals("预约开票审批流程")){
-                    TApproveReserveInvoice approve = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(pi.getBusinessKey()));
-                    devProcess.setApproveObject(approve);
-                    devProcess.setApNo(approve.getApNo());
+                logger.info("审批类型" + pi.getProcessDefinitionName());
+                try {
+                    if (pi.getProcessDefinitionName().equals("特种设备审核")) {
+                        TApprove approve = tApproveService.selectTApproveById(Long.parseLong(h.getBusinessKey()));
+                        devProcess.setSpecApprove(approve);
+                        devProcess.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("年度检查报告申请")) {
+                        TApprove approve = tApproveService.selectTApproveById(Long.parseLong(h.getBusinessKey()));
+                        devProcess.setSpecApprove(approve);
+                        devProcess.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("月度检查")) {
+                        TApprove approve = tApproveService.selectTApproveById(Long.parseLong(h.getBusinessKey()));
+                        devProcess.setSpecApprove(approve);
+                        devProcess.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("设备修改/删除审核")) {
+                        TApproveSpecModify approve = tApproveSpecModifyService.selectTApproveSpecModifyById(Long.parseLong(pi.getBusinessKey()));
+                        devProcess.setApproveSpecModify(approve);
+                        devProcess.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("事件审批流程")) {
+                        TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(h.getBusinessKey()));
+                        devProcess.settApprove(approveDanger);
+                        devProcess.setApNo(approveDanger.getApproveNo());
+                    } else if (pi.getProcessDefinitionName().equals("重大隐患审批流程") || pi.getProcessDefinitionName().equals("普通隐患审批流程")) {
+                        TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(h.getBusinessKey()));
+                        devProcess.settApprove(approveDanger);
+                        devProcess.setApNo(approveDanger.getApproveNo());
+                    } else if (pi.getProcessDefinitionName().equals("专项培训计划审核")) {
+                        TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
+                        devProcess.setApproveObject(approve);
+                        devProcess.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
+                        TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
+                        devProcess.setApproveObject(approve);
+                        devProcess.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
+                        TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
+                        devProcess.setApproveObject(approve);
+                        devProcess.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("可靠性管理申请")) {
+                        TKekaoApprove approve = tKekaoApproveService.selectTKekaoApproveById(Long.parseLong(pi.getBusinessKey()));
+                        devProcess.setApproveObject(approve);
+                        devProcess.setApNo(approve.getApNo());
+                    } else if (pi.getProcessDefinitionName().equals("预约开票审批流程")) {
+                        TApproveReserveInvoice approve = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(pi.getBusinessKey()));
+                        devProcess.setApproveObject(approve);
+                        devProcess.setApNo(approve.getApNo());
+                    }
+                } catch (Exception e) {
+                    logger.error(e.toString());
                 }
                 devProcess.setBusinessKey(pi.getBusinessKey());
                 devProcess.setProcessCreateTime(pi.getStartTime());
@@ -285,7 +289,8 @@ public class TApproveDangerController extends BaseController
                     devProcess.setEnd(true);
                 } else {
                     devProcess.setEnd(false);
-                };
+                }
+                ;
                 logger.info("devProcess:" + devProcess);
                 list.add(devProcess);
             }
@@ -335,49 +340,47 @@ public class TApproveDangerController extends BaseController
                     TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(pi.getBusinessKey()));
                     devTask.settApprove(approveDanger);
                     devTask.setApNo(approveDanger.getApproveNo());
-                }else if (pi.getProcessDefinitionName().equals("事件审批流程")) {
+                } else if (pi.getProcessDefinitionName().equals("事件审批流程")) {
                     TApproveAccident approveAccident = tApproveAccidentService.selectTApproveAccidentById(Long.parseLong(pi.getBusinessKey()));
                     devTask.settApproveAccident(approveAccident);
                     devTask.setApNo(approveAccident.getApproveNo());
-                }else if (pi.getProcessDefinitionName().equals("特种设备审核")) {
+                } else if (pi.getProcessDefinitionName().equals("特种设备审核")) {
                     TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
                     devTask.setSpecApprove(approve);
                     devTask.setApNo(approve.getApNo());
-                }else if (pi.getProcessDefinitionName().equals("年度检查报告申请")) {
+                } else if (pi.getProcessDefinitionName().equals("年度检查报告申请")) {
                     TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
                     devTask.setSpecApprove(approve);
                     devTask.setApNo(approve.getApNo());
-                }else if (pi.getProcessDefinitionName().equals("月度检查")) {
+                } else if (pi.getProcessDefinitionName().equals("月度检查")) {
                     TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
                     devTask.setSpecApprove(approve);
                     devTask.setApNo(approve.getApNo());
-                }else if (pi.getProcessDefinitionName().equals("设备修改/删除审核")) {
+                } else if (pi.getProcessDefinitionName().equals("设备修改/删除审核")) {
                     TApproveSpecModify approve = tApproveSpecModifyService.selectTApproveSpecModifyById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("设备修改/删除审核" +JSON.toJSONString(approve));
+                    logger.info("设备修改/删除审核" + JSON.toJSONString(approve));
                     devTask.setApproveSpecModify(approve);
-                }else if (pi.getProcessDefinitionName().equals("专项培训计划审核")) {
+                } else if (pi.getProcessDefinitionName().equals("专项培训计划审核")) {
                     TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("专项培训计划审核" +JSON.toJSONString(approve));
+                    logger.info("专项培训计划审核" + JSON.toJSONString(approve));
                     devTask.setApproveObj(approve);
                     devTask.setApNo(approve.getApNo());
-                }else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
+                } else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
                     TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("设备维修审批流程" +JSON.toJSONString(approve));
+                    logger.info("设备维修审批流程" + JSON.toJSONString(approve));
                     devTask.setApproveObj(approve);
                     devTask.setApNo(approve.getApNo());
-                }else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
+                } else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
                     TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("设备变更申请" +JSON.toJSONString(approve));
+                    logger.info("设备变更申请" + JSON.toJSONString(approve));
                     devTask.setApproveObj(approve);
                     devTask.setApNo(approve.getApNo());
-                }
-                else if (pi.getProcessDefinitionName().equals("可靠性管理申请")) {
+                } else if (pi.getProcessDefinitionName().equals("可靠性管理申请")) {
                     TKekaoApprove approve = tKekaoApproveService.selectTKekaoApproveById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("可靠性管理申请" +JSON.toJSONString(approve));
+                    logger.info("可靠性管理申请" + JSON.toJSONString(approve));
                     devTask.setApproveObj(approve);
                     devTask.setApNo(approve.getApNo());
-                }
-                else if(pi.getProcessDefinitionName().equals("预约开票审批流程")){
+                } else if (pi.getProcessDefinitionName().equals("预约开票审批流程")) {
                     TApproveReserveInvoice approve = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(pi.getBusinessKey()));
                     devTask.setApproveObject(approve);
                     devTask.setApNo(approve.getApNo());
@@ -414,61 +417,61 @@ public class TApproveDangerController extends BaseController
                     continue;
                 }
                 DevProcess devProcess = new DevProcess();
-                if (pi.getProcessDefinitionName().equals("特种设备审核")){
+                if (pi.getProcessDefinitionName().equals("特种设备审核")) {
                     TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approve.getUserId());
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setSpecApprove(approve);
-                }else if (pi.getProcessDefinitionName().equals("年度检查报告申请")){
+                } else if (pi.getProcessDefinitionName().equals("年度检查报告申请")) {
                     TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approve.getUserId());
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setSpecApprove(approve);
-                }else if (pi.getProcessDefinitionName().equals("月度检查")){
+                } else if (pi.getProcessDefinitionName().equals("月度检查")) {
                     TApprove approve = tApproveService.selectTApproveById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approve.getUserId());
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setSpecApprove(approve);
-                }else if (pi.getProcessDefinitionName().equals("设备修改/删除审核")){
+                } else if (pi.getProcessDefinitionName().equals("设备修改/删除审核")) {
                     TApproveSpecModify approve = tApproveSpecModifyService.selectTApproveSpecModifyById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approve.getUserId());
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveSpecModify(approve);
-                }else if (pi.getProcessDefinitionName().equals("专项培训计划审核")){
+                } else if (pi.getProcessDefinitionName().equals("专项培训计划审核")) {
                     TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approve.getUserId());
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
-                }else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
+                } else if (pi.getProcessDefinitionName().equals("设备维修审批流程")) {
                     TApproveMaintenance approve = tApproveMaintenanceService.selectTApproveMaintenanceById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approve.getUserId());
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
-                }else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
+                } else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
                     TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approve.getUserId());
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
-                }else if (pi.getProcessDefinitionName().equals("可靠性管理申请")) {
+                } else if (pi.getProcessDefinitionName().equals("可靠性管理申请")) {
                     TKekaoApprove approve = tKekaoApproveService.selectTKekaoApproveById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approve.getUserId());
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
-                }else if(pi.getProcessDefinitionName().equals("预约开票审批流程")){
+                } else if (pi.getProcessDefinitionName().equals("预约开票审批流程")) {
                     TApproveReserveInvoice approve = tApproveReserveInvoiceService.selectTApproveReserveInvoiceById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approve.getUserId());
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
-                }else {
+                } else {
                     TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approveDanger.getRecorderId());
                     approveDanger.setRecorderName(user.getNickName());
@@ -578,8 +581,7 @@ public class TApproveDangerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('ehs:approvedanger:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TApproveDanger tApproveDanger)
-    {
+    public TableDataInfo list(TApproveDanger tApproveDanger) {
         startPage();
         List<TApproveDanger> list = tApproveDangerService.selectTApproveDangerList(tApproveDanger);
         return getDataTable(list);
@@ -591,8 +593,7 @@ public class TApproveDangerController extends BaseController
     @PreAuthorize("@ss.hasPermi('ehs:approvedanger:export')")
     @Log(title = "隐患申请", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(TApproveDanger tApproveDanger)
-    {
+    public AjaxResult export(TApproveDanger tApproveDanger) {
         List<TApproveDanger> list = tApproveDangerService.selectTApproveDangerList(tApproveDanger);
         ExcelUtil<TApproveDanger> util = new ExcelUtil<TApproveDanger>(TApproveDanger.class);
         return util.exportExcel(list, "approvedanger");
@@ -603,8 +604,7 @@ public class TApproveDangerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('ehs:approvedanger:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tApproveDangerService.selectTApproveDangerById(id));
     }
 
@@ -614,8 +614,7 @@ public class TApproveDangerController extends BaseController
     @PreAuthorize("@ss.hasPermi('ehs:approvedanger:add')")
     @Log(title = "隐患申请", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TApproveDanger tApproveDanger)
-    {
+    public AjaxResult add(@RequestBody TApproveDanger tApproveDanger) {
         return toAjax(tApproveDangerService.insertTApproveDanger(tApproveDanger));
     }
 
@@ -625,8 +624,7 @@ public class TApproveDangerController extends BaseController
     @PreAuthorize("@ss.hasPermi('ehs:approvedanger:edit')")
     @Log(title = "隐患申请", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TApproveDanger tApproveDanger)
-    {
+    public AjaxResult edit(@RequestBody TApproveDanger tApproveDanger) {
         return toAjax(tApproveDangerService.updateTApproveDanger(tApproveDanger));
     }
 
@@ -635,9 +633,8 @@ public class TApproveDangerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('ehs:approvedanger:remove')")
     @Log(title = "隐患申请", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tApproveDangerService.deleteTApproveDangerByIds(ids));
     }
 
@@ -647,6 +644,7 @@ public class TApproveDangerController extends BaseController
         OutputStream outputStream = response.getOutputStream();
         HttpContextUtils.copyImageStream(inputStream, outputStream);
     }
+
     /**
      * 获取当前任务流程图
      *