操作备注

src/main/java/com/fdkankan/sale/service/IRepairLogService.java

@@ -16,7 +16,9 @@ import java.util.List;
  */
 public interface IRepairLogService extends IService<RepairLog> {
 
-    RepairLog saveBySysUser(Long sysUserId, String repairId,Integer repairStatus,Integer oldRepairStatus,String remark);
+    RepairLog saveBySysUser(Long sysUserId, String repairId,Integer repairStatus,Integer oldRepairStatus,String info);
+
+    RepairLog saveBySysUser(Long sysUserId, String repairId,Integer repairStatus,Integer oldRepairStatus,String info,String remark);
 
     RepairLog saveBySysUser(Long sysUserId, String repairId,Integer repairStatus,Integer oldRepairStatus,String remark,Integer testId);
 

src/main/java/com/fdkankan/sale/service/impl/RepairCustomerService.java

@@ -89,12 +89,12 @@ public class RepairCustomerService {
 
             if(robAmount.compareTo(BigDecimal.ZERO) <=0  || StatusUtil.getWarranty(repair.getWarrantyType())){
                 if(partVoList.size() >0){
-                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),repair.getStatus(),"取消维修");
+                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED_RECOVERED.status(),repair.getStatus(),"取消维修",param.getRemark());
                 }else {
-                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"取消维修");
+                    repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"取消维修",param.getRemark());
                 }
             } else {
-                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED.status(),repair.getStatus(),"取消维修");
+                repairLogService.saveBySysUser(param.getUserId(),repair.getRepairId(),RepairStatusEnum.TO_BE_CANCELED.status(),repair.getStatus(),"取消维修",param.getRemark());
             }
 
         }

src/main/java/com/fdkankan/sale/service/impl/RepairLogServiceImpl.java

@@ -36,6 +36,7 @@ public class RepairLogServiceImpl extends ServiceImpl<IRepairLogMapper, RepairLo
      *      * status 0待接单，10待检测，20待报价，30待确认，40已取消，50待备料，60维修中，70待测试，
      *      *        80待支付（已完结），90待回收，100待发货，110已发货
      */
+
     @Override
     public RepairLog saveBySysUser(Long sysUserId, String repairId,Integer repairStatus,Integer oldRepairStatus,String info) {
         RepairLog repairLog = new RepairLog();
@@ -51,6 +52,21 @@ public class RepairLogServiceImpl extends ServiceImpl<IRepairLogMapper, RepairLo
     }
 
     @Override
+    public RepairLog saveBySysUser(Long sysUserId, String repairId,Integer repairStatus,Integer oldRepairStatus,String info,String remark) {
+        RepairLog repairLog = new RepairLog();
+        repairLog.setRepairId(repairId);
+        repairLog.setRepairStatus(repairStatus);
+        repairLog.setSysUserId(sysUserId);
+        repairLog.setInfo(info);
+        repairLog.setRemark(remark);
+        repairLog.setOldRepairStatus(oldRepairStatus);
+        this.save(repairLog);
+        repairService.updateRepairStatus(repairId,repairStatus);
+        dingService.sendDingMsg(repairLog);
+        return repairLog;
+    }
+
+    @Override
     public RepairLog saveBySysUser(Long sysUserId, String repairId, Integer repairStatus,Integer oldRepairStatus, String info, Integer testId) {
         RepairLog repairLog = new RepairLog();
         repairLog.setRepairId(repairId);

src/main/java/com/fdkankan/sale/service/impl/RepairSupplyService.java

@@ -164,6 +164,6 @@ public class RepairSupplyService {
             partService.recovery(partVo.getPartId(),partVo.getPartCount(),userId,repair.getRepairId(),repair.getStatus());
         }
 
-        repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"备件回收");
+        repairLogService.saveBySysUser(userId,param.getRepairId(),RepairStatusEnum.TO_BE_SHIPPED.status(),repair.getStatus(),"备件回收",param.getRemark());
     }
 }