设备报修代码提交

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<DeviceInspectTaskDetailEntity> getDeviceInspectTaskDetailEntity(String orderId, String taskOrderIdFk) {
-        //查询计划详情单
-        DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(orderId);
+        //查询报修详情单
+        DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(orderId);
         List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityLis = new ArrayList<>();
-        QueryWrapper<DeviceInspectPlanDelectEntity> ew = new QueryWrapper<>();
+        QueryWrapper<DeviceRepairOrderDetailEntity> ew = new QueryWrapper<>();
         ew.eq("orderIdFK", orderId);
-        List<DeviceInspectPlanDelectEntity> deviceInspectPlanDelectEntityList = deviceInspectPlanDelectMapper.selectList(ew);
-        if (deviceInspectPlanDelectEntityList == null && deviceInspectPlanDelectEntityList.size() == 0) {
+        List<DeviceRepairOrderDetailEntity> 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);

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 @@
       <if test="level != null">
         AND t.level = #{level}
       </if>
+      <if test="repairType != null">
+        AND t.repairType = #{repairType}
+      </if>
       <if test="status != null">
         AND t.status = #{status}
       </if>