From 657c1dd4888d910afa0c79d3759ab7fb580d2f13 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Fri, 14 Feb 2025 10:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseManufacturerRetwareService.java       | 32 +++----------------
 .../BaseVehicleCertificateMapper.java         |  8 ++---
 .../BaseVehicleCertificateService.java        |  4 +++
 .../portal/api/sysuser/SysUserFeign.java      |  2 +-
 .../api/sysuser/SysUserFeignFallback.java     |  2 +-
 .../portal/biz/sysuser/SysUserMapper.java     |  2 +-
 .../portal/biz/sysuser/SysUserMapper.xml      |  5 +++
 .../anrui/portal/biz/sysuser/SysUserRest.java |  4 +--
 .../portal/biz/sysuser/SysUserService.java    |  4 +--
 .../terminal/api/oa/common/OaCommonFeign.java |  2 +-
 .../terminal/biz/oa/common/OaCommonRest.java  |  4 +--
 .../biz/oa/common/OaCommonService.java        |  4 +--
 12 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
index a384e3edf0..a9a6a439af 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
@@ -39,6 +39,7 @@ import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo;
 import com.yxt.anrui.base.biz.basemanufacturerretwareveh.BaseManufacturerRetwareVehService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
+import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
@@ -48,7 +49,6 @@ import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDetailsVo;
 import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
 import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo;
@@ -64,34 +64,17 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.*;
 
-/**
- * Project: anrui-base(厂家退库) <br/>
- * File: BaseManufacturerRetwareService.java <br/>
- * Class: com.yxt.anrui.base.biz.basemanufacturerretware.BaseManufacturerRetwareService <br/>
- * Description: 厂家退库表 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-07-05 17:02:32 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManufacturerRetwareMapper, BaseManufacturerRetware> {
 
-    @Autowired
-    private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
@@ -104,23 +87,15 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
     private FinKingDeeFeign finKingDeeFeign;
     @Autowired
     private BasePurchaseSystemService basePurchaseSystemService;
-
+    @Autowired
+    private BaseVehicleCertificateService baseVehicleCertificateService;
     @Autowired
     private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign;
-
     @Autowired
     private ScmApplyInboundVehQueryFeign scmApplyInboundVehQueryFeign;
-
     @Autowired
     private DocPdfComponent docPdfComponent;
 
-    private QueryWrapper<BaseManufacturerRetware> createQueryWrapper(BaseManufacturerRetwareQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BaseManufacturerRetware> qw = new QueryWrapper<>();
-        return qw;
-    }
-
     public PagerVo<BaseManufacturerRetwareVo> listPageVo(PagerQuery<BaseManufacturerRetwareQuery> pq) {
         BaseManufacturerRetwareQuery query = pq.getParams();
         QueryWrapper<BaseManufacturerRetware> qw = new QueryWrapper<>();
@@ -273,6 +248,7 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
             baseVehicle.setReturnDate(DateUtil.parseDate(DateUtil.today()));
             baseVehicleService.updateVeh(baseVehicle);
             baseManufacturerRetwareVehService.updateByVinNo(manApprovalType, refundMoney, vinNo, dto.getManDeduRemarks());
+            baseVehicleCertificateService.delByVehSid(baseVehicle.getSid());
         } else if (manApprovalType.equals("失败")) {
             baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
             baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java
index c3419f4704..2bd52fb0c9 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java
@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -115,4 +112,7 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
 
     @Update("update base_vehicle_certificate set certificateState = #{cerStateKey},certificateStateValue = #{cerState} where sid = #{sid}")
     void updateCertificateStateNew(@Param("cerStateKey") String cerStateKey, @Param("cerState") String cerState, @Param("sid") String sid);
+
+    @Delete("delete from base_vehicle_certificate where vehicleSid = #{vehSid}")
+    void delByVehSid(String vehSid);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
index 1df77f5ce2..f8371d42f6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
@@ -385,4 +385,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
     public void updateCertificateStateNew(String cerStateKey,String cerState, String sid) {
         baseMapper.updateCertificateStateNew(cerStateKey,cerState,sid);
     }
+
+    public void delByVehSid(String vehSid) {
+        baseMapper.delByVehSid(vehSid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
index 21f08f2218..6dd9fdc747 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java
@@ -241,7 +241,7 @@ public interface SysUserFeign {
 
     @ApiOperation(value = "获取本部门下人员")
     @GetMapping(value = "getAllPeo")
-    ResultBean<List<DeptUserVo>> getAllPeo(@RequestParam("deptSid") String deptSid);
+    ResultBean<List<DeptUserVo>> getAllPeo(@RequestParam("deptSid") String deptSid, @RequestParam(value = "name", required = false) String name);
 
     @ApiOperation(value = "根据用户sid获取用户id")
     @PostMapping(value = "selectIdBySid")
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
index e2f823e5f9..656bb0c76a 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java
@@ -222,7 +222,7 @@ public class SysUserFeignFallback implements SysUserFeign {
     }
 
     @Override
-    public ResultBean<List<DeptUserVo>> getAllPeo(String deptSid) {
+    public ResultBean<List<DeptUserVo>> getAllPeo(String deptSid, String name) {
         return null;
     }
 
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java
index 6009143b01..ef25853319 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java
@@ -206,5 +206,5 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     List<Map<String, String>> getUserByDeptSid(String deptSid);
 
-    List<DeptUserVo> getAllPeo(String deptSid);
+    List<DeptUserVo> getAllPeo(@Param("deptSid") String deptSid,@Param("name") String name);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
index 913fccbfb3..c21fe11ae9 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
@@ -480,5 +480,10 @@
                 #{deptSid},
                 '%'
             )
+        AND st.name LIKE CONCAT(
+                '%',
+                #{name},
+                '%'
+            )
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
index b9a1f3cbcd..abb8a6cdbc 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
@@ -665,8 +665,8 @@ public class SysUserRest implements SysUserFeign {
     }
 
     @Override
-    public ResultBean<List<DeptUserVo>> getAllPeo(String deptSid) {
-        return sysUserService.getAllPeo(deptSid);
+    public ResultBean<List<DeptUserVo>> getAllPeo(String deptSid, String name) {
+        return sysUserService.getAllPeo(deptSid, name);
     }
 
     @Override
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
index 2de9c42154..51702debb4 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
@@ -1718,9 +1718,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     }
 
 
-    public ResultBean<List<DeptUserVo>> getAllPeo(String deptSid) {
+    public ResultBean<List<DeptUserVo>> getAllPeo(String deptSid, String name) {
         ResultBean rb = ResultBean.fireFail();
-        List<DeptUserVo> allPeo = baseMapper.getAllPeo(deptSid);
+        List<DeptUserVo> allPeo = baseMapper.getAllPeo(deptSid, name);
         return rb.success().setData(allPeo);
     }
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/common/OaCommonFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/common/OaCommonFeign.java
index 39999957de..74aeb0ee68 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/common/OaCommonFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/oa/common/OaCommonFeign.java
@@ -32,5 +32,5 @@ public interface OaCommonFeign {
 
     @ApiOperation("查询部门人员")
     @GetMapping("/getAllPeoByDept/{deptSid}")
-    ResultBean<List<OaCommonDictVo>> getAllPeoByDept(@PathVariable("deptSid") String deptSid);
+    ResultBean<List<OaCommonDictVo>> getAllPeoByDept(@PathVariable("deptSid") String deptSid, @RequestParam(value = "name", required = false) String name);
 }
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonRest.java
index 59540bdc81..ff7aa47c97 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonRest.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonRest.java
@@ -32,7 +32,7 @@ public class OaCommonRest implements OaCommonFeign {
     }
 
     @Override
-    public ResultBean<List<OaCommonDictVo>> getAllPeoByDept(String deptSid) {
-        return oaCommonService.getAllPeoByDept(deptSid);
+    public ResultBean<List<OaCommonDictVo>> getAllPeoByDept(String deptSid, String name) {
+        return oaCommonService.getAllPeoByDept(deptSid, name);
     }
 }
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonService.java
index 1f75c230a6..fe496ca904 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/oa/common/OaCommonService.java
@@ -65,9 +65,9 @@ public class OaCommonService {
         return rb.success().setData(voList);
     }
 
-    public ResultBean<List<OaCommonDictVo>> getAllPeoByDept(String deptSid) {
+    public ResultBean<List<OaCommonDictVo>> getAllPeoByDept(String deptSid, String name) {
         ResultBean<List<OaCommonDictVo>> rb = ResultBean.fireFail();
-        ResultBean<List<DeptUserVo>> allPeo = sysUserFeign.getAllPeo(deptSid);
+        ResultBean<List<DeptUserVo>> allPeo = sysUserFeign.getAllPeo(deptSid, name);
         List<OaCommonDictVo> voList = Optional.ofNullable(allPeo.getData())
                 .orElse(Collections.emptyList())  // 如果为 null，则返回一个空列表
                 .stream()