From 098ada84c9c4c7374be759725d910619345b1db4 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 27 Mar 2023 16:36:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E8=AE=BE=E5=A4=87=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=EF=BC=8C=E7=BB=B4=E4=BF=9D=E7=AD=89=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/common/req/UpdateRequest.java | 31 +++++ .../inv/DeptDeviceDetailController.java | 2 +- .../inv/DeviceInspectOrderController.java | 116 ++++++++++++++++++ .../inv/DeviceInspectPlanController.java | 116 ++++++++++++++++++ .../inv/DeviceInspectSetController.java | 68 ++++++++++ .../inv/DeviceRepairOrderController.java | 115 +++++++++++++++++ .../api/dao/inv/DeviceInspectOrderDao.java | 24 ++++ .../api/dao/inv/DeviceInspectPlanDao.java | 12 ++ .../api/dao/inv/DeviceRepairOrderDao.java | 21 ++++ .../inv/FilterDeviceInspectOrderRequest.java | 2 +- .../res/inv/DeviceInspectPlanResponse.java | 12 +- .../{impl => }/DeptDeviceDetailService.java | 2 +- .../inv/DeviceInspectOrderService.java | 65 ++++++++++ .../service/inv/DeviceRepairOrderService.java | 66 ++++++++++ .../inv/impl/DeptDeviceDetailServiceImpl.java | 1 + .../impl/DeviceInspectOrderServiceImpl.java | 104 ++++++++++++++++ .../impl/DeviceInspectPlanServiceImpl.java | 22 +++- .../inv/impl/DeviceInspectSetServiceImpl.java | 2 +- .../impl/DeviceReceiveOrderServiceImpl.java | 1 + .../impl/DeviceRepairOrderServiceImpl.java | 105 ++++++++++++++++ .../mapper/inv/DeviceInspectOrderDao.xml | 76 ++++++++---- .../mapper/inv/DeviceInspectPlanDao.xml | 45 +++++++ .../mapper/inv/DeviceRepairOrderDao.xml | 67 ++++++---- 23 files changed, 1021 insertions(+), 54 deletions(-) create mode 100644 src/main/java/com/glxp/api/common/req/UpdateRequest.java create mode 100644 src/main/java/com/glxp/api/controller/inv/DeviceInspectOrderController.java create mode 100644 src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java create mode 100644 src/main/java/com/glxp/api/controller/inv/DeviceInspectSetController.java create mode 100644 src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java rename src/main/java/com/glxp/api/service/inv/{impl => }/DeptDeviceDetailService.java (96%) create mode 100644 src/main/java/com/glxp/api/service/inv/DeviceInspectOrderService.java create mode 100644 src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java create mode 100644 src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java diff --git a/src/main/java/com/glxp/api/common/req/UpdateRequest.java b/src/main/java/com/glxp/api/common/req/UpdateRequest.java new file mode 100644 index 000000000..570b0b295 --- /dev/null +++ b/src/main/java/com/glxp/api/common/req/UpdateRequest.java @@ -0,0 +1,31 @@ +package com.glxp.api.common.req; + +import lombok.Data; + +/** + * 更新审核接口基础参数 + */ +@Data +public class UpdateRequest { + + /** + * ID + */ + private String id; + + /** + * 单号 + */ + private String orderId; + + /** + * 状态 + */ + private Integer status; + + /** + * 审核意见 + */ + private String auditOpinion; + +} diff --git a/src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java index 0a33b7480..1bbc14d47 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java @@ -9,7 +9,7 @@ import com.glxp.api.req.inv.AddDeptDeviceRequest; import com.glxp.api.req.inv.FilterDeptDeviceRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.inv.DeptDeviceDetailResponse; -import com.glxp.api.service.inv.impl.DeptDeviceDetailService; +import com.glxp.api.service.inv.DeptDeviceDetailService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectOrderController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectOrderController.java new file mode 100644 index 000000000..36711332b --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectOrderController.java @@ -0,0 +1,116 @@ +package com.glxp.api.controller.inv; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.req.UpdateRequest; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.inv.DeviceInspectOrderEntity; +import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; +import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.inv.DeviceInspectOrderResponse; +import com.glxp.api.service.inv.DeviceInspectOrderService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 设备维保单接口 + */ +@Slf4j +@RestController +public class DeviceInspectOrderController { + + @Resource + private DeviceInspectOrderService deviceInspectOrderService; + + /** + * 查询设备维保单列表 + * + * @param deviceInspectOrderRequest + * @return + */ + @GetMapping("/udiwms/inv/device/inspect/order/filter") + public BaseResponse filterList(FilterDeviceInspectOrderRequest deviceInspectOrderRequest) { + List list = deviceInspectOrderService.filterList(deviceInspectOrderRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 新增维保单 + * + * @param addDeviceInspectOrderRequest + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/order/add") + public BaseResponse addDeviceInspectOrder(@RequestBody AddDeviceInspectOrderRequest addDeviceInspectOrderRequest) { + if (null == addDeviceInspectOrderRequest) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectOrderService.addDeviceInspectOrder(addDeviceInspectOrderRequest); + } + + /** + * 更新维保单信息 + * + * @param deviceInspectOrderEntity + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/order/update") + public BaseResponse updateDeviceInspectOrder(@RequestBody DeviceInspectOrderEntity deviceInspectOrderEntity) { + if (null == deviceInspectOrderEntity) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectOrderService.updateDeviceInspectOrder(deviceInspectOrderEntity); + } + + /** + * 维保单提交审核 + * + * @param updateRequest + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/order/submitAudit") + public BaseResponse submitAudit(@RequestBody UpdateRequest updateRequest) { + if (null == updateRequest || StrUtil.isBlank(updateRequest.getOrderId())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectOrderService.submitAudit(updateRequest.getOrderId()); + } + + /** + * 更新维保单状态 + * + * @param updateRequest + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/order/updateStatus") + public BaseResponse updateStatus(@RequestBody UpdateRequest updateRequest) { + if (null == updateRequest || StrUtil.isBlank(updateRequest.getOrderId())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectOrderService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus()); + } + + /** + * 删除维保单 + * + * @param deleteRequest + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/order/delete") + public BaseResponse deleteDeviceInspectOrder(@RequestBody DeleteRequest deleteRequest) { + if (null == deleteRequest || StrUtil.isBlank(deleteRequest.getId())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectOrderService.deleteOrder(deleteRequest.getId()); + } + +} diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java new file mode 100644 index 000000000..60ffadfd6 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java @@ -0,0 +1,116 @@ +package com.glxp.api.controller.inv; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.req.UpdateRequest; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.inv.DeviceInspectPlanEntity; +import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; +import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.inv.DeviceInspectPlanResponse; +import com.glxp.api.service.inv.DeviceInspectPlanService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 设备巡检计划接口 + */ +@Slf4j +@RestController +public class DeviceInspectPlanController { + + @Resource + private DeviceInspectPlanService deviceInspectPlanService; + + /** + * 查询设备巡检计划列表 + * + * @param filterDeviceInspectPlanRequest + * @return + */ + @GetMapping("/udiwms/inv/device/inspect/plan/filter") + public BaseResponse filterList(FilterDeviceInspectPlanRequest filterDeviceInspectPlanRequest) { + List list = deviceInspectPlanService.filterList(filterDeviceInspectPlanRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 添加设备巡检计划 + * + * @param addDeviceInspectOrderRequest + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/plan/addInspectPlan") + public BaseResponse addInspectPlan(@RequestBody AddDeviceInspectOrderRequest addDeviceInspectOrderRequest) { + if (null == addDeviceInspectOrderRequest || StrUtil.isBlank(addDeviceInspectOrderRequest.getCode())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectPlanService.addDeviceInspectPlan(addDeviceInspectOrderRequest); + } + + /** + * 更新设备巡检计划 + * + * @param deviceInspectPlanEntity + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/plan/updateInspectPlan") + public BaseResponse updateInspectPlan(@RequestBody DeviceInspectPlanEntity deviceInspectPlanEntity) { + if (null == deviceInspectPlanEntity) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectPlanService.updateDeviceInspectPlan(deviceInspectPlanEntity); + } + + /** + * 提交审核 + * + * @param orderId + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/plan/submitAudit") + public BaseResponse submitAudit(@RequestBody UpdateRequest updateRequest) { + if (null == updateRequest || StrUtil.isBlank(updateRequest.getOrderId())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectPlanService.submitAudit(updateRequest.getOrderId()); + } + + /** + * 更新设备巡检计划状态 + * + * @param updateRequest + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/plan/updateStatus") + public BaseResponse updateStatus(@RequestBody UpdateRequest updateRequest) { + if (null == updateRequest || StrUtil.isBlank(updateRequest.getOrderId())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectPlanService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus()); + } + + /** + * 删除设备巡检计划 + * + * @param deleteRequest + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/plan/deleteInspectPlan") + public BaseResponse deleteInspectPlan(@RequestBody DeleteRequest deleteRequest) { + if (null == deleteRequest || StrUtil.isBlank(deleteRequest.getId())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectPlanService.deletePlan(deleteRequest.getId()); + } + +} diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectSetController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectSetController.java new file mode 100644 index 000000000..7998b781c --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectSetController.java @@ -0,0 +1,68 @@ +package com.glxp.api.controller.inv; + +import cn.hutool.core.util.StrUtil; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.inv.DeviceInspectSetEntity; +import com.glxp.api.req.inv.AddDeviceInspectSetRequest; +import com.glxp.api.res.inv.DeviceInspectSetResponse; +import com.glxp.api.service.inv.DeviceInspectSetService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 科室设备巡检设置接口 + */ +@Slf4j +@RestController +public class DeviceInspectSetController { + + @Resource + private DeviceInspectSetService deviceInspectSetService; + + /** + * 查询设备巡检设置 + * + * @param code + * @return + */ + @GetMapping("/udiwms/inv/device/inspect/set/findInspectSet") + public BaseResponse findInspectSet(String code) { + DeviceInspectSetResponse inspectSet = deviceInspectSetService.findInspectSet(code); + return ResultVOUtils.success(inspectSet); + } + + /** + * 添加设备巡检设置 + * + * @param addDeviceInspectSetRequest + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/set/addDeviceInspect") + public BaseResponse addDeviceInspect(@RequestBody AddDeviceInspectSetRequest addDeviceInspectSetRequest) { + if (null == addDeviceInspectSetRequest || StrUtil.isBlank(addDeviceInspectSetRequest.getCode())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectSetService.addDeviceInspect(addDeviceInspectSetRequest); + } + + /** + * 更新设备巡检设置 + * + * @param deviceInspectSetEntity + * @return + */ + @PostMapping("/udiwms/inv/device/inspect/set/updateInspectSet") + public BaseResponse updateInspectSet(@RequestBody DeviceInspectSetEntity deviceInspectSetEntity) { + if (null == deviceInspectSetEntity) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceInspectSetService.updateInspectSet(deviceInspectSetEntity); + } + +} diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java new file mode 100644 index 000000000..4ffd32fda --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java @@ -0,0 +1,115 @@ +package com.glxp.api.controller.inv; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.req.UpdateRequest; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.inv.DeviceRepairOrderEntity; +import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; +import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest; +import com.glxp.api.req.system.DeleteRequest; +import com.glxp.api.res.inv.DeviceRepairOrderResponse; +import com.glxp.api.service.inv.DeviceRepairOrderService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 设备报修单接口 + */ +@Slf4j +@RestController +public class DeviceRepairOrderController { + + @Resource + private DeviceRepairOrderService deviceRepairOrderService; + + /** + * 查询设备报修单列表 + * + * @param deviceRepairOrderRequest + * @return + */ + @GetMapping("/udiwms/inv/device/repair/order/filter") + public BaseResponse filterList(FilterDeviceRepairOrderRequest deviceRepairOrderRequest) { + List list = deviceRepairOrderService.filterList(deviceRepairOrderRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 添加设备报修单 + * + * @param addDeviceRepairOrderRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/addDeviceRepairOrder") + public BaseResponse addDeviceRepairOrder(@RequestBody AddDeviceRepairOrderRequest addDeviceRepairOrderRequest) { + if (null == addDeviceRepairOrderRequest || StrUtil.isBlank(addDeviceRepairOrderRequest.getCode())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceRepairOrderService.addDeviceRepairOrder(addDeviceRepairOrderRequest); + } + + /** + * 更新设备报修单信息 + * + * @param deviceRepairOrderEntity + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/updateDeviceRepairOrder") + public BaseResponse updateDeviceRepairOrder(@RequestBody DeviceRepairOrderEntity deviceRepairOrderEntity) { + if (null == deviceRepairOrderEntity || StrUtil.isBlank(deviceRepairOrderEntity.getCode())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceRepairOrderService.updateDeviceRepairOrder(deviceRepairOrderEntity); + } + + /** + * 提交审核 + * + * @param updateRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/submitAudit") + public BaseResponse submitAudit(@RequestBody UpdateRequest updateRequest) { + if (null == updateRequest || StrUtil.isBlank(updateRequest.getOrderId())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceRepairOrderService.submitAudit(updateRequest.getOrderId()); + } + + /** + * 更新维保单状态 + * + * @param updateRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/updateStatus") + public BaseResponse updateStatus(@RequestBody UpdateRequest updateRequest) { + if (null == updateRequest) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceRepairOrderService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus()); + } + + /** + * 删除维保单 + * @param deleteRequest + * @return + */ + @PostMapping("/udiwms/inv/device/repair/order/deleteRepairOrder") + public BaseResponse deleteRepairOrder(@RequestBody DeleteRequest deleteRequest) { + if (null == deleteRequest || StrUtil.isBlank(deleteRequest.getId())) { + return ResultVOUtils.paramVerifyFail(); + } + return deviceRepairOrderService.deleteRepairOrder(deleteRequest.getId()); + } + +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java index 213c339cd..9e4d63754 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java @@ -2,6 +2,30 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inv.DeviceInspectOrderEntity; +import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest; +import com.glxp.api.res.inv.DeviceInspectOrderResponse; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 设备维保单Dao + */ public interface DeviceInspectOrderDao extends BaseMapper { + + /** + * 查询设备维保单列表 + * + * @param deviceInspectOrderRequest + * @return + */ + List filterList(FilterDeviceInspectOrderRequest deviceInspectOrderRequest); + + /** + * 根据单号查询维保单信息 + * + * @param orderId + * @return + */ + DeviceInspectOrderEntity selectByOrderId(@Param("orderId") String orderId); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceInspectPlanDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceInspectPlanDao.java index 9287bde71..7d81dd0a8 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceInspectPlanDao.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceInspectPlanDao.java @@ -2,8 +2,12 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inv.DeviceInspectPlanEntity; +import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest; +import com.glxp.api.res.inv.DeviceInspectPlanResponse; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 科室设备巡检计划Dao */ @@ -16,4 +20,12 @@ public interface DeviceInspectPlanDao extends BaseMapper filterList(FilterDeviceInspectPlanRequest filterDeviceInspectPlanRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDao.java b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDao.java index 340546a0e..dab82b8a1 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDao.java @@ -2,6 +2,27 @@ package com.glxp.api.dao.inv; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.inv.DeviceRepairOrderEntity; +import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest; +import com.glxp.api.res.inv.DeviceRepairOrderResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface DeviceRepairOrderDao extends BaseMapper { + + /** + * 根据报修单号查询单据信息 + * + * @param orderId + * @return + */ + DeviceRepairOrderEntity selectByOrderId(@Param("orderId") String orderId); + + /** + * 查询设备报修单列表 + * + * @param filterDeviceRepairOrderRequest + * @return + */ + List filterList(FilterDeviceRepairOrderRequest filterDeviceRepairOrderRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java index b858324f3..fc51d36b9 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java @@ -49,6 +49,6 @@ public class FilterDeviceInspectOrderRequest extends ListPageRequest { /** * 设备状态（0：异常；2：正常） */ - private String deviceStatus; + private Integer deviceStatus; } diff --git a/src/main/java/com/glxp/api/res/inv/DeviceInspectPlanResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceInspectPlanResponse.java index 24a1d05b6..2d2b101ba 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceInspectPlanResponse.java +++ b/src/main/java/com/glxp/api/res/inv/DeviceInspectPlanResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inv; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; @@ -61,7 +60,6 @@ public class DeviceInspectPlanResponse { /** * 审核时间 */ - @TableField(value = "auditTime") private Date auditTime; /** @@ -94,4 +92,14 @@ public class DeviceInspectPlanResponse { */ private String batchNo; + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 审核人名称 + */ + private String auditUserName; + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailService.java b/src/main/java/com/glxp/api/service/inv/DeptDeviceDetailService.java similarity index 96% rename from src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailService.java rename to src/main/java/com/glxp/api/service/inv/DeptDeviceDetailService.java index 851b4e17a..d215a20c4 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeptDeviceDetailService.java @@ -1,4 +1,4 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.inv; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.inv.DeptDeviceDetailEntity; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectOrderService.java b/src/main/java/com/glxp/api/service/inv/DeviceInspectOrderService.java new file mode 100644 index 000000000..c2d2612d6 --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/DeviceInspectOrderService.java @@ -0,0 +1,65 @@ +package com.glxp.api.service.inv; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.entity.inv.DeviceInspectOrderEntity; +import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; +import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest; +import com.glxp.api.res.inv.DeviceInspectOrderResponse; + +import java.util.List; + +/** + * 设备维保单Service + */ +public interface DeviceInspectOrderService { + + /** + * 查询维保单列表 + * + * @param deviceInspectOrderRequest + * @return + */ + List filterList(FilterDeviceInspectOrderRequest deviceInspectOrderRequest); + + /** + * 新增维保单 + * + * @param addDeviceInspectOrderRequest + * @return + */ + BaseResponse addDeviceInspectOrder(AddDeviceInspectOrderRequest addDeviceInspectOrderRequest); + + /** + * 更新维保单状态 + * + * @param deviceInspectOrderEntity + * @return + */ + BaseResponse updateDeviceInspectOrder(DeviceInspectOrderEntity deviceInspectOrderEntity); + + /** + * 维保单提交审核 + * + * @param orderId + * @return + */ + BaseResponse submitAudit(String orderId); + + /** + * 更新维保单状态 + * + * @param orderId + * @param status + * @return + */ + BaseResponse updateStatus(String orderId, Integer status); + + /** + * 删除设备维保单 + * + * @param id + * @return + */ + BaseResponse deleteOrder(String id); + +} diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java new file mode 100644 index 000000000..73f2fc8ec --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java @@ -0,0 +1,66 @@ +package com.glxp.api.service.inv; + +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.entity.inv.DeviceRepairOrderEntity; +import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; +import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest; +import com.glxp.api.res.inv.DeviceRepairOrderResponse; + +import java.util.List; + +/** + * 设备保修单Service + */ +public interface DeviceRepairOrderService { + + /** + * 查询设备报修单列表 + * + * @param filterDeviceRepairOrderRequest + * @return + */ + List filterList(FilterDeviceRepairOrderRequest filterDeviceRepairOrderRequest); + + /** + * 添加设备保修单 + * + * @param addDeviceRepairOrderRequest + * @return + */ + BaseResponse addDeviceRepairOrder(AddDeviceRepairOrderRequest addDeviceRepairOrderRequest); + + /** + * 更新设备报修单状态 + * + * @param deviceRepairOrderEntity + * @return + */ + BaseResponse updateDeviceRepairOrder(DeviceRepairOrderEntity deviceRepairOrderEntity); + + /** + * 提交审核 + * + * @param orderId + * @return + */ + BaseResponse submitAudit(String orderId); + + /** + * 更新设备保修单状态 + * + * @param orderId + * @param status + * @return + */ + BaseResponse updateStatus(String orderId, Integer status); + + /** + * 删除设备报修单 + * + * @param id + * @return + */ + BaseResponse deleteRepairOrder(String id); + + +} diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java index e84ce70aa..2f50335ca 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java @@ -18,6 +18,7 @@ import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; import com.glxp.api.res.inv.DeptDeviceDetailResponse; import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse; import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inv.DeptDeviceDetailService; import com.glxp.api.util.IdUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java new file mode 100644 index 000000000..8123a24af --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java @@ -0,0 +1,104 @@ +package com.glxp.api.service.inv.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.dao.inv.DeviceInspectOrderDao; +import com.glxp.api.entity.inv.DeviceInspectOrderEntity; +import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; +import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest; +import com.glxp.api.res.inv.DeviceInspectOrderResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inv.DeviceInspectOrderService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class DeviceInspectOrderServiceImpl implements DeviceInspectOrderService { + + @Resource + private DeviceInspectOrderDao deviceInspectOrderDao; + @Resource + private CustomerService customerService; + + @Override + public List filterList(FilterDeviceInspectOrderRequest deviceInspectOrderRequest) { + if (null == deviceInspectOrderRequest) { + return Collections.emptyList(); + } + if (null != deviceInspectOrderRequest.getPage() && null != deviceInspectOrderRequest.getLimit()) { + PageHelper.offsetPage((deviceInspectOrderRequest.getPage() -1) * deviceInspectOrderRequest.getLimit(), deviceInspectOrderRequest.getLimit()); + } + return deviceInspectOrderDao.filterList(deviceInspectOrderRequest); + } + + @Override + public BaseResponse addDeviceInspectOrder(AddDeviceInspectOrderRequest addDeviceInspectOrderRequest) { + DeviceInspectOrderEntity deviceInspectOrderEntity = new DeviceInspectOrderEntity(); + BeanUtil.copyProperties(addDeviceInspectOrderRequest, deviceInspectOrderEntity); + Date date = new Date(); + deviceInspectOrderEntity.setCreateUser(customerService.getUserIdStr()); + deviceInspectOrderEntity.setAuditUser(customerService.getUserIdStr()); + deviceInspectOrderEntity.setCreateTime(date); + deviceInspectOrderEntity.setUpdateTime(date); + deviceInspectOrderDao.insert(deviceInspectOrderEntity); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse updateDeviceInspectOrder(DeviceInspectOrderEntity deviceInspectOrderEntity) { + DeviceInspectOrderEntity inspectOrderEntity = deviceInspectOrderDao.selectByOrderId(deviceInspectOrderEntity.getOrderId()); + BeanUtil.copyProperties(deviceInspectOrderEntity, inspectOrderEntity, "id", "createUser", "createTime"); + inspectOrderEntity.setUpdateTime(new Date()); + deviceInspectOrderDao.updateById(inspectOrderEntity); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse submitAudit(String orderId) { + if (StrUtil.isBlank(orderId)) { + return ResultVOUtils.paramVerifyFail(); + } + DeviceInspectOrderEntity deviceInspectOrderEntity = deviceInspectOrderDao.selectByOrderId(orderId); + deviceInspectOrderEntity.setStatus(1); + deviceInspectOrderEntity.setUpdateTime(new Date()); + deviceInspectOrderDao.updateById(deviceInspectOrderEntity); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse updateStatus(String orderId, Integer status) { + if (StrUtil.isBlank(orderId) || null == status) { + return ResultVOUtils.paramVerifyFail(); + } + DeviceInspectOrderEntity deviceInspectOrderEntity = deviceInspectOrderDao.selectByOrderId(orderId); + deviceInspectOrderEntity.setStatus(status); + Date date = new Date(); + if (status == 2) { + //审核通过 + deviceInspectOrderEntity.setAuditTime(date); + deviceInspectOrderEntity.setAuditUser(customerService.getUserIdStr()); + } + deviceInspectOrderDao.updateById(deviceInspectOrderEntity); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse deleteOrder(String id) { + if (StrUtil.isBlank(id)) { + return ResultVOUtils.paramVerifyFail(); + } + deviceInspectOrderDao.deleteById(id); + return ResultVOUtils.success(); + } +} diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java index 552ba5a84..0d890201e 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java @@ -2,6 +2,7 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.inv.DeviceInspectPlanDao; @@ -16,6 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -31,19 +33,31 @@ public class DeviceInspectPlanServiceImpl implements DeviceInspectPlanService { @Override public List filterList(FilterDeviceInspectPlanRequest filterDeviceInspectPlanRequest) { - return null; + if (null == filterDeviceInspectPlanRequest) { + return Collections.emptyList(); + } + if (null != filterDeviceInspectPlanRequest.getPage() && null != filterDeviceInspectPlanRequest.getLimit()) { + PageHelper.offsetPage((filterDeviceInspectPlanRequest.getPage() - 1) * filterDeviceInspectPlanRequest.getLimit(), filterDeviceInspectPlanRequest.getLimit()); + } + return deviceInspectPlanDao.filterList(filterDeviceInspectPlanRequest); } @Override public BaseResponse addDeviceInspectPlan(AddDeviceInspectOrderRequest addDeviceInspectOrderRequest) { - - return null; + DeviceInspectPlanEntity deviceInspectPlanEntity = new DeviceInspectPlanEntity(); + BeanUtil.copyProperties(addDeviceInspectOrderRequest, deviceInspectPlanEntity); + deviceInspectPlanEntity.setCreateUser(customerService.getUserIdStr()); + Date date = new Date(); + deviceInspectPlanEntity.setCreateTime(date); + deviceInspectPlanEntity.setUpdateTime(date); + deviceInspectPlanDao.insert(deviceInspectPlanEntity); + return ResultVOUtils.success(); } @Override public BaseResponse updateDeviceInspectPlan(DeviceInspectPlanEntity deviceInspectPlanEntity) { DeviceInspectPlanEntity deviceInspectPlan = deviceInspectPlanDao.selectById(deviceInspectPlanEntity.getId()); - BeanUtil.copyProperties(deviceInspectPlanEntity, deviceInspectPlan, "createTime", "createUser"); + BeanUtil.copyProperties(deviceInspectPlanEntity, deviceInspectPlan, "id", "createTime", "createUser"); deviceInspectPlan.setUpdateTime(new Date()); deviceInspectPlanDao.updateById(deviceInspectPlan); return ResultVOUtils.success(); diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectSetServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectSetServiceImpl.java index b1de8ac3b..cd7c3a3b4 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectSetServiceImpl.java @@ -40,7 +40,7 @@ public class DeviceInspectSetServiceImpl implements DeviceInspectSetService { @Override public BaseResponse updateInspectSet(DeviceInspectSetEntity deviceInspectSetEntity) { DeviceInspectSetEntity inspectSetEntity = deviceInspectSetDao.selectById(deviceInspectSetEntity.getId()); - BeanUtil.copyProperties(deviceInspectSetEntity, inspectSetEntity, "createUser", "createTime"); + BeanUtil.copyProperties(deviceInspectSetEntity, inspectSetEntity, "id","createUser", "createTime"); inspectSetEntity.setUpdateTime(new Date()); deviceInspectSetDao.updateById(inspectSetEntity); return ResultVOUtils.success(); diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java index 44345ebd4..2e61864e2 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java @@ -15,6 +15,7 @@ import com.glxp.api.entity.inv.DeviceReceiveOrderEntity; import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest; import com.glxp.api.res.inv.DeviceReceiveOrderResponse; import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inv.DeptDeviceDetailService; import com.glxp.api.service.inv.DeviceReceiveOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java new file mode 100644 index 000000000..12f89f8cf --- /dev/null +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java @@ -0,0 +1,105 @@ +package com.glxp.api.service.inv.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.dao.inv.DeviceRepairOrderDao; +import com.glxp.api.entity.inv.DeviceRepairOrderEntity; +import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; +import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest; +import com.glxp.api.res.inv.DeviceRepairOrderResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.inv.DeviceRepairOrderService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { + + @Resource + private DeviceRepairOrderDao deviceRepairOrderDao; + @Resource + private CustomerService customerService; + + @Override + public List filterList(FilterDeviceRepairOrderRequest filterDeviceRepairOrderRequest) { + if (null == filterDeviceRepairOrderRequest) { + return Collections.emptyList(); + } + if (null != filterDeviceRepairOrderRequest.getPage() && null != filterDeviceRepairOrderRequest.getLimit()) { + PageHelper.offsetPage((filterDeviceRepairOrderRequest.getPage() - 1) * filterDeviceRepairOrderRequest.getLimit(), filterDeviceRepairOrderRequest.getLimit()); + } + return deviceRepairOrderDao.filterList(filterDeviceRepairOrderRequest); + } + + @Override + public BaseResponse addDeviceRepairOrder(AddDeviceRepairOrderRequest addDeviceRepairOrderRequest) { + DeviceRepairOrderEntity deviceRepairOrderEntity = new DeviceRepairOrderEntity(); + BeanUtil.copyProperties(addDeviceRepairOrderRequest, deviceRepairOrderEntity); + deviceRepairOrderEntity.setCreateUser(customerService.getUserIdStr()); + Date date = new Date(); + deviceRepairOrderEntity.setCreateTime(date); + deviceRepairOrderEntity.setUpdateTime(date); + deviceRepairOrderDao.insert(deviceRepairOrderEntity); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse updateDeviceRepairOrder(DeviceRepairOrderEntity deviceRepairOrderEntity) { + DeviceRepairOrderEntity repairOrderEntity = deviceRepairOrderDao.selectByOrderId(deviceRepairOrderEntity.getOrderId()); + BeanUtil.copyProperties(deviceRepairOrderEntity, repairOrderEntity, "id", "createTime", "createUser"); + repairOrderEntity.setUpdateTime(new Date()); + deviceRepairOrderDao.updateById(repairOrderEntity); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse submitAudit(String orderId) { + if (StrUtil.isBlank(orderId)) { + return ResultVOUtils.paramVerifyFail(); + } + DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); + deviceRepairOrderEntity.setStatus(1); + deviceRepairOrderEntity.setUpdateTime(new Date()); + deviceRepairOrderDao.updateById(deviceRepairOrderEntity); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse updateStatus(String orderId, Integer status) { + if (StrUtil.isBlank(orderId) || null == status) { + return ResultVOUtils.paramVerifyFail(); + } + DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); + deviceRepairOrderEntity.setStatus(status); + Date date = new Date(); + if (status == 2) { + //审核通过 TODO 保修单审核通过，生成维保单 + deviceRepairOrderEntity.setAuditUser(customerService.getUserIdStr()); + deviceRepairOrderEntity.setAuditTime(date); + } + deviceRepairOrderEntity.setUpdateTime(date); + deviceRepairOrderDao.updateById(deviceRepairOrderEntity); + return ResultVOUtils.success(); + } + + @Override + public BaseResponse deleteRepairOrder(String id) { + if (StrUtil.isBlank(id)) { + return ResultVOUtils.paramVerifyFail(); + } + deviceRepairOrderDao.deleteById(id); + return ResultVOUtils.success(); + } + +} diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml index 16662d5d9..af0d0c726 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml @@ -1,27 +1,57 @@ - - - - - - - - - - - - - - - - - - - - - id, deptCode, invCode, code, lastOrderId, `type`, `status`, deviceStatus, `createUser`, - auditUser, createTime, auditTime, updateTime, remark - + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml index 8f8053afd..d903ff1ba 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml @@ -7,4 +7,49 @@ where orderId = #{orderId} + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml index c14ea67de..c293954a0 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml @@ -1,25 +1,50 @@ - - - - - - - - - - - - - - - - - - - id, deptCode, invCode, code, `status`, `createUser`, auditUser, msg, createTime, - auditTime, updateTime, remark - + + + \ No newline at end of file