zhangherong
昨天 57df7097f99ffe16a4b81876f23aebf38b637ec5
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java
@@ -11,8 +11,8 @@
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.entity.EamTechnicalStatusChangeDetail;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusChangeRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeService;
@@ -113,7 +113,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());
@@ -153,4 +153,22 @@
      return Result.OK(eamTechnicalStatusChange);
   }
    /**
     * 验收
     * @param request
     * @return
     */
    @ApiOperation(value = "技术状态变更申请明细-验收", notes = "技术状态变更申请明细-验收")
    @PostMapping(value = "/acceptance")
    public Result<?> acceptance(@RequestBody EamTechnicalStatusChangeDetail request) {
       if (request == null) {
          return Result.error("验收结果对象不能为空!");
       }
       boolean b = eamTechnicalStatusChangeService.acceptance(request);
       if (!b) {
          return Result.error("操作失败!");
       }
       return Result.OK("操作成功!");
    }
}