dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java

@@ -64,13 +64,7 @@ public enum RecordTypeEnum {
     /**
      * 接单
      */
-    jd("jd","接单"),
+    jd("jd","接单");
-
-    /** 作废工单 */
-    ZFGG("zfgg", "作废工单"),
-
-    /** 删除工单 */
-    SCGG("scgg", "删除工单");
 
     /**
      * code

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

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.common.*;
 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
-import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.base.entity.RepairWorker;
 import cn.iocoder.yudao.module.base.service.RepairRecordsService;
@@ -382,27 +381,14 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
 
     /**
      * 维修工单表 作废
-     * 传对象是因为需要有作废备注
      *
      * @param repairTicketsReqVO 工单对象
      * @author 小李
      * @date 19:46 2024/9/22
      **/
     @Override
-    @DSTransactional
     public void setTicketsVoid(DlRepairTicketsReqVO repairTicketsReqVO) {
-        // 作废维修工单
+        baseMapper.updateById(repairTicketsReqVO);
-        DlRepairTickets tickets = new DlRepairTickets();
-        tickets.setId(repairTicketsReqVO.getId());
-        if (ObjectUtil.isNotEmpty(repairTicketsReqVO.getRemark())){
-            tickets.setRemark(repairTicketsReqVO.getRemark());
-        }
-        tickets.setTicketsStatus("03");
-        baseMapper.updateById(tickets);
-        // 删除订单
-        repairOrderInfoService.remove(new LambdaQueryWrapper<RepairOrderInfo>().eq(RepairOrderInfo::getGoodsId, repairTicketsReqVO.getId()));
-        // 记录日志
-        repairRecordsService.saveRepairRecord(repairTicketsReqVO.getId(), null, RecordTypeEnum.ZFGG.getCode(), repairTicketsReqVO.getRemark(), null);
     }
 
     /**
@@ -1558,8 +1544,6 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         baseMapper.deleteById(id);
         // 删除工单子表
         titemService.remove(new LambdaQueryWrapper<DlRepairTitem>().eq(DlRepairTitem::getTicketId, id));
-        // 记录操作日志
-        repairRecordsService.saveRepairRecord(id, null, RecordTypeEnum.SCGG.getCode(), null, null);
     }
 }