From e966326dbc1c129d9f9fb8b6a4f0f3e8ac306b3e Mon Sep 17 00:00:00 2001 From: Chujinwang <17638147107@163.com> Date: Mon, 22 Jul 2024 09:26:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/terminal/query/TerminalQuery.java | 2 ++ .../com/chushang/inspection/work/po/WrkInfo.java | 6 +----- .../terminal/controller/TerminalController.java | 3 +-- .../inspection/terminal/service/TerminalService.java | 5 +++++ .../terminal/service/impl/TerminalServiceImpl.java | 12 ++++++++++++ .../work/controller/WrkInfoController.java | 2 +- .../inspection/work/service/WrkInfoService.java | 2 +- .../work/service/impl/WrkInfoServiceImpl.java | 2 +- 8 files changed, 24 insertions(+), 10 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java index fbd73fd..9eb5dd3 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java @@ -128,4 +128,6 @@ public class TerminalQuery extends CommonParam { private Long terminalId; + + private Long storeId; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfo.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfo.java index 900e201..0dee1d9 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfo.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfo.java @@ -97,11 +97,7 @@ public class WrkInfo extends BaseEntity { */ @TableField(value = "work_source") private Integer workSource; - /** - * 第三方 工单编号 - */ - @TableField(value = "order_no") - private String orderNo; + /** * 业务员处理时间 diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java index 2c6ed82..d5cead2 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/controller/TerminalController.java @@ -81,8 +81,7 @@ public class TerminalController { @PostMapping("/update") @RequiresPermissions("ins:terminal:update") public AjaxResult update(@RequestBody @Validated TerminalQuery query) { - Terminal terminal = BeanUtil.copyProperties(query, Terminal.class); - return AjaxResult.success(terminalService.updateById(terminal)); + return AjaxResult.success(terminalService.updateTerminalAndStore(query)); } @DeleteMapping(value = "/del/{terminalId}") diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java index 09feaf7..9b94218 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/TerminalService.java @@ -56,5 +56,10 @@ public interface TerminalService extends IService{ JSONObject save(Store store, WrkIcbcJsReceive dto); + + int updateTerminalAndStore(TerminalQuery query); + + + JSONObject getTerMap(Long terminalId); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java index f4c63c3..9d7fa0e 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java @@ -26,6 +26,7 @@ import com.chushang.inspection.terminal.service.TerminalInsService; import com.chushang.inspection.terminal.service.TerminalService; import com.chushang.inspection.terminal.vo.StoreTerminalVO; import com.chushang.inspection.terminal.vo.TerminalVO; +import com.chushang.inspection.utils.BeanCopyUtils; import com.chushang.inspection.utils.TaskConfigUtils; import com.chushang.inspection.work.dto.DispatchDTO; import com.chushang.inspection.work.dto.WrkIcbcJsReceive; @@ -35,6 +36,7 @@ import com.chushang.system.feign.RemoteDeptService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.inspection.terminal.mapper.TerminalMapper; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @@ -146,4 +148,14 @@ public class TerminalServiceImpl extends ServiceImpl i return JSONObject.of("terminal", getById(terminalId), "terminalIns", terminalInsService.getById(terminalId)); } + @Override + @Transactional(rollbackFor = Exception.class) + public int updateTerminalAndStore(TerminalQuery query) { + Terminal terminal = BeanCopyUtils.copy(query, Terminal.class); + updateById(terminal); + Store store = BeanCopyUtils.copy(query, Store.class); + storeService.updateById(store); + return 1; + } + } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java index d95ac99..dfee413 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java @@ -254,7 +254,7 @@ public class WrkInfoController { @PostMapping("/withdraw") @RequiresPermissions("wrk:withdraw") @SysLog(value = "工单撤回", businessType = BusinessType.DELETE) - public AjaxResult withdraw(@RequestBody @Validated Delete delete) { + public AjaxResult withdraw(@RequestBody @Validated Delete delete) throws Exception{ wrkInfoService.withdraw(delete.getIds()); return AjaxResult.success(); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java index eb313c4..8e0e9ad 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/WrkInfoService.java @@ -38,7 +38,7 @@ public interface WrkInfoService extends IService { void submit(WrkInfoDTO info); - void withdraw(List ids); + void withdraw(List ids) throws Exception; void audit(AuditDTO audit); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java index bfa55f4..9cf8a4d 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java @@ -357,7 +357,7 @@ public class WrkInfoServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) - public void withdraw(List ids) { + public void withdraw(List ids) throws Exception{ List status = ListUtil.toList(1, 2, 5, 6, 7); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(WrkInfo::getWrkId, ids);