zhangherong
2025-04-22 ecb37e69b4b9587de63a584064688442cf4b64b7
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -1,18 +1,22 @@
package org.jeecg.modules.eam.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
import org.jeecg.modules.eam.service.IEamInspectionOrderService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
@@ -22,9 +26,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.*;
 /**
/**
 * @Description: 点检工单
 * @Author: jeecg-boot
 * @Date:   2025-04-02
@@ -39,11 +43,16 @@
    private IEamInspectionOrderService eamInspectionOrderService;
    @Autowired
    private ISysBusinessCodeRuleService businessCodeRuleService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private TranslateDictTextUtils translateDictTextUtils;
   /**
    * 分页列表查询
    *
    * @param eamInspectionOrder
    * @param query
    * @param pageNo
    * @param pageSize
    * @param req
@@ -52,13 +61,13 @@
   //@AutoLog(value = "点检工单-分页列表查询")
   @ApiOperation(value="点检工单-分页列表查询", notes="点检工单-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<EamInspectionOrder>> queryPageList(EamInspectionOrder eamInspectionOrder,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
      QueryWrapper<EamInspectionOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamInspectionOrder, req.getParameterMap());
   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());
      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);
   }
@@ -87,7 +96,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("添加成功!");
   }
@@ -155,7 +164,8 @@
    @ApiOperation(value="点检工单-点检流程", notes="点检工单-点检流程")
    @PostMapping("/approval")
    public Result<?> approval(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
       return eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
       eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
       return Result.OK("操作成功");
    }
   /**
@@ -197,12 +207,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("数据转译失败!");
        }
   }
    /**