From 67b077129499798ac0cd3232cabf545297464391 Mon Sep 17 00:00:00 2001 From: jiang Date: Thu, 16 Oct 2025 19:27:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devConfig/domain/EquipmentProperty.java | 1 + .../devchange/domain/CsDeviceChangeVo.java | 52 +++--- .../material/devchange/domain/MaDevInfo.java | 10 +- .../devchange/mapper/DevChangeMapper.java | 21 ++- .../devchange/mapper/MaDevInfoMapper.java | 1 + .../service/DevChangeServiceImpl.java | 6 +- .../device/controller/DevMergeController.java | 9 + .../bonus/material/device/domain/MaDevQc.java | 4 +- .../device/domain/vo/DevInfoPropertyVo.java | 15 +- .../device/mapper/DevMergeMapper.java | 4 + .../device/service/DevMergeService.java | 1 + .../service/impl/DevMergeServiceImpl.java | 74 ++++++++ .../controller/LargeScreenController.java | 78 +++++++- .../impl/ProvinceScreenServiceImpl.java | 1 + .../lease/mapper/MaLeaseInfoMapper.java | 12 ++ .../devConfig/EquipmentPropertyMapper.xml | 18 +- .../material/devchange/DevChangeMapper.xml | 11 +- .../material/devchange/MaDevInfoMapper.xml | 39 +++- .../mapper/material/device/DevInfoMapper.xml | 3 +- .../mapper/material/device/DevMergeMapper.xml | 55 +++++- .../mapper/material/home/MaTypeInfoMapper.xml | 2 +- .../material/lease/MaLeaseInfoMapper.xml | 176 +++++++++++++++++- 22 files changed, 537 insertions(+), 56 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/domain/EquipmentProperty.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/domain/EquipmentProperty.java index 3d91d5d..be83b0f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/domain/EquipmentProperty.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/domain/EquipmentProperty.java @@ -19,6 +19,7 @@ public class EquipmentProperty { private String propertyName; private String propertyValue; private Date createTime; + private String value; @Override public String toString() { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/CsDeviceChangeVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/CsDeviceChangeVo.java index 305498b..3fec076 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/CsDeviceChangeVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/CsDeviceChangeVo.java @@ -24,81 +24,81 @@ public class CsDeviceChangeVo { /** * 主键 */ - private String id; + private String id; /** * 变更状前状态 */ - @Excel(name = "流转前状态",width = 20,sort = 4) - private String changeStatusName; + @Excel(name = "流转前状态", width = 20, sort = 4) + private String changeStatusName; - private String changeStatus; + private String changeStatus; /** * 类型 * 变更类型 1入库 2出库 3 退役 4 维修 */ - @Excel(name = "操作类型",width = 25 ,sort = 2) + @Excel(name = "操作类型", width = 25, sort = 2) private String typeName; - private String type; + private String type; /** * 变更状态 0自用 1共享 */ - private String status; + private String status; /** * 工程编码 */ - private String proCode; + private String proCode; /** * 工程名称 */ - @Excel(name = "使用项目",width = 25,sort = 7) - private String proName; + @Excel(name = "使用项目", width = 25, sort = 7) + private String proName; /** * 工程类型 */ - private String proType; + private String proType; /** * 设备数量 */ - @Excel(name = "设备数量",width = 25,sort = 9) - private String devNum; + @Excel(name = "设备数量", width = 25, sort = 9) + private String devNum; /** * 电压等级 */ - private String voltageLevel; + private String voltageLevel; /** * 使用单位 */ - @Excel(name = "使用单位",width = 25,sort = 6) - private String useUint; + @Excel(name = "使用单位", width = 25, sort = 6) + private String useUint; /** * 省 */ - private String proProvince; + private String proProvince; /** * 市 */ - private String proCity; + private String proCity; /** * 区 */ - private String proCounty; + private String proCounty; /** * 详细地址 */ - @Excel(name = "使用地址",width = 25,sort = 8) - private String proLocation; + @Excel(name = "使用地址", width = 25, sort = 8) + private String proLocation; /** * 创建时间 */ - @Excel(name = "操作时间",width = 25,sort = 2) - private String createTime; + @Excel(name = "操作时间", width = 25, sort = 2) + private String createTime; /** * 创建人 */ - @Excel(name = "操作人",width = 20,sort = 1) - private String createUser; + @Excel(name = "操作人", width = 20, sort = 1) + private String createUser; /** * 使用人 */ @@ -122,7 +122,7 @@ public class CsDeviceChangeVo { private String endTime; - + private String useTime; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java index c598dff..446830a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java @@ -68,7 +68,7 @@ public class MaDevInfo { * 子工序id * 说明：装备参与的具体子工序 */ - private String subProcessId; + private Integer subProcessId; /** * 子工序 * 说明：装备参与的具体子工序 @@ -79,7 +79,7 @@ public class MaDevInfo { * 装备大类目id * 说明：装备所属的一级分类（如工程机械、仪器仪表等） */ - private String mainCategoryId; + private Integer mainCategoryId; /** * 装备大类目 * 说明：装备所属的一级分类（如工程机械、仪器仪表等） @@ -99,7 +99,7 @@ public class MaDevInfo { * 装备分支id * 说明：小类目下的更细分类，代表具体的装备类型分支 */ - private String branchId; + private Integer branchId; /** * 装备分支 * 说明：小类目下的更细分类，代表具体的装备类型分支 @@ -181,7 +181,7 @@ public class MaDevInfo { * 生产厂家id * 说明：装备的生产制造厂商名称 */ - private String manufacturerId; + private Integer manufacturerId; /** * 生产厂家 * 说明：装备的生产制造厂商名称 @@ -336,4 +336,6 @@ public class MaDevInfo { private String isWarn; private String entryStatus; + private String upDownStatus; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java index 9cc1770..2019d17 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/DevChangeMapper.java @@ -16,6 +16,7 @@ public interface DevChangeMapper { /** * 查询设备列表集合 + * * @param devInfo * @return */ @@ -23,6 +24,7 @@ public interface DevChangeMapper { /** * 查询设备集合 + * * @param vo * @return */ @@ -30,12 +32,14 @@ public interface DevChangeMapper { /** * 更新数据 + * * @param vo */ void updateJson(DevChangeVo vo); /** * 查询工程下拉选集合 + * * @param vo * @return */ @@ -43,6 +47,7 @@ public interface DevChangeMapper { /** * xinz + * * @param vo * @return */ @@ -50,18 +55,21 @@ public interface DevChangeMapper { /** * 新增设备变更记录数据 + * * @param deviceChangeDetailsVo */ int addDetailsInfo(CsDeviceChangeDetailsVo deviceChangeDetailsVo); /** - * * @param vo */ void updateDevInfo(CsDeviceChangeVo vo); + void updateDevInfoData(CsDeviceChangeVo vo); + /** * 查询设备变更前状态 + * * @param devId * @return */ @@ -69,6 +77,7 @@ public interface DevChangeMapper { /** * 查询 设备变更记录 + * * @param vo * @return */ @@ -76,6 +85,7 @@ public interface DevChangeMapper { /** * 获取变更前设备 + * * @param devId * @return */ @@ -83,6 +93,7 @@ public interface DevChangeMapper { /** * 查询 设备单位 + * * @param devId * @return */ @@ -90,13 +101,15 @@ public interface DevChangeMapper { /** * 查询出库单 + * * @param vo * @return */ - List getDevDetails(CsDeviceChangeDetailsVo vo); + List getDevDetails(CsDeviceChangeDetailsVo vo); /** * 电压等级 + * * @param vo * @return */ @@ -104,25 +117,27 @@ public interface DevChangeMapper { /** * 修改详情 + * * @param deviceChangeDetailsVo */ void addDevChangeDetails(DevChangeDetailsVo deviceChangeDetailsVo); /** * 查询数据 + * * @param vo * @return */ List getDevChangeDetailsList(DevChangeDetailsVo vo); /** - * * @param voo */ void deleteDevChangeDetails(DevChangeDetailsVo voo); /** * 修改数量 + * * @param newNum */ void updateChangeDetailsNum(DevChangeDetailsVo voo); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/MaDevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/MaDevInfoMapper.java index 54a1088..000a43d 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/MaDevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/mapper/MaDevInfoMapper.java @@ -45,5 +45,6 @@ public interface MaDevInfoMapper { MaDevInfo getDevice(Integer maId); List getDeviceByMaIds(String[] maIdArray); + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java index d15efd4..acf0f82 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java @@ -114,9 +114,10 @@ public class DevChangeServiceImpl implements DevChangeService { for (CsDeviceChangeDetailsVo deviceChangeDetailsVo : list) { if ("1".equals(vo.getStatus())) { updateDevDetails(deviceChangeDetailsVo.getDevId(), null, "1", deviceChangeDetailsVo.getNum()); - + deviceChangeDetailsVo.setStatus("1"); } else { updateDevDetails(deviceChangeDetailsVo.getDevId(), null, "5", deviceChangeDetailsVo.getNum()); + deviceChangeDetailsVo.setStatus("5"); } //新增设备列表数据 deviceChangeDetailsVo.setChangeId(vo.getId()); @@ -176,6 +177,7 @@ public class DevChangeServiceImpl implements DevChangeService { deviceChangeDetailsVo.setChangeId(vo.getId()); deviceChangeDetailsVo.setReasonVal(vo.getReasonVal()); deviceChangeDetailsVo.setReasonId(vo.getReasonId()); + deviceChangeDetailsVo.setStatus("4"); //新增设备详情 int isSuccess = mapper.addDetailsInfo(deviceChangeDetailsVo); if (isSuccess > 0) { @@ -233,8 +235,10 @@ public class DevChangeServiceImpl implements DevChangeService { entity.setUseUint(usUnit); entity.setChangeUnit(usUnit); if ("1".equals(deviceChangeDetailsVo.getStatus())) { + deviceChangeDetailsVo.setStatus("1"); updateDevDetails2(deviceChangeDetailsVo.getDevId(), proId, "1", deviceChangeDetailsVo.getNum()); } else { + deviceChangeDetailsVo.setStatus("4"); updateDevDetails2(deviceChangeDetailsVo.getDevId(), proId, "4", deviceChangeDetailsVo.getNum()); } //新增设备列表数据 diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevMergeController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevMergeController.java index 24747be..947ecc5 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevMergeController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevMergeController.java @@ -144,6 +144,15 @@ public class DevMergeController extends BaseController { return service.interDevice(maDevInfo); } + /** + * 获取台账中设备信息详细信息 + */ + @ApiOperation(value = "装备台账-新增单个设备草稿") + @PostMapping("/updateDevice") + public AjaxResult updateDevice(@RequestBody MaDevInfo maDevInfo) { + return service.updateDevice(maDevInfo); + } + /** * 获取台账中设备信息详细信息 */ diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java index eb0fbc9..21c95c0 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java @@ -47,8 +47,8 @@ public class MaDevQc extends BaseEntity implements Serializable { private String qcUser; @ApiModelProperty(value = "质检日期") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date qcTime; @ApiModelProperty(value = "质检开始日期") diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoPropertyVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoPropertyVo.java index eb2c688..a1e5300 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoPropertyVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoPropertyVo.java @@ -1,17 +1,26 @@ package com.bonus.material.device.domain.vo; import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; import lombok.Data; @Data public class DevInfoPropertyVo { - - /** 属性名称 */ + private Integer id; + /** + * 属性名称 + */ @ApiModelProperty(value = "属性名称") private String propertyName; - /** 属性值 */ + /** + * 属性值 + */ @ApiModelProperty(value = "属性值") private String propertyValue; + private String value; + + private String inputType; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevMergeMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevMergeMapper.java index b785d81..5b94985 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevMergeMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevMergeMapper.java @@ -79,5 +79,9 @@ public interface DevMergeMapper { List getDeviceByOrderId(MaDevInfo o); void interFile(MaDevFile item); + + Integer updateDeviceByMaId(MaDevInfo maDevInfo); + + void delFile(Integer maId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevMergeService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevMergeService.java index 3549213..f61ebae 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevMergeService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/DevMergeService.java @@ -68,4 +68,5 @@ public interface DevMergeService { List getDeviceByOrderId(MaDevInfo o); + AjaxResult updateDevice(MaDevInfo maDevInfo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevMergeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevMergeServiceImpl.java index 0b83883..b706500 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevMergeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevMergeServiceImpl.java @@ -82,6 +82,9 @@ public class DevMergeServiceImpl implements DevMergeService { @Autowired private MaDevInfoMapper mapper; + @Autowired + private MaDevQcMapper qcMapper; + @Override public List list(DevMergeVo devInfo) { return devMergeMapper.list(devInfo); @@ -234,6 +237,17 @@ public class DevMergeServiceImpl implements DevMergeService { maDevInfo.setCode(getString()); Integer i = devMergeMapper.interDevice(maDevInfo); if (i > 0) { + devInfoMapper.deleteDevInfoProperties(Long.valueOf(maDevInfo.getMaId())); + MaDevQc maDevQc = new MaDevQc(); + maDevQc.setMaId(maDevInfo.getMaId()); + maDevQc.setQcCode(maDevInfo.getCode()); + maDevQc.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + maDevQc.setCreateTime(DateUtils.getNowDate()); + maDevQc.setQcCom(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).toString()); + maDevQc.setNextCheckTime(maDevInfo.getNextMaintenanceDate()); + qcMapper.insertDevQc(maDevQc); + + devInfoMapper.insertDevInfoProperties(Long.valueOf(maDevInfo.getMaId()), maDevInfo.getPropertyVoList()); devMergeMapper.insertOrderDevReal(String.valueOf(maDevInfo.getOrderId()), Long.valueOf(maDevInfo.getMaId())); maDevInfo.getAppearanceImages().forEach(item -> { // 这里编写对每个 image 的处理逻辑，比如打印、处理等 @@ -338,6 +352,66 @@ public class DevMergeServiceImpl implements DevMergeService { return list; } + /** + * @param maDevInfo + * @return + */ + @Override + public AjaxResult updateDevice(MaDevInfo maDevInfo) { + try { + Integer i = devMergeMapper.updateDeviceByMaId(maDevInfo); + + if (i > 0) { + devInfoMapper.deleteDevInfoProperties(Long.valueOf(maDevInfo.getMaId())); + devMergeMapper.delFile(maDevInfo.getMaId()); + devInfoMapper.insertDevInfoProperties(Long.valueOf(maDevInfo.getMaId()), maDevInfo.getPropertyVoList()); + MaDevQc maDevQc = new MaDevQc(); + maDevQc.setMaId(maDevInfo.getMaId()); + maDevQc.setQcCode(maDevInfo.getCode()); + maDevQc.setCreateBy(String.valueOf(SecurityUtils.getUserId())); + maDevQc.setCreateTime(DateUtils.getNowDate()); + maDevQc.setQcCom(Optional.ofNullable(SecurityUtils.getLoginUser().getSysUser().getCompanyId()).orElse(SecurityUtils.getLoginUser().getSysUser().getDeptId()).toString()); + maDevQc.setNextCheckTime(maDevInfo.getNextMaintenanceDate()); + qcMapper.insertDevQc(maDevQc); + maDevInfo.getAppearanceImages().forEach(item -> { + // 这里编写对每个 image 的处理逻辑，比如打印、处理等 + item.setFileType(1); + item.setMaId(maDevInfo.getMaId()); + item.setCreator(Math.toIntExact(SecurityUtils.getLoginUser().getUserid())); + devMergeMapper.interFile(item); + }); + + maDevInfo.getCertificates().forEach(item -> { + // 这里编写对每个 image 的处理逻辑，比如打印、处理等 + item.setFileType(2); + item.setMaId(maDevInfo.getMaId()); + item.setCreator(Math.toIntExact(SecurityUtils.getLoginUser().getUserid())); + devMergeMapper.interFile(item); + }); + + maDevInfo.getInspectionReports().forEach(item -> { + // 这里编写对每个 image 的处理逻辑，比如打印、处理等 + item.setFileType(3); + item.setMaId(maDevInfo.getMaId()); + item.setCreator(Math.toIntExact(SecurityUtils.getLoginUser().getUserid())); + devMergeMapper.interFile(item); + }); + + maDevInfo.getPurchaseInvoices().forEach(item -> { + // 这里编写对每个 image 的处理逻辑，比如打印、处理等 + item.setFileType(4); + item.setMaId(maDevInfo.getMaId()); + item.setCreator(Math.toIntExact(SecurityUtils.getLoginUser().getUserid())); + devMergeMapper.interFile(item); + }); + } + return i > 0 ? AjaxResult.success("修改成功") : AjaxResult.error("修改失败"); + } catch (Exception e) { + log.error(e.getMessage()); + return AjaxResult.error(); + } + } + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyMMdd"); private static final String SEPARATOR = "-"; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java index 291eeba..02184d8 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java @@ -647,7 +647,7 @@ public class LargeScreenController extends BaseController { } @GetMapping("/getMaType") - public AjaxResult getMaType(@RequestParam Long firstLevelId ) { + public AjaxResult getMaType(@RequestParam Long firstLevelId) { try { List> maType = leaseInfoMapper.getMaType(firstLevelId); return !maType.isEmpty() ? AjaxResult.success(maType) : AjaxResult.error(); @@ -665,4 +665,80 @@ public class LargeScreenController extends BaseController { return AjaxResult.error(); } } + + + @GetMapping("/statByTypeAndAgeDetails") + public AjaxResult statByTypeAndAgeDetails(@RequestParam String type) { + try { + List> maType = leaseInfoMapper.statByTypeAndAgeDetails(type); + return AjaxResult.success(maType); + } catch (Exception e) { + return AjaxResult.error(); + } + } + + + @GetMapping("/statByTypeAndAgeByEquipment") + public AjaxResult statByTypeAndAgeByEquipment(@RequestParam String type) { + try { + List> maType = leaseInfoMapper.statByTypeAndAgeByEquipment(type); + return AjaxResult.success(maType); + } catch (Exception e) { + System.err.println(e.getMessage()); + return AjaxResult.error(); + } + } + + + @GetMapping("/statByTypeAndAgeByCity") + public AjaxResult statByTypeAndAgeByCity(@RequestParam String type) { + try { + List> maType = leaseInfoMapper.statByTypeAndAgeByCity(type); + return AjaxResult.success(maType); + } catch (Exception e) { + System.err.println(e.getMessage()); + return AjaxResult.error(); + } + } + + + @GetMapping("/statByTypeAndAgeByConfiguration") + public AjaxResult statByTypeAndAgeByConfiguration() { + try { + List> maType = leaseInfoMapper.statByTypeAndAgeByConfiguration(); + return AjaxResult.success(maType); + } catch (Exception e) { + System.err.println(e.getMessage()); + return AjaxResult.error(); + } + } + + + @GetMapping("/statByTypeAndAgeByTurnoverRate") + public AjaxResult statByTypeAndAgeByTurnoverRate() { + try { + List> maType = leaseInfoMapper.statByTypeAndAgeByTurnoverRate(); + return AjaxResult.success(maType); + } catch (Exception e) { + System.err.println(e.getMessage()); + return AjaxResult.error(); + } + } + + + @GetMapping("/statByTypeAndAgeByUsageRate") + public AjaxResult statByTypeAndAgeByUsageRate() { + try { + List> maType = leaseInfoMapper.statByTypeAndAgeByUsageRate(); + return AjaxResult.success(maType); + } catch (Exception e) { + System.err.println(e.getMessage()); + return AjaxResult.error(); + } + } + + + + + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java index 867b90d..72fa9a0 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/service/impl/ProvinceScreenServiceImpl.java @@ -302,6 +302,7 @@ public class ProvinceScreenServiceImpl implements ProvinceScreenService { res.put("annualTotal", "140.6"); //在建工程数 TODO e基建2.0获取 res.put("projectNUm", 50); + //在用装备数 //自用--2 int inUse = devInfoMapper.getEquipmentStatus("2"); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java index 0ab9deb..dffca71 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java @@ -239,4 +239,16 @@ public interface MaLeaseInfoMapper { @MapKey("targetType") List> statByTypeAndAge(); + + List> statByTypeAndAgeDetails(String type); + + List> statByTypeAndAgeByEquipment(String type); + + List> statByTypeAndAgeByCity(String type); + + List> statByTypeAndAgeByConfiguration(); + + List> statByTypeAndAgeByTurnoverRate(); + + List> statByTypeAndAgeByUsageRate(); } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml index efe8c8a..3dff3a9 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml @@ -10,6 +10,7 @@ + @@ -83,14 +84,27 @@ @@ -314,6 +319,7 @@ mdi.device_name AS name, mdi.item_type_model As specificationModel, mdi.code AS code, + mdi.up_down_status AS upDownStatus, mdi.change_status AS status, TIMESTAMPDIFF(YEAR, mdi.production_date, CURDATE()) AS serviceLife, jsp.pro_code AS usingProjectId, @@ -329,16 +335,38 @@ mdi.unit AS unit, mdq.next_check_time AS nextMaintenanceDate, mdi.max_working_hours AS maxServiceLifeYears, + ( SELECT COUNT(*) FROM cs_device_change_details WHERE dev_id = mdi.ma_id AND repair_time IS NOT NULL ) AS + repairCount, + ( + SELECT + COUNT(*) + FROM + cs_device_change_details + WHERE + dev_id = mdi.ma_id + AND `status` IN ( 2, 3 )) AS usageCount, sc.name AS province from ma_dev_info mdi LEFT JOIN ma_type_view mtv ON mtv.typeId = mdi.type_id LEFT JOIN jj_sing_project jsp ON mdi.on_project = jsp.pro_code LEFT JOIN sys_dept sd ON sd.dept_id = mdi.on_company - LEFT JOIN ma_dev_qc mdq ON mdq.ma_id = mdi.ma_id + LEFT JOIN (SELECT max( next_check_time) next_check_time,ma_id from ma_dev_qc GROUP BY ma_id ) mdq on + mdi.ma_id=mdq.ma_id LEFT JOIN ma_supplier ms ON ms.supplier_id = mdi.supplier_id LEFT JOIN sys_cnarea sc ON sc.area_code = mdi.province_id - mdi.is_active = '1' + mdi.is_active = '1' and mdi.entry_status = '1' + + and ( + mtv.mainGxId = #{typeId} + or mtv.childGxId = #{typeId} + or mtv.devCategoryId = #{typeId} + or mtv.devSubcategoryId = #{typeId} + or mtv.devNameId = #{typeId} + or mtv.devModelId = #{typeId} + or mtv.maxTypeId = #{typeId} + ) + and mdi.device_name like concat('%', #{name}, '%') @@ -451,7 +479,8 @@ LEFT JOIN ma_type_view mtv ON mtv.typeId = mdi.type_id LEFT JOIN jj_sing_project jsp ON mdi.on_project = jsp.pro_code LEFT JOIN sys_dept sd ON sd.dept_id = mdi.on_company - LEFT JOIN ma_dev_qc mdq ON mdq.ma_id = mdi.ma_id + LEFT JOIN (SELECT max( next_check_time) next_check_time,ma_id from ma_dev_qc GROUP BY ma_id ) mdq on + mdi.ma_id=mdq.ma_id LEFT JOIN ma_supplier ms ON ms.supplier_id = mdi.supplier_id mdi.is_active = '1' AND mdi.ma_id =#{maId} diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 28a33e5..8927e4b 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -543,11 +543,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into - ma_dev_info_properties(ma_id, property_name, property_value, create_time) + ma_dev_info_properties(ma_id,property_id, property_name, property_value, create_time) values ( #{maId}, + #{item.id}, #{item.propertyName}, #{item.propertyValue}, now() diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml index 586ed27..88f46e7 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml @@ -30,7 +30,7 @@ GROUP BY aaa.id - ORDER BY aaa.status DESC + ORDER BY aaa.status DESC ,aaa.create_time DESC select count(1) from ma_dev_info @@ -337,7 +382,8 @@ LEFT JOIN ma_type_view mtv ON mtv.typeId = mdi.type_id LEFT JOIN jj_sing_project jsp ON mdi.on_project = jsp.pro_code LEFT JOIN sys_dept sd ON sd.dept_id = mdi.on_company - LEFT JOIN ma_dev_qc mdq ON mdq.ma_id = mdi.ma_id + LEFT JOIN (SELECT max( next_check_time) next_check_time,ma_id from ma_dev_qc GROUP BY ma_id ) mdq on + mdi.ma_id=mdq.ma_id LEFT JOIN ma_supplier ms ON ms.supplier_id = mdi.supplier_id LEFT JOIN sys_cnarea sc ON sc.area_code = mdi.province_id @@ -435,7 +481,8 @@ LEFT JOIN ma_type_view mtv ON mtv.typeId = mdi.type_id LEFT JOIN jj_sing_project jsp ON mdi.on_project = jsp.pro_code LEFT JOIN sys_dept sd ON sd.dept_id = mdi.on_company - LEFT JOIN ma_dev_qc mdq ON mdq.ma_id = mdi.ma_id + LEFT JOIN (SELECT max( next_check_time) next_check_time,ma_id from ma_dev_qc GROUP BY ma_id ) mdq on + mdi.ma_id=mdq.ma_id LEFT JOIN ma_supplier ms ON ms.supplier_id = mdi.supplier_id LEFT JOIN sys_cnarea sc ON sc.area_code = mdi.province_id diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml index 84551c6..946a18f 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml @@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + +