From 1100a88fb4ddf156efc5a7695f91caae0859df94 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 29 一月 2024 10:36:17 +0800
Subject: [PATCH] pc端查看三一车辆位置申请提交
---
ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java | 13 +++++++++++++
ard-work/src/main/java/com/ruoyi/app/application/mapper/ArdAppApplicationMapper.java | 2 ++
ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java | 6 ++++++
ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java | 2 ++
ard-work/src/main/resources/mapper/app/ArdAppApplicationMapper.xml | 8 ++++++++
5 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java b/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java
index 5b5d0d5..f6ddb15 100644
--- a/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java
@@ -210,4 +210,17 @@
return AjaxResult.error();
}
}
+
+ @GetMapping("/getCheckPositionNo")
+ @ApiOperation("PC绔煡鐪嬫湭瀹℃壒鐨勭敵璇�")
+ public AjaxResult getCheckPositionNo() {
+ String commanderId = SecurityUtils.getUserId();
+ try{
+ List<Map<String,Object>> result = ardAppApplicationService.getCheckPositionNo(commanderId);
+ return AjaxResult.success(result);
+ }catch(Exception e){
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/application/mapper/ArdAppApplicationMapper.java b/ard-work/src/main/java/com/ruoyi/app/application/mapper/ArdAppApplicationMapper.java
index c42c7d0..71a7a46 100644
--- a/ard-work/src/main/java/com/ruoyi/app/application/mapper/ArdAppApplicationMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/application/mapper/ArdAppApplicationMapper.java
@@ -80,4 +80,6 @@
public int updateSoilderCheckByCommanderIdAndSoilderIdAndType(@Param("soilderId")String soilderId,@Param("commanderId")String commanderId,@Param("applicationType")String applicationType);
public Map<String,Object> selectSYCarApplicationByPCIdAndSoilderId(@Param("commanderId")String commanderId,@Param("usersId")String usersId);
+
+ public List<Map<String,Object>> selectArdAppApplicationByCommanderIdNoCheck(@Param("commanderId")String commanderId);
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java b/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java
index dbbd192..c0f88be 100644
--- a/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java
@@ -76,4 +76,6 @@
public Map<String,List<Map<String,Object>>> getCheckPositionOwn(String soilderId);
public int approvalCheckPositionOwn(String soilderId,Map<String,String> para);
+
+ public List<Map<String,Object>> getCheckPositionNo(String commanderId);
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java
index 496e44a..d5ac04f 100644
--- a/ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java
@@ -385,4 +385,10 @@
int result = ardAppApplicationMapper.updateSoilderCheckByCommanderIdAndSoilderIdAndType(soilderId,commanderId,applicationType);
return result;
}
+
+ @Override
+ public List<Map<String, Object>> getCheckPositionNo(String commanderId) {
+ List<Map<String,Object>> ardAppApplicationList = ardAppApplicationMapper.selectArdAppApplicationByCommanderIdNoCheck(commanderId);
+ return ardAppApplicationList;
+ }
}
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppApplicationMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppApplicationMapper.xml
index 30e6188..1ac4832 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppApplicationMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppApplicationMapper.xml
@@ -152,4 +152,12 @@
inner join sys_user su on aaa.soilder_id = su.user_id
where commander_id = #{commanderId} and soilder_id = #{usersId} and application_type = 'SYCar'
</select>
+
+ <select id="selectArdAppApplicationByCommanderIdNoCheck" parameterType="java.lang.String" resultType="java.util.Map">
+ select aaa.soilder_id as "soilderId",aaa.commander_id as "commanderId",
+ aaa.reason,aaa.begin,aaa.state,aaa.application_type as "applicationType",
+ su.user_name as "userName",su.nick_name as "nickName" from ard_app_application aaa
+ inner join sys_user su on aaa.soilder_id = su.user_id
+ where commander_id = #{commanderId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3