Merge remote-tracking branch 'origin/master'

zhangherong

2025-05-27 92bc6dca274eb45dc330f63b5a3f90a01458e157

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

@@ -18,6 +18,7 @@
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
import org.jeecg.modules.eam.request.EamEquipmentSealUpRequest;
import org.jeecg.modules.eam.service.IEamEquipmentSealUpService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -175,13 +176,30 @@
    }

    /**
     * 启封
     *
     * @param id
     * @return
     */
    @AutoLog(value = "设备启封-启封")
    @ApiOperation(value = "设备启封-启封", notes = "设备启封-启封")
    @GetMapping(value = "/unseal")
    public Result<?> unseal(@RequestParam(name = "id", required = true) String id) {
        boolean b = eamEquipmentSealUpService.unseal(id);
        if (!b) {
            return Result.error("操作失败！");
        }
        return Result.OK("操作成功!");
    }

    /**
     * 提交
     *
     * @param id
     * @return
     */
    @AutoLog(value = "设备封存启封-提交")
    @ApiOperation(value = "设备封存启封-提交", notes = "设备封存启封-提交")
    @AutoLog(value = "设备封存-提交")
    @ApiOperation(value = "设备封存-提交", notes = "设备封存-提交")
    @GetMapping(value = "/submit")
    public Result<?> submit(@RequestParam(name = "id", required = true) String id) {
        boolean b = eamEquipmentSealUpService.submit(id);
@@ -190,4 +208,24 @@
        }
        return Result.OK("操作成功!");
    }

    /**
     * 审批流
     *
     * @param request
     * @return
     */
    @AutoLog(value = "启封封存-审批流")
    @ApiOperation(value = "启封封存-审批流", notes = "启封封存-审批流")
    @RequestMapping(value = "/approval", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> approval(@RequestBody EamEquipmentSealUpRequest request) {
        if (request == null) {
            return Result.error("添加的对象不能为空！");
        }
        EamEquipmentSealUp entity = eamEquipmentSealUpService.approval(request);
        if (entity == null) {
            return Result.error("操作失败！");
        }
        return Result.OK("操作成功!");
    }
}