From 6c2a01f6bc53b27805dbd514ac7ea83b58af2323 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Tue, 10 Sep 2024 20:34:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java
index 35e90ca..64837de 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/client/CtUnitClientController.java
@@ -1,11 +1,16 @@
package cn.huge.module.ctuser.controller.client;
+import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.module.ctuser.domain.po.CtUnit;
+import cn.huge.module.ctuser.domain.po.CtUser;
import cn.huge.module.ctuser.service.CtUnitService;
import cn.huge.module.ctuser.service.CtUserService;
+import cn.huge.module.cust.dto.CtUnitDTO;
+import cn.huge.module.cust.dto.CtUserDTO;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -42,10 +47,32 @@
@PostMapping("/saveCtUnitList")
public Object saveCtUnitList(@RequestBody List<CtUnit> targetCtUnitList) {
try {
- service.saveBatch(targetCtUnitList);
+ service.saveBatch(targetCtUnitList,1000);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
}
}
+
+ /**
+ * 根据id查询组织信息
+ * @url {ctx}/api/client/ctUnit/getUnitById
+ * @param unitId 组织编号
+ * @return Object
+ */
+ @GetMapping("/getUnitById")
+ public Object getUnitById(@RequestParam(value = "unitId") String unitId) {
+ try {
+ CtUnit ctUnit = service.getById(unitId);
+ if (ObjectUtils.isNotEmpty(ctUnit)){
+ CtUnitDTO ctUnitDTO = new CtUnitDTO();
+ BeanUtils.copyProperties(ctUnit, ctUnitDTO);
+ return ReturnSucUtils.getRepInfo(ctUnitDTO);
+ }else {
+ return ReturnFailUtils.getRepInfo("查询组织不存在！");
+ }
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
}
--
Gitblit v1.8.0