suojin
/
lab-ops-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: suojin:29db6bcf635ed6440cd320c24baafc9839232e72
Branches Tags
suojin:master
..
compare: suojin:549c49dc3f0110646e9c8a14895ca785cb5cbf1f
Branches Tags
suojin:master

No commits in common. '29db6bcf635ed6440cd320c24baafc9839232e72' and '549c49dc3f0110646e9c8a14895ca785cb5cbf1f' have entirely different histories.
29db6bcf63 ... 549c49dc3f

4 changed files with 367 additions and 401 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 36
      src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
  2. 51
      src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java
  3. 6
      src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java
  4. 15
      src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java

36
src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
Unescape View File

@ -21,10 +21,11 @@ import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods;
import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlan; import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlan;
import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask; import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask;
import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail; import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail;
import org.springblade.modules.business.service.*; import org.springblade.modules.business.service.IMaintenanceApplyGoodsService;
import org.springblade.modules.business.service.IMaintenancePlanService;
import org.springblade.modules.business.service.IMaintenanceTaskDetailService;
import org.springblade.modules.business.service.IMaintenanceTaskService;
import org.springblade.modules.business.sms.SmsService; import org.springblade.modules.business.sms.SmsService;
import org.springblade.modules.system.pojo.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -50,8 +51,6 @@ public class MaintenanceController extends BladeController {
private final IMaintenanceTaskDetailService taskDetailService; private final IMaintenanceTaskDetailService taskDetailService;
private final IMaintenanceApplyGoodsService maintenanceApplyGoodsService; private final IMaintenanceApplyGoodsService maintenanceApplyGoodsService;
private final SmsService smsService; private final SmsService smsService;
private final IMessageService messageService;
private final IUserService userService;
/*---------- 维修计划开始 ----------*/ /*---------- 维修计划开始 ----------*/
@ -138,7 +137,7 @@ public class MaintenanceController extends BladeController {
taskOld.setServicemanName(task.getServicemanName()); taskOld.setServicemanName(task.getServicemanName());
taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SUPERVISOR_CONFIRM.getValue()); taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SUPERVISOR_CONFIRM.getValue());
taskService.updateById(taskOld); taskService.updateById(taskOld);
smsService.sendSms("15053473693", "张迪"); smsService.sendSms("17852327323", "靳娜");
return R.success(); return R.success();
} }
@ -188,10 +187,7 @@ public class MaintenanceController extends BladeController {
taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SERVICEMAN_SUBMIT.getValue()); taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SERVICEMAN_SUBMIT.getValue());
taskOld.setFinishTime(DateUtil.now()); taskOld.setFinishTime(DateUtil.now());
taskService.updateById(taskOld); taskService.updateById(taskOld);
List<User> deptPersonList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, task.getDeptId()));
for (User deptPerson : deptPersonList) {
messageService.saveMessage(task.getTaskCode(), "维修已完成，请确认", deptPerson.getId(), 1);
}
return R.success(); return R.success();
} }
@ -201,10 +197,7 @@ public class MaintenanceController extends BladeController {
MaintenanceTask taskOld = taskService.getById(task.getId()); MaintenanceTask taskOld = taskService.getById(task.getId());
taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_CUSTOMER_CONFIRM.getValue()); taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_CUSTOMER_CONFIRM.getValue());
taskService.updateById(taskOld); taskService.updateById(taskOld);
//发送消息
String role = "1839536982874193922";
User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
messageService.saveMessage(task.getTaskCode(), "客户已经确认巡检任务完成", user.getId(), 1);
return R.success(); return R.success();
} }
@ -284,9 +277,6 @@ public class MaintenanceController extends BladeController {
MaintenanceTask taskOld = taskService.getById(task.getId()); MaintenanceTask taskOld = taskService.getById(task.getId());
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_SUBMIT.getValue()); taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_SUBMIT.getValue());
taskService.updateById(taskOld); taskService.updateById(taskOld);
String role = "1839537055389515777";
User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
messageService.saveMessage(task.getTaskCode(), "维修方案已提交，请进行审核", user.getId(), 1);
return R.success(); return R.success();
} }
@ -296,10 +286,7 @@ public class MaintenanceController extends BladeController {
MaintenanceTask taskOld = taskService.getById(task.getId()); MaintenanceTask taskOld = taskService.getById(task.getId());
taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SUPERVISOR_CONFIRM.getValue()); taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SUPERVISOR_CONFIRM.getValue());
taskService.updateById(taskOld); taskService.updateById(taskOld);
List<User> userList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, task.getDeptId()));
for (User user : userList) {
messageService.saveMessage(task.getTaskCode(), "维修方案已提交，请确认", user.getId(), 1);
}
return R.success(); return R.success();
} }
@ -314,7 +301,7 @@ public class MaintenanceController extends BladeController {
taskOld.setApproveRemark(task.getApproveRemark()); taskOld.setApproveRemark(task.getApproveRemark());
taskOld.setRepairStatus(MaintenanceStatusEnum.SUPERVISOR_CONFIRM_REFUSE.getValue()); taskOld.setRepairStatus(MaintenanceStatusEnum.SUPERVISOR_CONFIRM_REFUSE.getValue());
taskService.updateById(taskOld); taskService.updateById(taskOld);
messageService.saveMessage(task.getTaskCode(), "维修方案已被驳回，请重新提交维修方案", task.getServicemanId(), 1);
return R.success(); return R.success();
} }
@ -351,10 +338,7 @@ public class MaintenanceController extends BladeController {
taskOld.setApproveRemark(task.getApproveRemark()); taskOld.setApproveRemark(task.getApproveRemark());
taskOld.setRepairStatus(MaintenanceStatusEnum.CUSTOMER_CONFIRM_REFUSE.getValue()); taskOld.setRepairStatus(MaintenanceStatusEnum.CUSTOMER_CONFIRM_REFUSE.getValue());
taskService.updateById(taskOld); taskService.updateById(taskOld);
//发送消息
String role = "1847220301770326017";
User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
messageService.saveMessage(task.getTaskCode(), "维修方案已被客户驳回，请重新审批", user.getId(), 1);
return R.success(); return R.success();
} }

51
src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java
Unescape View File

@ -235,13 +235,10 @@ public class WorkOrderController extends BladeController {
workOrderOld.setCustomerOpinion(workOrder.getCustomerOpinion()); workOrderOld.setCustomerOpinion(workOrder.getCustomerOpinion());
workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_ALLOT.getValue()); workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_ALLOT.getValue());
workOrderService.updateById(workOrderOld); workOrderService.updateById(workOrderOld);
if (workOrder.getRepairType() == 1) { User repairPerson = userService.getById(workOrder.getRepairPerson());
messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的紧急维修单，请火速处理", workOrder.getRepairPerson(), 2); messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的维修单，请尽快处理", repairPerson.getId(), 2);
} else {
messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的维修单，请尽快处理", workOrder.getRepairPerson(), 2);
}
// todo 审核通过 // todo 审核通过
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_ORDER_ALLOT.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_ORDER_ALLOT.getName());
return R.success(""); return R.success("");
} }
@ -253,13 +250,13 @@ public class WorkOrderController extends BladeController {
public R serviceReceive(@RequestBody WorkOrder workOrder) { public R serviceReceive(@RequestBody WorkOrder workOrder) {
WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); WorkOrder workOrderOld = workOrderService.getById(workOrder.getId());
workOrderOld.setReceiveOrderTime(DateUtil.now()); workOrderOld.setReceiveOrderTime(DateUtil.now());
if (workOrderOld.getRepairType().equals(1)) { if(workOrderOld.getRepairType().equals(1)){
workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getValue()); workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getValue());
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName());
} else { }else{
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_ORDER_ACCEPT.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_ORDER_ACCEPT.getName());
workOrderOld.setStatus(WorkOrderStatusEnum.WX_ORDER_ACCEPT.getValue()); workOrderOld.setStatus(WorkOrderStatusEnum.WX_ORDER_ACCEPT.getValue());
} }
@ -285,7 +282,7 @@ public class WorkOrderController extends BladeController {
approvalService.save(approval); approvalService.save(approval);
// todo 审核拒绝 // todo 审核拒绝
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_ORDER_REFUSE.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_ORDER_REFUSE.getName());
return R.success(""); return R.success("");
} }
@ -320,7 +317,7 @@ public class WorkOrderController extends BladeController {
messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请确认", workOrder.getInformant(), 2); messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请确认", workOrder.getInformant(), 2);
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.ZG_REPAIR_PLAN_PASS.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.ZG_REPAIR_PLAN_PASS.getName());
return R.success(""); return R.success("");
} }
@ -356,7 +353,7 @@ public class WorkOrderController extends BladeController {
messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已通过，请尽快维修", workOrder.getRepairPerson(), 2); messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已通过，请尽快维修", workOrder.getRepairPerson(), 2);
// todo 审核通过 // todo 审核通过
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_PLAN_PASS.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_REPAIR_PLAN_PASS.getName());
return R.success(""); return R.success("");
} }
@ -383,7 +380,7 @@ public class WorkOrderController extends BladeController {
messageService.saveMessage(workOrder.getRequirementCode(), "审批方案已驳回，请重新修改", user.getId(), 2); messageService.saveMessage(workOrder.getRequirementCode(), "审批方案已驳回，请重新修改", user.getId(), 2);
// todo 审核通过 // todo 审核通过
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_PLAN_REFUSE.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_REPAIR_PLAN_REFUSE.getName());
return R.success(""); return R.success("");
} }
@ -396,14 +393,14 @@ public class WorkOrderController extends BladeController {
public R servicemanRepairSubmit(@RequestBody WorkOrder workOrder) { public R servicemanRepairSubmit(@RequestBody WorkOrder workOrder) {
WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); WorkOrder workOrderOld = workOrderService.getById(workOrder.getId());
workOrderOld.setCloseReason(workOrder.getCloseReason()); workOrderOld.setCloseReason(workOrder.getCloseReason());
if (workOrderOld.getRepairType().equals(1)) { if(workOrderOld.getRepairType().equals(1)){
workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getValue()); workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getValue());
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getName());
} else { }else{
workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue()); workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue());
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_REPAIR_FINISH.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_REPAIR_FINISH.getName());
} }
workOrderService.updateById(workOrderOld); workOrderService.updateById(workOrderOld);
messageService.saveMessage(workOrder.getRequirementCode(), "维修已完成，请确认是否解决", workOrder.getInformant(), 2); messageService.saveMessage(workOrder.getRequirementCode(), "维修已完成，请确认是否解决", workOrder.getInformant(), 2);
@ -441,11 +438,10 @@ public class WorkOrderController extends BladeController {
WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, DateUtil.now(), workOrder.getApproveRemark()); WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, DateUtil.now(), workOrder.getApproveRemark());
approvalService.save(approval); approvalService.save(approval);
//消息发送
messageService.saveMessage(workOrder.getRequirementCode(), "客户认为维修未完成，请尽快再次解决", workOrder.getRepairPerson(), 2); messageService.saveMessage(workOrder.getRequirementCode(), "客户认为维修未完成，请尽快再次解决", workOrder.getRepairPerson(), 2);
// todo 审核通过 // todo 审核通过
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), "维修完成，客户审核未通过"); LogUtil.saveLog(workOrderOld.getRequirementCode(),"维修完成，客户审核未通过");
return R.success(""); return R.success("");
} }
@ -462,7 +458,7 @@ public class WorkOrderController extends BladeController {
workOrderService.updateById(workOrderOld); workOrderService.updateById(workOrderOld);
User customer = userService.getById(workOrder.getInformant()); User customer = userService.getById(workOrder.getInformant());
messageService.saveMessage(workOrder.getRequirementCode(), "请注意维修单评价", customer.getId(), 2); messageService.saveMessage(workOrder.getRequirementCode(), "请注意维修单评价", customer.getId(), 2);
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_REPAIR_FINISH.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_REPAIR_FINISH.getName());
return R.success(""); return R.success("");
} }
@ -477,7 +473,7 @@ public class WorkOrderController extends BladeController {
workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_CLOSE.getValue()); workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_CLOSE.getValue());
workOrderService.updateById(workOrderOld); workOrderService.updateById(workOrderOld);
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_ORDER_CLOSE.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_ORDER_CLOSE.getName());
return R.success(""); return R.success("");
} }
@ -562,7 +558,7 @@ public class WorkOrderController extends BladeController {
*/ */
@GetMapping("/find-list-by-device-id") @GetMapping("/find-list-by-device-id")
public R<List<WorkOrder>> findListByDeviceId(Long deviceId) { public R<List<WorkOrder>> findListByDeviceId(Long deviceId) {
List<WorkOrder> list = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getDeviceId, deviceId).eq(BaseEntity::getIsDeleted, 0)); List<WorkOrder> list = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getDeviceId,deviceId).eq(BaseEntity::getIsDeleted,0));
return R.data(list); return R.data(list);
} }
@ -586,10 +582,8 @@ public class WorkOrderController extends BladeController {
// todo 审核通过 // todo 审核通过
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_CONFIRM.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_REPAIR_CONFIRM.getName());
//消息发送
messageService.saveMessage(workOrder.getRequirementCode(), "客户审核维修成果已通过，请尽快补填维修方案和物料相关", workOrder.getRepairPerson(), 2);
return R.success(""); return R.success("");
} }
@ -613,10 +607,7 @@ public class WorkOrderController extends BladeController {
// todo 审核通过 // todo 审核通过
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName());
//消息发送
messageService.saveMessage(workOrder.getRequirementCode(), "客户对维修成功不满意，请尽快再次维修", workOrder.getRepairPerson(), 2);
return R.success(""); return R.success("");
} }

6
src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java
Unescape View File

@ -233,13 +233,9 @@ public class WorkOrder extends BaseEntity {
*/ */
private Double discountPrice; private Double discountPrice;
/**
* 维修类型
*/
private Integer repairType;
/** /**
* 维修类型 1紧急维修 2故障维修 3改造需求 * 维修类型 1紧急维修 2故障维修 3改造需求
*/ */
private Integer repairType;
} }

15
src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
Unescape View File

@ -151,7 +151,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
// 保存附件 // 保存附件
saveFiles(workOrder.getVideoAttaches(), workOrder.getPicAttaches(), workOrder.getId()); saveFiles(workOrder.getVideoAttaches(), workOrder.getPicAttaches(), workOrder.getId());
//保存日志 //保存日志
LogUtil.saveLog(workOrder.getRequirementCode(), user.getName() + "提交,待客服处理。"); LogUtil.saveLog(workOrder.getRequirementCode(),user.getName()+"提交,待客服处理。");
} }
return save; return save;
} }
@ -265,7 +265,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
public void repairPlanSubmit(WorkOrder workOrder) { public void repairPlanSubmit(WorkOrder workOrder) {
// 修改工单状态 // 修改工单状态
WorkOrder workOrderOld = this.getById(workOrder.getId()); WorkOrder workOrderOld = this.getById(workOrder.getId());
if (workOrderOld.getRepairType().equals(1)) { if(workOrderOld.getRepairType().equals(1)){
workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_PLAN_SUBMIT_AFTER.getValue()); workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_PLAN_SUBMIT_AFTER.getValue());
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_REPAIR_PLAN_SUBMIT_AFTER.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_REPAIR_PLAN_SUBMIT_AFTER.getName());
@ -279,12 +279,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
//发送消息给主管 //发送消息给主管
String role = "1839537055389515777"; String role = "1839537055389515777";
User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role)); User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
if (workOrder.getRepairType() == 1) {
messageService.saveMessage(workOrder.getRequirementCode(), "维修方案及物料相关已补交，请评价", user.getId(), 2);
} else {
messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请审批", user.getId(), 2); messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请审批", user.getId(), 2);
} }
}
this.updateById(workOrderOld); this.updateById(workOrderOld);
} }
@ -309,7 +305,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
messageService.saveMessage(workOrder.getRequirementCode(), "维修方案审批未通过，请重新提交方案", workOrder.getRepairPerson(), 2); messageService.saveMessage(workOrder.getRequirementCode(), "维修方案审批未通过，请重新提交方案", workOrder.getRepairPerson(), 2);
//保存日志 //保存日志
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.ZG_REPAIR_PLAN_REFUSE.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.ZG_REPAIR_PLAN_REFUSE.getName());
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ -332,10 +328,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
// 若未产生费用，直接关闭工单 // 若未产生费用，直接关闭工单
if (workOrderOld.getDiscountPrice() == null || workOrderOld.getDiscountPrice() == 0) { if (workOrderOld.getDiscountPrice() == null || workOrderOld.getDiscountPrice() == 0) {
workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_CLOSE.getValue()); workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_CLOSE.getValue());
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_ORDER_CLOSE.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_ORDER_CLOSE.getName());
} else { } else {
workOrderOld.setStatus(WorkOrderStatusEnum.KH_EVALUATE_FINISH.getValue()); workOrderOld.setStatus(WorkOrderStatusEnum.KH_EVALUATE_FINISH.getValue());
LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_EVALUATE_FINISH.getName()); LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_EVALUATE_FINISH.getName());
} }
this.updateById(workOrderOld); this.updateById(workOrderOld);
@ -346,7 +342,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_WORKING, workOrder.getDeviceId()); deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_WORKING, workOrder.getDeviceId());
String role = "1839536982874193922"; String role = "1839536982874193922";
User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role)); User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
//消息发送
messageService.saveMessage(workOrder.getRequirementCode(), "已完成维修，请确认客户是否付款", user.getId(), 2); messageService.saveMessage(workOrder.getRequirementCode(), "已完成维修，请确认客户是否付款", user.getId(), 2);
} }

Write Preview
Loading…
Cancel
Save