From 325f6d6961957d5d626fd6cbd4d104c888678000 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 16 May 2024 17:21:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=200516=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/dao/dev/DeviceInfoMapper.java | 2 +- .../dev/DeviceRepairApplyDetailEntity.java | 6 ++++++ .../glxp/api/entity/dev/DeviceRepairEntity.java | 13 +++++++++++++ .../api/req/dev/DeviceRepairApplyAddParam.java | 17 ++++++++++++----- .../glxp/api/service/dev/DeviceInfoService.java | 2 +- .../dev/impl/DeviceCheckServiceImpl.java | 4 +++- .../service/dev/impl/DeviceInfoServiceImpl.java | 2 +- .../dev/impl/DeviceRepairServiceImpl.java | 1 + .../dev/impl/DeviceUpkeepServiceImpl.java | 4 +++- .../mybatis/mapper/dev/DeviceInfoMapper.xml | 7 +++++-- src/main/resources/schemas/schema_v2.4.sql | 10 ++++++++++ 11 files changed, 56 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java index a7d8183d9..d74d9b76c 100644 --- a/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java @@ -28,7 +28,7 @@ public interface DeviceInfoMapper extends BaseMapperPlus listVoByProductIdAndStatus(@Param("productId")Long productId, @Param("status")DeviceStatusEnum status); - List listVoByCodes(@Param("list") List deviceCodes,@Param("deptCode") String deptCode,@Param("status") DeviceStatusEnum status); + List listVoByCodes(@Param("list") List deviceCodes,@Param("deptCode") String deptCode,@Param("status") List status); } diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java index 02f3eb638..df3f269c7 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java @@ -214,4 +214,10 @@ public class DeviceRepairApplyDetailEntity { */ @TableField(value = "updateTime") private LocalDateTime updateTime; + + /** + * 报修现场照片 + */ + @TableField(value = "livePath") + private String livePath; } diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java index c5d8e54ff..c7d4a3552 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java @@ -264,4 +264,17 @@ public class DeviceRepairEntity { */ @TableField(value = "updateTime") private LocalDateTime updateTime; + + /** + * 报修现场照片 + */ + @TableField(value = "livePath") + private String livePath; + + + /** + * 维修后现场图片 + */ + @TableField(value = "serviceLivePath") + private String serviceLivePath; } diff --git a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java index 0dfa78502..69654aa5f 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyAddParam.java @@ -1,6 +1,7 @@ package com.glxp.api.req.dev; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity; @@ -18,10 +19,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; @Data @@ -54,6 +52,12 @@ public class DeviceRepairApplyAddParam { @NotBlank(message = "问题描述不能为空") String description; + /** + * 报修现场照片 + */ + @TableField(value = "livePath") + private String livePath; + @Override public boolean equals(Object o) { if (this == o) return true; @@ -90,7 +94,9 @@ public class DeviceRepairApplyAddParam { } public List getDetailEntityList(Long applyId, DeviceInfoService deviceInfoService, AuthAdmin user) { - List list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), user.getLocDeptCode(), DeviceStatusEnum.NORMAL); + List enums = new ArrayList<>(); + enums.add( DeviceStatusEnum.NORMAL); + List list = deviceInfoService.listVoByCodes(details.stream().map(ApplyDetail::getDeviceCode).collect(Collectors.toList()), user.getLocDeptCode(), enums); if (list.size() != details.size()) { throw new JsonException("设备状态异常或信息不符，请确认"); } @@ -101,6 +107,7 @@ public class DeviceRepairApplyAddParam { .applyId(applyId) .description(d.getDescription()) .status(DeviceRepairApplyDetailStatusEnum.WAIT_DIAGNOSIS) + .livePath(d.getLivePath()) .build(); BeanUtil.copyProperties(info, build,"status"); return build; diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java index f6e440107..11a77e833 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java @@ -96,7 +96,7 @@ public interface DeviceInfoService extends IService { List listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status); - List listVoByCodes(List deviceCodes, String deptCode, DeviceStatusEnum status); + List listVoByCodes(List deviceCodes, String deptCode, List status); boolean exitOrder(Long orderId, String deviceCode); diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java index d45b3615d..7bb5a7ecd 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckServiceImpl.java @@ -138,9 +138,11 @@ public class DeviceCheckServiceImpl extends ServiceImpl listVoByCodes(List deviceCodes, String deptCode, DeviceStatusEnum status) { + public List listVoByCodes(List deviceCodes, String deptCode, List status) { List list = super.baseMapper.listVoByCodes(deviceCodes, deptCode, status); return list; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java index 8eafa8eff..251aba93c 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java @@ -82,6 +82,7 @@ public class DeviceRepairServiceImpl extends ServiceImpl and info.deptCode = #{deptCode} - - and info.status = #{status} + + and info.status in + + #{item} + order by info.deptCode, info.deviceCode diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 942f530a8..558e47660 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3339,3 +3339,13 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2097, '保养项目字典', 1703, 15, '/dev/deviceUpkeepItemDict', 'dev/deviceUpkeepItemDict', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-05-14 15:02:50', NULL, NULL, NULL); + +CALL Pro_Temp_ColumnWork('device_repair_apply_detail', 'livePath', + 'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修现场照片''', + 1); +CALL Pro_Temp_ColumnWork('device_repair', 'livePath', + 'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''报修现场照片''', + 1); +CALL Pro_Temp_ColumnWork('device_repair', 'serviceLivePath', + 'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修后现场照片''', + 1);