dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xiaofajia 2024-11-04 14:54:51 +08:00
commit 4436bb236f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,8 +200,10 @@ public class DlRepairTicketsController {
**/ **/
@GetMapping("/take") @GetMapping("/take")
@Operation(summary = "接单") @Operation(summary = "接单")
public CommonResult<?> updateTake(@RequestParam("id") String id) { public CommonResult<?> updateTake(@RequestParam("id") String id,
dlRepairTicketsService.updateTake(id); @RequestParam(value="image",required = false) String image,
@RequestParam(value="remark",required = false) String remark) {
dlRepairTicketsService.updateTake(id,image);
return CommonResult.ok(); return CommonResult.ok();
} }

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

@ -108,7 +108,7 @@ public interface DlRepairTicketsService extends IService<DlRepairTickets> {
* @date 11:48 2024/10/14 * @date 11:48 2024/10/14
* @param id 工单ID * @param id 工单ID
**/ **/
void updateTake(String id); void updateTake(String id,String image);
/** /**
* 指派员工，通知施工 * 指派员工，通知施工

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

@ -7,8 +7,6 @@ import cn.iocoder.yudao.common.*;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils; import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
import cn.iocoder.yudao.module.base.entity.RepairWorker; import cn.iocoder.yudao.module.base.entity.RepairWorker;
import cn.iocoder.yudao.module.base.service.RepairRecordsService; import cn.iocoder.yudao.module.base.service.RepairRecordsService;
import cn.iocoder.yudao.module.base.service.RepairWorkerService; import cn.iocoder.yudao.module.base.service.RepairWorkerService;
@ -924,7 +922,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
* @date 11:48 2024/10/14 * @date 11:48 2024/10/14
**/ **/
@Override @Override
public void updateTake(String id) { public void updateTake(String id,String image) {
// 改变时看看是否已经被接了 // 改变时看看是否已经被接了
int update = baseMapper.update(new LambdaUpdateWrapper<DlRepairTickets>() int update = baseMapper.update(new LambdaUpdateWrapper<DlRepairTickets>()
.set(DlRepairTickets::getTicketsWorkStatus, TicketsWorkStatusEnum.RECEIVED.getCode()) .set(DlRepairTickets::getTicketsWorkStatus, TicketsWorkStatusEnum.RECEIVED.getCode())
@ -936,7 +934,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
throw exception0(500, "工单已被其他人接单了"); throw exception0(500, "工单已被其他人接单了");
} }
//最后记录操作日志--接单 //最后记录操作日志--接单
repairRecordsService.saveRepairRecord(id, null, RecordTypeEnum.jd.getCode(), "接单", null); repairRecordsService.saveRepairRecord(id, null, RecordTypeEnum.jd.getCode(), "接单", image);
} }
/** /**