二保定时任务修改

lyh

3 天以前 f71cea3609c4c7bf0b70c77b2c9d8c571586df33

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

@@ -21,12 +21,14 @@
import org.jeecg.modules.eam.request.EamSecondMaintenanceRequest;
import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
import org.jeecg.modules.eam.service.IEamSecondMaintenanceOrderService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;

@@ -67,6 +69,24 @@
        Page<EamSecondMaintenanceOrder> page = new Page<EamSecondMaintenanceOrder>(pageNo, pageSize);
        IPage<EamSecondMaintenanceOrder> pageList = eamSecondMaintenanceOrderService.queryPageList(page, query);
        return Result.OK(pageList);
    }

    /**
     * 二保批量树结构
     *
     */
    @ApiOperation(value = "设备二级保养-二保批量树结构", notes = "设备二级保养-二保批量树结构")
    @GetMapping(value = "/BatchTreeStructure")
    public Result<List<EamEquipmentTree>> BatchTreeStructure() {
        Result<List<EamEquipmentTree>> result = new Result<>();
        try {
            List<EamEquipmentTree> mdcEquipmentTreeList =eamSecondMaintenanceOrderService.getTree();
            result.setSuccess(true);
            result.setResult(mdcEquipmentTreeList);
        } catch (Exception e) {
            log.error(e.getMessage(), e);
        }
        return result;
    }

    /**
@@ -229,6 +249,18 @@
            return Result.error("编辑失败！");
        }
        return Result.OK("编辑成功!");
    }

    /**
     * 批量打印二保工单
     * @param ids
     * @return
     */
    @AutoLog(value = "设备二级保养-批量打印二保工单")
    @ApiOperation(value = "设备二级保养-批量打印二保工单", notes = "设备二级保养-批量打印二保工单")
    @GetMapping(value = "/batchExport")
    public Result<?> export(String ids){
        return Result.ok(eamSecondMaintenanceOrderService.export(ids));
    }

    /**
@@ -483,7 +515,7 @@
     */
    @ApiOperation(value = "二保工单-执行操作", notes = "二保工单-执行操作")
    @PutMapping(value = "/approval")
    public Result<?> approval(@RequestBody EamSecondMaintenanceRequest request) {
    public Result<?> approval(@RequestBody EamSecondMaintenanceRequest request) throws ParseException {
        if (request == null) {
            return Result.error("审批的对象不能为空！");
        }