单兵端查询自己发起的全部申请提交

zhangnaisong

2024-04-18 8e7e81802c743b96ef49969817749069fe0818e1

单兵端查询自己发起的全部申请提交

 ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java

@@ -237,4 +237,17 @@
            return AjaxResult.error();
        }
    }

    @GetMapping("/getSendPositionALL")
    //@ApiOperation("单兵端查看发起的全部申请")
    public AjaxResult getSendPositionALL() {
        String soilderId = SecurityUtils.getUserId();
        try{
            Map<String,List<Map<String,Object>>> result = ardAppApplicationService.getSendPositionALL(soilderId);
            return AjaxResult.success(result);
        }catch(Exception e){
            e.printStackTrace();
            return AjaxResult.error();
        }
    }
}

 ard-work/src/main/java/com/ruoyi/app/application/mapper/ArdAppApplicationMapper.java

@@ -82,4 +82,6 @@
    public Map<String,Object> selectSYCarApplicationByPCIdAndSoilderId(@Param("commanderId")String commanderId,@Param("usersId")String usersId);

    public List<Map<String,Object>> selectArdAppApplicationByCommanderIdNoCheck(@Param("commanderId")String commanderId);

    public List<Map<String,Object>> selectArdAppApplicationBySoilderIdALL(@Param("soilderId")String soilderId);
}

 ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java

@@ -80,4 +80,6 @@
    public List<Map<String,Object>> getCheckPositionNo(String commanderId);///

    public Map<String,Map<String,List<Map<String,Object>>>> getSoilderAndCarPositionByCommanderId(String commanderId,Map<String, Double> para);

    public Map<String,List<Map<String,Object>>> getSendPositionALL(String soilderId);
}

 ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java

@@ -578,6 +578,42 @@
        return mapResault;
    }

    @Override
    public Map<String, List<Map<String, Object>>> getSendPositionALL(String soilderId) {
        Map<String, List<Map<String, Object>>> result = new HashMap();
        List<Map<String,Object>> ardAppApplicationList = ardAppApplicationMapper.selectArdAppApplicationBySoilderIdALL(soilderId);
        Date date = new Date();
        //查看指挥端位置申请
        List<Map<String, Object>> resultCommanderPosition = new ArrayList();
        //查看车辆位置申请
        List<Map<String, Object>> resultSYCarsPosition = new ArrayList();
        for(Map<String, Object> map : ardAppApplicationList){
            if(((String)map.get("begin")).equals("")){
                map.put("time","");
                if(((String)map.get("applicationType")).equals("Commander")){
                    resultCommanderPosition.add(map);
                }else if(((String)map.get("applicationType")).equals("SYCar")){
                    resultSYCarsPosition.add(map);
                }
            }else{
                Long interval = date.getTime() - Long.parseLong((String)map.get("begin"));
                interval = 24 * 60 * 60 * 1000 - interval;
                Long hour = interval / (60 * 60 * 1000);
                Long min = (interval - hour * 60 * 60 * 1000) / (60 * 1000);
                Long second = (interval - hour * 60 * 60 * 1000 - min * 60 * 1000) / 1000;
                map.put("time",hour + "时" + min + "分" + second + "秒");
                if(((String)map.get("applicationType")).equals("Commander")){
                    resultCommanderPosition.add(map);
                }else if(((String)map.get("applicationType")).equals("SYCar")){
                    resultSYCarsPosition.add(map);
                }
            }
        }
        result.put("commander",resultCommanderPosition);
        result.put("SYCars",resultSYCarsPosition);
        return result;
    }

    public List<Long> getOwnAndChildrenDeptIdList(List<Long> deptIdList,List<Long> deptIdListr){
        deptIdListr.addAll(deptIdList);
        List<Long> result = sysDeptMapper.getChildrenDeptIdList(deptIdList);

 ard-work/src/main/resources/mapper/app/ArdAppApplicationMapper.xml

@@ -160,4 +160,12 @@
        inner join sys_user su on aaa.soilder_id = su.user_id
        where commander_id = #{commanderId}
    </select>

    <select id="selectArdAppApplicationBySoilderIdALL" 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.commander_id = su.user_id
        where soilder_id = #{soilderId}
    </select>
</mapper>