点检工单流程

lyh

2025-04-10 35c1ce18a53a2d328c2f1adb7f0b110ff65d7962

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

@@ -15,6 +15,7 @@
import org.jeecg.modules.eam.constant.ReportRepairEnum;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
import org.jeecg.modules.eam.service.IEamRepairOrderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,6 +23,7 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,28 +46,21 @@
    @Resource
    private IEamRepairOrderService eamRepairOrderService;

    @Resource
    private ISysBusinessCodeRuleService businessCodeRuleService;

    @Resource
    private IEamReportRepairService eamReportRepairService;

    /**
     * 分页列表查询
     *
     * @param eamRepairOrder
     * @param eamRepairOrderQuery
     * @param pageNo
     * @param pageSize
     * @return
     */
    @AutoLog(value = "维修工单-分页列表查询")
    @ApiOperation(value = "维修工单-分页列表查询", notes = "维修工单-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(EamRepairOrder eamRepairOrder,
    public Result<?> queryPageList(EamRepairOrderQuery eamRepairOrderQuery,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        Page<EamRepairOrder> page = new Page<EamRepairOrder>(pageNo, pageSize);
        IPage<EamRepairOrder> pageList = eamRepairOrderService.pageList(page, eamRepairOrder);
        IPage<EamRepairOrder> pageList = eamRepairOrderService.pageList(page, eamRepairOrderQuery);
        return Result.OK(pageList);
    }

@@ -82,63 +77,23 @@
        if (StringUtils.isBlank(eamRepairOrder.getReportId())) {
            return Result.error("领取失败,请选择维修记录！");
        }
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.REPAIR_ORDER_CODE_RULE);
        eamRepairOrder.setRepairCode(codeSeq);
        EamReportRepair eamReportRepair = eamReportRepairService.getById(eamRepairOrder.getReportId());
        eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
        eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
        eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_REPAIR.name());
        eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
        eamRepairOrder.setActualStartTime(DateUtils.getNow());
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        eamRepairOrder.setRepairer(user.getRealname());
        eamReportRepairService.updateById(eamReportRepair);
        eamRepairOrderService.save(eamRepairOrder);
        // TODO 启动流程

        eamRepairOrderService.saveRepairOrder(eamRepairOrder);
        return Result.OK("添加成功！");
    }

    /**
     * 编辑
     * 执行维修
     *
     * @param eamRepairOrder
     * @return
     */
    @AutoLog(value = "维修工单-编辑")
    @ApiOperation(value = "维修工单-编辑", notes = "维修工单-编辑")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    public Result<?> edit(@RequestBody EamRepairOrder eamRepairOrder) {
        eamRepairOrderService.updateById(eamRepairOrder);
        return Result.OK("编辑成功!");
    }
    @AutoLog(value = "维修工单-执行")
    @ApiOperation(value = "维修工单-执行", notes = "维修工单-执行")
    @PostMapping(value = "/perform")
    public Result<?> perform(@RequestBody EamRepairOrder eamRepairOrder) {

    /**
     * 通过id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "维修工单-通过id删除")
    @ApiOperation(value = "维修工单-通过id删除", notes = "维修工单-通过id删除")
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        eamRepairOrderService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     * 批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "维修工单-批量删除")
    @ApiOperation(value = "维修工单-批量删除", notes = "维修工单-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.eamRepairOrderService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功！");
//        eamRepairOrderService.updateById(eamRepairOrder);
        return Result.OK("执行成功!");
    }

    /**