Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev

# Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java
#	dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java

dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java

@@ -107,6 +107,24 @@ public class BaseConstants {
     /**维修记录*/
     public static final String REPAIR_RECORD_TYPE_RECORD = "record";
 
+    /**创建工单*/
+    public static final String REPAIR_RECORD_TYPE_CJGD = "cjgd";
+    /**指派施工*/
+    public static final String REPAIR_RECORD_TYPE_ZPSG = "zpsg";
+    /**领料*/
+    public static final String REPAIR_RECORD_TYPE_LL = "ll";
+    /**退料*/
+    public static final String REPAIR_RECORD_TYPE_TL = "tl";
+    /**施工完成（自检）*/
+    public static final String REPAIR_RECORD_TYPE_SGWCZJ = "sgwczj";
+    /**总检*/
+    public static final String REPAIR_RECORD_TYPE_ZJ = "zj";
+    /**结束工单*/
+    public static final String REPAIR_RECORD_TYPE_JSGD = "jsgd";
+    /** 开始施工 */
+    public static final String REPAIR_RECORD_TYPE_KSSG = "kssg";
+    /** 施工中 */
+    public static final String REPAIR_RECORD_TYPE_SGZ = "sgz";
 
 
 }

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java

@@ -219,5 +219,19 @@ public class DlRepairTicketsController {
         dlRepairTicketsService.updateRepair(reqVO);
         return CommonResult.ok();
     }
+
+    /**
+     * 更新工单状态
+     *
+     * @author 小李
+     * @date 15:46 2024/10/18
+     * @param respVO 请求对象
+    **/
+    @PostMapping("/updateStatus")
+    @Operation(summary = "更新工单状态")
+    public CommonResult<?> updateStatus(@RequestBody DlRepairTicketsRespVO respVO){
+        dlRepairTicketsService.updateStatus(respVO);
+        return CommonResult.ok();
+    }
 }
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java

@@ -48,5 +48,18 @@ public class DlRepairTitemController {
         Page<DlRepairTitemRespVO> page = new Page<>(pageNo, pageSize);
         return success(dlRepairTitemService.getTItemPage(repairTitemRespVO, page));
     }
+
+    /**
+     * 获取当前操作人操作的工单中的项目
+     *
+     * @author 小李
+     * @date 15:01 2024/10/18
+     * @param ticketId 工单ID
+    **/
+    @GetMapping("/listProject")
+    @Operation(summary = "获取当前操作人操作的工单中的项目")
+    public CommonResult<?> getProjectList(@RequestParam("ticketId") String ticketId){
+        return success(dlRepairTitemService.getProjectList(ticketId));
+    }
 }
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java

@@ -116,4 +116,14 @@ public interface DlRepairTicketsService extends IService<DlRepairTickets> {
      * @param reqVO 请求对象
      **/
     void updateRepair(DlRepairTicketsReqVO reqVO);
+
+    /**
+     * 更新工单状态
+     *
+     * @param respVO 请求对象
+     * @author 小李
+     * @date 15:46 2024/10/18
+     **/
+    void updateStatus(DlRepairTicketsRespVO respVO);
+
 }

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * 针对表【dl_repair_titem(维修工单子表)】的数据库操作Service
  *
@@ -22,4 +24,14 @@ public interface DlRepairTitemService extends IService<DlRepairTitem> {
      * @param repairTitemRespVO 查询对象
      **/
     IPage<DlRepairTitemRespVO> getTItemPage(DlRepairTitemRespVO repairTitemRespVO, Page<DlRepairTitemRespVO> page);
+
+    /**
+     * 获取当前操作人操作的工单中的项目
+     *
+     * @param ticketId 工单ID
+     * @author 小李
+     * @date 15:01 2024/10/18
+     **/
+    List<DlRepairTitem> getProjectList(String ticketId);
+
 }

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java

@@ -134,6 +134,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
     private RepairWorkerService repairWorkerService;
     @Resource
     private RepairWorkerService workerService;
+    @Resource
+    @Lazy
+    private RepairRecordsService recordsService;
     @Autowired
     private RepairRecordsService repairRecordsService;
 
@@ -522,6 +525,30 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         //最后记录操作日志--指派施工
         repairRecordsService.saveRepairRecord(reqVO.getId(),null, RecordTypeEnum.ZPSG.getCode(),"指派施工",null);
     }
+
+    /**
+     * 更新工单状态
+     *
+     * @param respVO 请求对象
+     * @author 小李
+     * @date 15:46 2024/10/18
+     **/
+    @Override
+    @DSTransactional
+    public void updateStatus(DlRepairTicketsRespVO respVO){
+        // 更新工单主表
+        baseMapper.update(new LambdaUpdateWrapper<DlRepairTickets>()
+                .set(DlRepairTickets::getTicketsWorkStatus, respVO.getTicketsWorkStatus())
+                .eq(DlRepairTickets::getId, respVO.getId())
+        );
+        // 更新工单子表
+        titemService.update(new LambdaUpdateWrapper<DlRepairTitem>()
+                .set(DlRepairTitem::getItemStatus, respVO.getItem().getItemStatus())
+                .eq(DlRepairTitem::getId, respVO.getItem().getId())
+        );
+        // 记录日志
+        recordsService.saveRepairRecord(respVO.getId(), respVO.getItem().getId(), respVO.getRecordType(), respVO.getRemark(), respVO.getImage());
+    }
 }
 
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java

@@ -4,11 +4,14 @@ import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
 import cn.iocoder.yudao.module.tickets.mapper.DlRepairTitemMapper;
 import cn.iocoder.yudao.module.tickets.service.DlRepairTitemService;
 import cn.iocoder.yudao.module.tickets.vo.DlRepairTitemRespVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 针对表【dl_repair_titem(维修工单子表)】的数据库操作Service实现
  *
@@ -30,6 +33,21 @@ public class DlRepairTitemServiceImpl extends ServiceImpl<DlRepairTitemMapper, D
     public IPage<DlRepairTitemRespVO> getTItemPage(DlRepairTitemRespVO repairTitemRespVO, Page<DlRepairTitemRespVO> page){
         return baseMapper.getTItemPage(repairTitemRespVO, page);
     }
+
+    /**
+     * 获取当前操作人操作的工单中的项目
+     *
+     * @param ticketId 工单ID
+     * @author 小李
+     * @date 15:01 2024/10/18
+     **/
+    @Override
+    public List<DlRepairTitem> getProjectList(String ticketId){
+        return baseMapper.selectList(new LambdaQueryWrapper<DlRepairTitem>().and(item -> {
+            item.eq(DlRepairTitem::getItemType, "01")
+                    .eq(DlRepairTitem::getTicketId, ticketId);
+        }));
+    }
 }
 
 

dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java

@@ -25,4 +25,13 @@ public class DlRepairTicketsRespVO extends DlRepairTickets {
 
     /** 预约记录ID */
     private String bookingId;
+
+    /** 图片路径 */
+    private String image;
+
+    /** 子表单条数据 */
+    private DlRepairTitem item;
+
+    /** 记录类型 */
+    private String recordType;
 }