rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 一些调整

This commit is contained in:
曹鹏飞 2025-02-13 14:51:17 +08:00
parent 7d43b5891f
commit 1e30e82316
4 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java
View File

@ -269,7 +269,6 @@ public class TiketController extends ControllerBase {
/** /**
* 撤销工单 * 撤销工单
*
* @param id 工单编号 * @param id 工单编号
**/ **/
@GetMapping("revokedTicket") @GetMapping("revokedTicket")
@ -278,6 +277,17 @@ public class TiketController extends ControllerBase {
return ApiResult.success(); return ApiResult.success();
} }
/**
* 重启工单
*
* @param id 工单编号
**/
@GetMapping
public ApiResult<Void> reopenTicket(@Valid @RequestParam @NotNull Integer id) {
ticketService.reopen(id);
return ApiResult.success();
}
/** /**
* 获取工单评价数据 * 获取工单评价数据
**/ **/

3
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AreaVO.java
View File

@ -4,6 +4,7 @@ import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Data @Data
@ -35,5 +36,5 @@ public class AreaVO {
private LocalDateTime updateTime; private LocalDateTime updateTime;
//下级区域 //下级区域
private List<AreaVO> children; private List<AreaVO> children = new ArrayList<>();
} }

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java
View File

@ -41,4 +41,6 @@ public interface ITicketService extends IService<Ticket> {
List<Ticket> getNonemergency(int days); List<Ticket> getNonemergency(int days);
void revoked(Integer id); void revoked(Integer id);
void reopen(Integer id);
} }

20
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
View File

@ -138,7 +138,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
public List<Ticket> getEmergencys(int days) { public List<Ticket> getEmergencys(int days) {
return lambdaQuery() return lambdaQuery()
.eq(Ticket::getState, TicketState.Processing.getState()) .eq(Ticket::getState, TicketState.Processing.getState())
.eq(Ticket::getUrgency, TicketUrgency.URGENCY.getState().byteValue()) .eq(Ticket::getUrgency, TicketUrgency.URGENCY.getState())
.ge(Ticket::getCreateTime, LocalDateTime.now().minusDays(days)) .ge(Ticket::getCreateTime, LocalDateTime.now().minusDays(days))
.list(); .list();
} }
@ -147,7 +147,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
public List<Ticket> getGenerals(int days) { public List<Ticket> getGenerals(int days) {
return lambdaQuery() return lambdaQuery()
.eq(Ticket::getState, TicketState.Processing.getState()) .eq(Ticket::getState, TicketState.Processing.getState())
.eq(Ticket::getUrgency, TicketUrgency.GENERAL.getState().byteValue()) .eq(Ticket::getUrgency, TicketUrgency.GENERAL.getState())
.ge(Ticket::getCreateTime, LocalDateTime.now().minusDays(days)) .ge(Ticket::getCreateTime, LocalDateTime.now().minusDays(days))
.list(); .list();
} }
@ -156,7 +156,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
public List<Ticket> getNonemergency(int days) { public List<Ticket> getNonemergency(int days) {
return lambdaQuery() return lambdaQuery()
.eq(Ticket::getState, TicketState.Processing.getState()) .eq(Ticket::getState, TicketState.Processing.getState())
.eq(Ticket::getUrgency, TicketUrgency.NONEMERGENCY.getState().byteValue()) .eq(Ticket::getUrgency, TicketUrgency.NONEMERGENCY.getState())
.ge(Ticket::getCreateTime, LocalDateTime.now().minusDays(days)) .ge(Ticket::getCreateTime, LocalDateTime.now().minusDays(days))
.list(); .list();
} }
@ -167,6 +167,20 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
.set(Ticket::getState, TicketState.Revoked.getState()) .set(Ticket::getState, TicketState.Revoked.getState())
.set(Ticket::getUpdateTime, LocalDateTime.now()) .set(Ticket::getUpdateTime, LocalDateTime.now())
.eq(Ticket::getId, id) .eq(Ticket::getId, id)
.and(c -> c
.eq(Ticket::getState, TicketState.PendingProcessing.getState())
.or()
.eq(Ticket::getState, TicketState.Processing.getState()))
.update();
}
@Override
public void reopen(Integer id) {
lambdaUpdate()
.set(Ticket::getState, TicketState.Processing.getState())
.set(Ticket::getUpdateTime, LocalDateTime.now())
.eq(Ticket::getId, id)
.eq(Ticket::getState, TicketState.ProcessingCompleted.getState())
.update(); .update();
} }
} }