From 1844a79bbfa90fe869d8e44f10a3ac41dfbb096a Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Wed, 26 Feb 2025 17:38:40 +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

---
 .../portal/biz/sysuser/SysUserMapper.xml      |  2 ++
 .../anrui/oa/api/AdPircarpulApplyRest.java    |  2 +-
 .../anrui/oa/api/AdSalecarpulApplyRest.java   |  4 +--
 .../oa/biz/adfeteapply/AdFeteApplyMapper.xml  |  2 +-
 .../biz/adfeteapply/AdFeteApplyService.java   |  2 +-
 .../oa/biz/adfetedetail/AdFeteDetailDto.java  |  4 +--
 .../biz/adfetedetail/AdFeteDetailMapper.xml   |  4 +--
 .../biz/adfetedetail/AdFeteDetailService.java |  2 ++
 .../oa/biz/adfetedetail/AdFeteDetailVo.java   |  4 +--
 .../biz/adfetedetail/AdFeteListDetailVo.java  |  3 ++-
 .../AdPircarpulApplyMapper.xml                |  3 ---
 .../AdPircarpulDetailService.java             |  6 +++++
 .../AdSalecarpulApplyDetailsVo.java           |  4 +--
 .../AdSalecarpulApplyMapper.java              |  3 +--
 .../AdSalecarpulApplyMapper.xml               | 26 +++++--------------
 .../AdSalecarpulApplyService.java             | 21 ++++++++++-----
 .../AdSenpircarpulApplyMapper.xml             |  4 +--
 17 files changed, 48 insertions(+), 48 deletions(-)

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 2f582d15a9..c0413d3deb 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
@@ -481,10 +481,12 @@
                 #{deptSid},
                 '%'
             )
+        <if test="name != null and name != ''">
         AND st.name LIKE CONCAT(
                 '%',
                 #{name},
                 '%'
             )
+        </if>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java
index 0e49cab1e7..a60fec072b 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPircarpulApplyRest.java
@@ -39,7 +39,7 @@ import javax.validation.Valid;
 
 @Api(tags = "临时私车公用申请")
 @RestController
-@RequestMapping("v1/adpircarpulapply")
+@RequestMapping("v1/privateCarPublicUseapply")
 public class AdPircarpulApplyRest {
 
 	@Autowired
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSalecarpulApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSalecarpulApplyRest.java
index eb383a768c..1a3e5e5f95 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSalecarpulApplyRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSalecarpulApplyRest.java
@@ -40,7 +40,7 @@ import javax.validation.Valid;
 
 @Api(tags = "销售人员固定私车公用申请")
 @RestController
-@RequestMapping("v1/adsalecarpulapply")
+@RequestMapping("v1/salesPrivateCarPublicUse")
 public class AdSalecarpulApplyRest {
 
 	@Autowired
@@ -73,7 +73,7 @@ public class AdSalecarpulApplyRest {
 
 	@ApiOperation("详情")
 	@GetMapping("/details/{sid}")
-	ResultBean<AdPircarpulApplyDetailsVo> details(@PathVariable("sid") String sid
+	ResultBean<AdSalecarpulApplyDetailsVo> details(@PathVariable("sid") String sid
 			, @RequestParam(value = "application", required = false) String application) {
 		return adSalecarpulApplyService.details(sid,application);
 	}
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml
index 113d5ff272..84d7204cee 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyMapper.xml
@@ -18,7 +18,7 @@
 
     <select id="selectList" resultType="com.yxt.anrui.oa.biz.adfetedetail.AdFeteListDetailVo">
         select sid,
-               deptName,
+               deptName as deptValue,
                banquetDate,
                banquetNum,
                banquetObject,
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java
index cc429b9b46..9bf777559b 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfeteapply/AdFeteApplyService.java
@@ -87,7 +87,7 @@ public class AdFeteApplyService extends MybatisBaseService<AdFeteApplyMapper, Ad
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
             list.stream().forEach(details -> {
-                FormCommon deptObj = FormCommon.of(details.getDeptSid(), details.getDeptName());
+                FormCommon deptObj = FormCommon.of(details.getDeptKey(), details.getDeptValue());
                 details.setDeptObj(deptObj);
                 FormCommon isUseCanteenObj = FormCommon.of(details.getIsUseCanteenKey(), details.getIsUseCanteenValue());
                 details.setIsUseCanteenObj(isUseCanteenObj);
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailDto.java
index e77b9b900e..acf58fecf8 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailDto.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailDto.java
@@ -38,8 +38,8 @@ public class AdFeteDetailDto implements Dto {
 
     @ApiModelProperty("部门")
     private FormCommon deptObj;
-    private String deptSid;
-    private String deptName;
+    private String deptKey;
+    private String deptValue;
     @ApiModelProperty("宴请时间")
     private String banquetDate;
     @ApiModelProperty("宴请人数")
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.xml
index f32bac387a..394c32d37a 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.xml
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailMapper.xml
@@ -5,8 +5,8 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adfetedetail.AdFeteDetailVo">
         select sid,
-               deptSid,
-               deptName,
+               deptSid as deptKey,
+               deptName as deptValue,
                banquetDate,
                banquetNum,
                banquetObject,
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java
index 58f20e1dd2..afc3ea6dc5 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailService.java
@@ -48,6 +48,8 @@ public class AdFeteDetailService extends MybatisBaseService<AdFeteDetailMapper,
 			list.stream().forEach(details -> {
 				AdFeteDetail adFeteDetail = new AdFeteDetail();
 				BeanUtil.copyProperties(details, adFeteDetail);
+				adFeteDetail.setDeptSid(details.getDeptKey());
+				adFeteDetail.setDeptName(details.getDeptValue());
 				adFeteDetail.setMainSid(sid);
 				baseMapper.insert(adFeteDetail);
 			});
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java
index 2c133ab07d..c593591f63 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteDetailVo.java
@@ -40,8 +40,8 @@ public class AdFeteDetailVo implements Vo {
 
     @ApiModelProperty("部门")
     private FormCommon deptObj;
-    private String deptSid;
-    private String deptName;
+    private String deptKey;
+    private String deptValue;
     @ApiModelProperty("宴请时间")
     private String banquetDate;
     @ApiModelProperty("宴请人数")
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java
index a738f1d8df..6be3a28e6c 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adfetedetail/AdFeteListDetailVo.java
@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.oa.biz.adfetedetail;
 
+import com.yxt.anrui.oa.biz.oaform.FormCommon;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,7 +39,7 @@ public class AdFeteListDetailVo implements Vo {
     private String sid;
 
     @ApiModelProperty("部门")
-    private String deptName;
+    private String deptValue;
     @ApiModelProperty("宴请时间")
     private String banquetDate;
     @ApiModelProperty("宴请人数")
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml
index 62b1feae12..41dc65aecb 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpulapply/AdPircarpulApplyMapper.xml
@@ -18,11 +18,8 @@
 
     <select id="selectList" resultType="com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulListDetailVo">
         select sid,
-               userSid  as userKey,
                userName as userValue,
-               deptSid  as deptKey,
                deptName as deptValue,
-               postSid  as jobKey,
                postName as jobValue,
                reasonsForUsingVehicles,
                departureAddress,
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java
index 6a1c4df5a6..7790fdd09a 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpircarpuldetail/AdPircarpulDetailService.java
@@ -48,6 +48,12 @@ public class AdPircarpulDetailService extends MybatisBaseService<AdPircarpulDeta
 			list.stream().forEach(details -> {
 				AdPircarpulDetail adPircarpulDetail = new AdPircarpulDetail();
 				BeanUtil.copyProperties(details, adPircarpulDetail);
+				adPircarpulDetail.setDeptSid(details.getDeptKey());
+				adPircarpulDetail.setDeptName(details.getDeptValue());
+				adPircarpulDetail.setUserSid(details.getUserKey());
+				adPircarpulDetail.setUserName(details.getUserValue());
+				adPircarpulDetail.setPostSid(details.getJobKey());
+				adPircarpulDetail.setPostName(details.getJobValue());
 				adPircarpulDetail.setMainSid(sid);
 				baseMapper.insert(adPircarpulDetail);
 			});
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyDetailsVo.java
index 0c93512df8..43d06cb7bf 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyDetailsVo.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyDetailsVo.java
@@ -25,7 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.oa.biz.adsalecarpulapply;
 
-import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostListDetailVo;
+import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulListDetailVo;
 import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -45,5 +45,5 @@ public class AdSalecarpulApplyDetailsVo extends OaFormCommonVo {
     @ApiModelProperty("附件")
     private List<String> appes = new ArrayList<>();
 
-    private List<AdLeasehostListDetailVo> list = new ArrayList<>();
+    private List<AdSalecarpulListDetailVo> list = new ArrayList<>();
 }
\ No newline at end of file
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyMapper.java
index 4acf7241d1..fcd067b90c 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyMapper.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyMapper.java
@@ -26,11 +26,10 @@
 package com.yxt.anrui.oa.biz.adsalecarpulapply;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface AdSalecarpulApplyMapper extends BaseMapper<AdSalecarpulApply> {
 
-	AdPircarpulApplyDetailsVo details(String sid);
+	AdSalecarpulApplyDetailsVo details(String sid);
 }
\ No newline at end of file
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyMapper.xml
index 668d074c56..fcffb1fd04 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyMapper.xml
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyMapper.xml
@@ -5,34 +5,20 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="details" resultMap="detailMap">
         select remarks, sid
-        from ad_pircarpul_apply
+        from ad_salecarpul_apply
         where sid = #{sid}
     </select>
 
-    <resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo">
+    <resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adsalecarpulapply.AdSalecarpulApplyDetailsVo">
         <result column="remarks" property="remarks"/>
-        <collection property="list" ofType="com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulListDetailVo"
+        <collection property="list" ofType="com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulListDetailVo"
                     select="selectList" column="sid">
         </collection>
     </resultMap>
 
-    <select id="selectList" resultType="com.yxt.anrui.oa.biz.adpircarpuldetail.AdPircarpulListDetailVo">
-        select sid,
-               userSid  as userKey,
-               userName as userValue,
-               deptSid  as deptKey,
-               deptName as deptValue,
-               postSid  as jobKey,
-               postName as jobValue,
-               reasonsForUsingVehicles,
-               departureAddress,
-               destinationAddress,
-               departureTime,
-               returnTime,
-               plateNumber,
-               expectCost,
-               costRemarks
-        from ad_pircarpul_detail
+    <select id="selectList" resultType="com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulListDetailVo">
+        select sid
+        from ad_salecarpul_detail
         where mainSid = #{sid}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java
index 5b5d3b4590..3a148a8aae 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsalecarpulapply/AdSalecarpulApplyService.java
@@ -26,10 +26,12 @@
 package com.yxt.anrui.oa.biz.adsalecarpulapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.oa.biz.adfrockallotdetail.AdFrockallotListDetailVo;
 import com.yxt.anrui.oa.biz.adpircarpulapply.AdPircarpulApplyDetailsVo;
 import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailDto;
 import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailService;
 import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulDetailVo;
+import com.yxt.anrui.oa.biz.adsalecarpuldetail.AdSalecarpulListDetailVo;
 import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
 import com.yxt.anrui.oa.biz.oaform.*;
 import com.yxt.anrui.oa.biz.oaform.flowable.*;
@@ -134,19 +136,24 @@ public class AdSalecarpulApplyService extends MybatisBaseService<AdSalecarpulApp
 		oaAppendixService.saveFile(sid, files, attachType, fileType);
 	}
 
-	public ResultBean<AdPircarpulApplyDetailsVo> details(String sid, String application) {
+	public ResultBean<AdSalecarpulApplyDetailsVo> details(String sid, String application) {
 		ResultBean rb = ResultBean.fireFail();
-		AdPircarpulApplyDetailsVo adPircarpulApplyDetailsVo = baseMapper.details(sid);
-		if (adPircarpulApplyDetailsVo == null) {
+		AdSalecarpulApplyDetailsVo adSalecarpulApplyDetailsVo = baseMapper.details(sid);
+		if (adSalecarpulApplyDetailsVo == null) {
 			return rb.setMsg("该申请不存在");
 		}
 		List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
 		List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
-		adPircarpulApplyDetailsVo.setFiles(files);
-		adPircarpulApplyDetailsVo.setAppes(appes);
+		adSalecarpulApplyDetailsVo.setFiles(files);
+		adSalecarpulApplyDetailsVo.setAppes(appes);
+		//子表附件赋值
+		for (AdSalecarpulListDetailVo adSalecarpulListDetailVo : adSalecarpulApplyDetailsVo.getList()) {
+			List<String> detailFiles = oaAppendixService.selectByLinkSid(adSalecarpulListDetailVo.getSid());
+			adSalecarpulListDetailVo.setDetailFiles(detailFiles);
+		}
 		//基础字段赋值
-		BeanUtil.copyProperties(oaFormService.getDetails(sid), adPircarpulApplyDetailsVo);
-		return rb.success().setData(adPircarpulApplyDetailsVo);
+		BeanUtil.copyProperties(oaFormService.getDetails(sid), adSalecarpulApplyDetailsVo);
+		return rb.success().setData(adSalecarpulApplyDetailsVo);
 	}
 
 	/**
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyMapper.xml
index 6f745dcc1c..98b4d56e09 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyMapper.xml
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpulapply/AdSenpircarpulApplyMapper.xml
@@ -5,7 +5,7 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="details" resultMap="detailMap">
         select remarks, sid
-        from ad_pircarpul_apply
+        from ad_senpircarpul_apply
         where sid = #{sid}
     </select>
 
@@ -21,7 +21,7 @@
                userName as userValue,
                deptName as deptValue,
                postName as jobValue
-        from ad_pircarpul_detail
+        from ad_senpircarpul_detail
         where mainSid = #{sid}
     </select>
 </mapper>
\ No newline at end of file