From 0271719bce3d6be197eab2e143e478dbf010b8a8 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 04 Sep 2024 10:53:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java |   70 ++++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 1 deletions(-)

diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java
index eb1e175..654da13 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java
@@ -1,19 +1,38 @@
 package cn.huge.module.ctuser.controller.web;
 
+import cn.huge.base.common.dto.SelectTermDTO;
+import cn.huge.base.common.utils.ObjectUtils;
 import cn.huge.base.common.utils.ReturnFailUtils;
 import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.base.common.utils.SelectTermUtils;
 import cn.huge.base.config.CurrentUser;
+import cn.huge.module.ctrole.domain.po.CtRole;
 import cn.huge.module.ctrole.service.CtRoleService;
+import cn.huge.module.ctuser.domain.po.*;
 import cn.huge.module.ctuser.dto.CtUserSaveDTO;
 import cn.huge.module.ctuser.service.*;
+import cn.huge.module.cust.constant.RoleBaseEnum;
+import cn.huge.module.cust.constant.UserBaseConsts;
+import cn.huge.module.cust.dto.CtUserDTO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @title: 客户用户表接口api-web端
@@ -228,7 +247,7 @@
         if (StringUtils.isNotBlank(dispStatus)){
             terms.put("dispStatus", dispStatus);
         }
-        // 删除状态，0：已删除（默认），1：未删除
+        // 删除状态，0：未删除，1：已删除
         String deleteStatus = request.getParameter("deleteStatus");
         if (StringUtils.isNotBlank(deleteStatus)){
             terms.put("deleteStatus", deleteStatus);
@@ -252,6 +271,17 @@
             terms.put("updateStart", updateStart);
             terms.put("updateEnd", updateEnd);
         }
+        // 平台账号
+        String acc = request.getParameter("acc");
+        if (StringUtils.isNotBlank(acc)){
+            terms.put("acc", acc);
+        }
+        // 角色编码
+        String roleCode = request.getParameter("roleCode");
+        if (StringUtils.isNotBlank(roleCode)){
+            terms.put("roleCode", roleCode);
+        }
+
         return terms;
     }
 
@@ -308,4 +338,42 @@
             return ReturnFailUtils.getRepInfo();
         }
     }
+
+    /**
+     * 更新人员状态信息
+     * @url {ctx}/api/web/ctUser/updateCtUserStatus
+     * @param id 编号 status ：用户状态，1：在职（默认），2：停用，99：离职
+     * @return Object
+     * @throws Exception
+     */
+    @GetMapping("/updateCtUserStatus")
+    public Object updateCtUserStatus(@RequestParam(value = "status") String status, @RequestParam(value = "id") String id) {
+        try {
+            // 修改状态
+            UpdateWrapper<CtUser> ctUserUpdateWrapper = new UpdateWrapper();
+            ctUserUpdateWrapper.eq("id", id);
+            ctUserUpdateWrapper.set("status", status).set("update_time", new Date());
+            service.update(ctUserUpdateWrapper);
+            return ReturnSucUtils.getRepInfo();
+        } catch (Exception e) {
+            return ReturnFailUtils.getRepInfo();
+        }
+    }
+
+    /**
+     * 根据主键单个/批量删除
+     * @url {ctx}/api/v1/ctUser/removeByIds
+     * @return Object
+     * @throws Exception
+     */
+    @PostMapping("/removeByIds")
+    public Object removeByIds(@RequestBody List<String> data) {
+        try {
+            service.removeListId(data);
+            return ReturnSucUtils.getRepInfo();
+        } catch (Exception e) {
+            log.error("Controller接口[CtUserController.removeByIds]请求异常："+e, e);
+            return ReturnFailUtils.getRepInfo();
+        }
+    }
 }

--
Gitblit v1.8.0