From a8ad9715670b87e3e6c7fa4d9510e539cbea81ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 10 Aug 2023 09:51:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeviceRepairOrderServiceImpl.java | 27 +++++++++++-------- .../mapper/inv/DeviceInspectTaskMapper.xml | 5 ++++ 2 files changed, 21 insertions(+), 11 deletions(-) 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 index 4261ad0d1..9bc6ccb9f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java @@ -7,9 +7,12 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; +import com.glxp.api.constant.DeviceStatus; +import com.glxp.api.constant.DeviceType; import com.glxp.api.dao.inv.DeviceInspectPlanDao; import com.glxp.api.dao.inv.DeviceInspectPlanDelectMapper; import com.glxp.api.dao.inv.DeviceRepairOrderDao; +import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.inv.*; import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; @@ -52,7 +55,7 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { @Resource private DeviceInspectTaskDetailService deviceInspectTaskDetailService; @Resource - private DeviceInspectPlanDao deviceInspectPlanDao; + private DeviceRepairOrderDetailMapper deviceRepairOrderDetailMapper; @Override @@ -182,7 +185,10 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { deviceInspectTaskEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode()); deviceInspectTaskEntity.setInvCode(deviceRepairOrderEntity.getInvCode()); deviceInspectTaskEntity.setCode(deviceRepairOrderEntity.getCode()); - deviceInspectTaskEntity.setStatus(0); + deviceInspectTaskEntity.setStatus(DeviceStatus.DEVICE_STATUS_TEMP_SAVE); + deviceInspectTaskEntity.setType(DeviceType.TYPE_REPAIR); + deviceInspectTaskEntity.setLevel(deviceRepairOrderEntity.getUrgencyType()); + deviceInspectTaskEntity.setRepairType(deviceRepairOrderEntity.getRepairType()); deviceInspectTaskEntity.setRemark(deviceRepairOrderEntity.getRemark()); deviceInspectTaskEntity.setCreateTime(new Date()); deviceInspectTaskEntity.setUpdateTime(new Date()); @@ -192,21 +198,20 @@ public class DeviceRepairOrderServiceImpl implements DeviceRepairOrderService { //组装任务实体 public List getDeviceInspectTaskDetailEntity(String orderId, String taskOrderIdFk) { - //查询计划详情单 - DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(orderId); + //查询报修详情单 + DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId); List deviceInspectTaskDetailEntityLis = new ArrayList<>(); - QueryWrapper ew = new QueryWrapper<>(); + QueryWrapper ew = new QueryWrapper<>(); ew.eq("orderIdFK", orderId); - List deviceInspectPlanDelectEntityList = deviceInspectPlanDelectMapper.selectList(ew); - if (deviceInspectPlanDelectEntityList == null && deviceInspectPlanDelectEntityList.size() == 0) { + List deviceRepairOrderDetailEntities = deviceRepairOrderDetailMapper.selectList(ew); + if (deviceRepairOrderDetailEntities == null && deviceRepairOrderDetailEntities.size() == 0) { return null; } - for (DeviceInspectPlanDelectEntity deviceInspectPlanDelectEntity : deviceInspectPlanDelectEntityList) { + for (DeviceRepairOrderDetailEntity deviceRepairOrderDetailEntity : deviceRepairOrderDetailEntities) { DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity = new DeviceInspectTaskDetailEntity(); - deviceInspectTaskDetailEntity.setProjectCode(deviceInspectPlanEntity.getCode()); - deviceInspectTaskDetailEntity.setProjectContent(deviceInspectPlanDelectEntity.getContent()); + deviceInspectTaskDetailEntity.setProjectCode(deviceRepairOrderDetailEntity.getCode()); + deviceInspectTaskDetailEntity.setProjectContent(deviceRepairOrderDetailEntity.getContent()); deviceInspectTaskDetailEntity.setStatus(1); - deviceInspectTaskDetailEntity.setInspectUser(deviceInspectPlanEntity.getInspectUser()); deviceInspectTaskDetailEntity.setUpdateTime(new Date()); deviceInspectTaskDetailEntity.setTaskOrderIdFk(taskOrderIdFk); deviceInspectTaskDetailEntityLis.add(deviceInspectTaskDetailEntity); diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml index 0caccb29c..78e2a0b5a 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml @@ -44,6 +44,8 @@ t.remark, t.remindTime, t.expectedTime, + t.repairType, + t.level, (select `name` from auth_dept where code = t.deptCode) deptName, (select `name` from auth_warehouse where code = t.invCode) invName, ( SELECT `employeeName` FROM auth_user WHERE id = t.inspectUser ) inspectName, @@ -69,6 +71,9 @@ AND t.level = #{level} + + AND t.repairType = #{repairType} + AND t.status = #{status}