art: 设备台账-查询需要做技术状态鉴定的设备列表

zhangherong

5 天以前 bcd90314646203b32f73c89c1c2f89eaa96e2c9f

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

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

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,15 +11,12 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.TechnicalStatusChangeOrderStatusEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationOrderChangeStatusEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusChange;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;

 /**
 * @Description: 技术状态变更申请
@@ -40,15 +38,13 @@
    * @param query
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   @ApiOperation(value="技术状态变更申请-分页列表查询", notes="技术状态变更申请-分页列表查询")
   @GetMapping(value = "/list")
   public Result<?> queryPageList(EamTechnicalStatusChangeQuery query,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
      Page<EamTechnicalStatusChange> page = new Page<EamTechnicalStatusChange>(pageNo, pageSize);
      IPage<EamTechnicalStatusChange> pageList = eamTechnicalStatusChangeService.queryPageList(page, query);
      return Result.OK(pageList);
@@ -66,6 +62,9 @@
   public Result<?> add(@RequestBody EamTechnicalStatusChangeRequest request) {
      if (request == null) {
         return Result.error("添加的对象不能为空！");
      }
      if(CollectionUtil.isEmpty(request.getTableDetailList())) {
         return Result.error("设备明细不能为空！");
      }
      boolean b = eamTechnicalStatusChangeService.addEamTechnicalStatusChange(request);
      if (!b) {
@@ -113,7 +112,7 @@
       if (entity == null) {
          return Result.error("要作废的数据不存在，请刷新重试！");
       }
       if (!TechnicalStatusEvaluationOrderChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
       if (!TechnicalStatusChangeOrderStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) {
          return Result.error("该状态的数据不允许进行作废！");
       }
       entity.setChangeStatus(TechnicalStatusChangeOrderStatusEnum.ABOLISH.name());