zhangnaisong
2024-01-29 1100a88fb4ddf156efc5a7695f91caae0859df94
pc端查看三一车辆位置申请提交
已修改5个文件
31 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/app/application/mapper/ArdAppApplicationMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/app/ArdAppApplicationMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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();
        }
    }
}
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);
}
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);
}
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;
    }
}
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>