工控网新分支
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
zhangherong
2025-04-27 1007e0b552accd3288e7da6b47d8cc49a03bdf62 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java


@@ -1,21 +1,30 @@


package org.jeecg.modules.eam.controller;




import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import cn.hutool.core.collection.CollectionUtil;


import com.alibaba.fastjson.JSONObject;


import com.alibaba.fastjson.parser.Feature;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.fasterxml.jackson.core.JsonProcessingException;


import com.fasterxml.jackson.databind.ObjectMapper;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import lombok.extern.slf4j.Slf4j;


import org.jeecg.common.api.vo.Result;


import org.jeecg.common.aspect.annotation.AutoLog;


import org.jeecg.common.system.base.controller.JeecgController;


import org.jeecg.common.system.query.QueryGenerator;


import org.jeecg.common.util.TranslateDictTextUtils;


import org.jeecg.modules.eam.constant.BusinessCodeConst;


import org.jeecg.modules.eam.constant.InspectionStatus;


import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;


import org.jeecg.modules.eam.entity.EamInspectionOrder;


import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;


import org.jeecg.modules.eam.request.EamInspectionBatchApprovalRequest;


import org.jeecg.modules.eam.request.EamInspectionOrderQuery;


import org.jeecg.modules.eam.request.EamInspectionOrderRequest;


import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;


import org.jeecg.modules.eam.service.IEamInspectionOrderService;


import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;


import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;


import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.*;


@@ -24,6 +33,7 @@


import javax.servlet.http.HttpServletRequest;


import javax.servlet.http.HttpServletResponse;


import java.util.Arrays;


import java.util.List;




 /**


 * @Description: 点检工单


@@ -41,11 +51,16 @@


    @Autowired


    private ISysBusinessCodeRuleService businessCodeRuleService;


    @Autowired


    private IEamMaintenanceStandardService eamMaintenanceStandardService;


    private ObjectMapper objectMapper;


    @Autowired


    private TranslateDictTextUtils translateDictTextUtils;


    @Autowired


    private IEamInspectionOrderDetailService eamInspectionOrderDetailService;




   /**


    * 分页列表查询


    *


    * @param eamInspectionOrder


     * @param query


    * @param pageNo


    * @param pageSize


    * @param req


@@ -54,18 +69,19 @@


   //@AutoLog(value = "点检工单-分页列表查询")


   @ApiOperation(value="点检工单-分页列表查询", notes="点检工单-分页列表查询")


   @GetMapping(value = "/list")


   public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrder eamInspectionOrder,


    public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrderQuery query,


                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,


                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,


                           HttpServletRequest req) {


      QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());


//      QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());


      Page<EamInspectionOrder> page = new Page<EamInspectionOrder>(pageNo, pageSize);


      IPage<EamInspectionOrder> pageList = eamInspectionOrderService.page(page, queryWrapper);


        IPage<EamInspectionOrder> pageList = eamInspectionOrderService.queryPageList(page, query);


      return Result.OK(pageList);


   }




    /**


     * 查询点检工单基本信息


     *


     * @param id


     * @return


     */


@@ -89,7 +105,7 @@


   public Result<String> add(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {


      String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);


      eamInspectionOrderRequest.setOrderNum(codeSeq);


      eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.AUTO));


        eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL));


      eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);


      return Result.OK("添加成功！");


   }


@@ -111,6 +127,7 @@




    /**


     * 领取点检工单


     *


     * @param id


     * @return


     */


@@ -124,6 +141,7 @@




    /**


     * 作废点检工单


     *


     * @param id


     * @return


     */


@@ -137,6 +155,7 @@




    /**


     * 批量作废与领取


     *


     * @param ids


     * @param type


     * @return


@@ -150,6 +169,7 @@




    /**


     * 点检流程


     *


     * @param eamInspectionOrderRequest


     * @return


     */


@@ -157,7 +177,70 @@


    @ApiOperation(value="点检工单-点检流程", notes="点检工单-点检流程")


    @PostMapping("/approval")


    public Result<?> approval(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {


       return eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);


        eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);


        return Result.OK("操作成功");


    }




    @ApiOperation(value = "点检工单-批量审批流程", notes = "点检工单-批量审批流程")


    @PostMapping("/batchApproval")


    public Result<?> batchApproval(@RequestBody EamInspectionBatchApprovalRequest request) {


        if(request == null || CollectionUtil.isEmpty(request.getTaskList())) {


            return Result.error("没有需要审批的数据！");


        }


        int n = 0;


        StringBuilder errorMsg = new StringBuilder();


        List<WorkTaskDataVo> tastList = request.getTaskList();


        for(WorkTaskDataVo workTaskDataVo : tastList) {


            EamInspectionOrderRequest orderRequest = new EamInspectionOrderRequest();


            EamInspectionOrder order = eamInspectionOrderService.getById(workTaskDataVo.getDataId());


            if(order == null) {


                errorMsg.append("工单ID：");


                errorMsg.append(workTaskDataVo.getDataId());


                errorMsg.append(",不存在或已被删除!\n");


                continue;


            }


            if(!InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus())) {


                errorMsg.append("工单号：");


                errorMsg.append(order.getOrderNum());


                errorMsg.append(",状态无法批量审批!\n");


                continue;


            }


            List<EamInspectionOrderDetail> tableDetailList = eamInspectionOrderDetailService.queryListByOrderId(order.getId());


            try {


                orderRequest.setId(order.getId());


                orderRequest.setEquipmentId(order.getEquipmentId());


                //审批信息


                orderRequest.setConfirmComment(request.getConfirmComment());


                orderRequest.setConfirmDealType(request.getConfirmDealType());


                //任务信息


                orderRequest.setDataId(workTaskDataVo.getDataId());


                orderRequest.setTaskId(workTaskDataVo.getId());


                orderRequest.setUserId(workTaskDataVo.getAssignee());


                orderRequest.setInstanceId(workTaskDataVo.getProcInstId());


                orderRequest.setValues(workTaskDataVo.getVariables());


                orderRequest.setTableDetailList(tableDetailList);


                EamInspectionOrder result = eamInspectionOrderService.inspectionProcess(orderRequest);


                if(result == null) {


                    errorMsg.append("工单号：");


                    errorMsg.append(order.getOrderNum());


                    errorMsg.append(",审批失败!\n");


                    continue;


                }


                n++;




            } catch (Exception e) {


                errorMsg.append("工单号：");


                errorMsg.append(order.getOrderNum());


                errorMsg.append(",审批失败,错误原因:");


                errorMsg.append(e.getMessage() + "\n");


            }




        }


        if(n > 0) {


            String message = "成功审批通过" + n + "条记录！\n" + errorMsg;


            return Result.OK(message);


        }


        return Result.error(errorMsg.toString());


    }




   /**


@@ -199,12 +282,25 @@


   //@AutoLog(value = "点检工单-通过id查询")


   @ApiOperation(value="点检工单-通过id查询", notes="点检工单-通过id查询")


   @GetMapping(value = "/queryById")


   public Result<EamInspectionOrder> queryById(@RequestParam(name="id",required=true) String id) {


    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {


      EamInspectionOrder eamInspectionOrder = eamInspectionOrderService.getById(id);


      if(eamInspectionOrder==null) {


         return Result.error("未找到对应数据");


      }


      return Result.OK(eamInspectionOrder);


        try {


            String json = objectMapper.writeValueAsString(eamInspectionOrder);


            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);


            translateDictTextUtils.translateField("createBy", eamInspectionOrder.getCreateBy(), item, "sys_user,realname,username");


            translateDictTextUtils.translateField("standardId", eamInspectionOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");


            translateDictTextUtils.translateField("operator", eamInspectionOrder.getOperator(), item, "sys_user,realname,username");


            translateDictTextUtils.translateField("creationMethod", eamInspectionOrder.getCreationMethod(), item, "order_creation_method");


            translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");


            translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");


            translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");


            return Result.OK(item);


        } catch (JsonProcessingException e) {


            return Result.error("数据转译失败！");


        }


   }




    /**