设备管理调整

hyingbo

2 天以前 6da57b610d97be3f79084d43440e7823d707b249

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

@@ -18,6 +18,7 @@
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentExtend;
import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.dto.EquipmentCategoryStatistics;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
@@ -82,6 +83,29 @@
        IPage<EamEquipment> page = new Page<>(pageNo, pageSize);
        IPage<EamEquipment> pageList = eamEquipmentService.queryPageList(page, eamEquipment);
        return Result.OK(pageList);
    }

    /**
     * 设备台账-台账统计
     *
     * @return
     */
//    @AutoLog(value = "设备台账-分页列表查询")
    @ApiOperation(value = "设备台账-台账统计", notes = "设备台账-台账统计")
    @GetMapping(value = "/queryLedgerStatistics")
    public Result<?> queryLedgerStatistics() {
        List<EquipmentCategoryStatistics> list = eamEquipmentService.queryLedgerStatistics();
        return Result.OK(list);
    }

    /**
     * 导出台账统计excel
     *
     * @param request
     */
    @RequestMapping(value = "/exportLedgerStatisticsXls")
    public ModelAndView exportLedgerStatisticsXls(HttpServletRequest request) {
        return eamEquipmentService.exportLedgerStatisticsXls(request, EquipmentCategoryStatistics.class, "台账统计");
    }

    /**
@@ -251,10 +275,10 @@
//                        sb.append(String.format("设备编码[%s]验收为空，无法导入\n\r", eamEquipment.getEquipmentCode()));
//                        continue;
//                    }
                    if (StringUtils.isBlank(eamEquipment.getTechnologyStatus())) {
                        sb.append(String.format("设备编码[%s]技术状态为空，无法导入\n\r", eamEquipment.getEquipmentCode()));
                        continue;
                    }
//                    if (StringUtils.isBlank(eamEquipment.getTechnologyStatus())) {
//                        sb.append(String.format("设备编码[%s]技术状态为空，无法导入\n\r", eamEquipment.getEquipmentCode()));
//                        continue;
//                    }
                    EamEquipment one = eamEquipmentService.getOne(new LambdaQueryWrapper<EamEquipment>().eq(EamEquipment::getEquipmentCode, eamEquipment.getEquipmentCode()).eq(EamEquipment::getDelFlag, CommonConstant.DEL_FLAG_0));
                    if (one != null) {
                        sb.append(String.format("设备编码[%s]已存在，无法重复导入\n\r", eamEquipment.getEquipmentCode()));