1123死亡管理相关功能提交

101captain

2021-11-23 90e19d2fb94818ece611e883cff4b3c7388e1c33

1123死亡管理相关功能提交

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java

@@ -174,7 +174,7 @@
    @ApiOperation(value = "根据日期查询值班人员")
    @GetMapping("/app/getRotaPersonByDate")
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return communityService.getRotaPersonByDate(rotaDate);
        return communityService.getRotaPersonByDate(rotaDate,this.getCommunityId());
    }

    /**
@@ -185,7 +185,7 @@
    @ApiOperation(value = "根据日期查询值班领导")
    @GetMapping("/app/getRotaLeaderByDate")
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return communityService.getRotaLeaderByDate(rotaDate);
        return communityService.getRotaLeaderByDate(rotaDate,this.getCommunityId());
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -5341,7 +5341,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaPersonByDate")
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

    /**
     * 根据日期查询值班领导
@@ -5349,7 +5349,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

    /**
     * 批量导入值班表

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSwPatrolRecordApi.java

@@ -431,7 +431,7 @@
    @ApiOperation(value = "根据日期查询值班人员")
    @GetMapping("/getRotaPersonByDate")
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return communityService.getRotaPersonByDate(rotaDate);
        return communityService.getRotaPersonByDate(rotaDate,this.getCommunityId());
    }

    /**
@@ -442,7 +442,7 @@
    @ApiOperation(value = "根据日期查询值班领导")
    @GetMapping("/getRotaLeaderByDate")
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return communityService.getRotaLeaderByDate(rotaDate);
        return communityService.getRotaLeaderByDate(rotaDate,this.getCommunityId());
    }

    /**
@@ -1027,8 +1027,8 @@
                    if (photo1.size() != 0 && null != photo1) {
                        List<Object> list=new ArrayList<>();
                        for (int i = 0; i < photo1.size(); i++) {
                            downloadPicture(photo1.get(i), comSwDangerReportVO.getId() + "_find_" + i, "d:/dangerReport/file/");
                            list.add(getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_find_" + i + ".jpg"));
                            downloadPicture(photo1.get(i), comSwDangerReportVO.getId() + "_step_" + i, "d:/dangerReport/file/");
                            list.add(getImageStr("d:/dangerReport/file/" + comSwDangerReportVO.getId() + "_step_" + i + ".jpg"));
                        }
                        dataMap.put("imgList",list);
                    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java

@@ -288,8 +288,8 @@
     * @return 查询结果
     */
    @GetMapping("/rota/getRotaPersonByDate")
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return comSwRotaService.getRotaPersonByDate(rotaDate);
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId) {
        return comSwRotaService.getRotaPersonByDate(rotaDate,communityId);
    }

    /**
@@ -298,8 +298,8 @@
     * @return 查询结果
     */
    @GetMapping("/rota/getRotaLeaderByDate")
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate) {
        return comSwRotaService.getRotaLeaderByDate(rotaDate);
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId) {
        return comSwRotaService.getRotaLeaderByDate(rotaDate,communityId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSwRotaService.java

@@ -57,14 +57,14 @@
     * 
     * @return 查询结果
     */
    R getRotaPersonByDate(String rotaDate);
    R getRotaPersonByDate(String rotaDate,Long communityId);

    /**
     * 查询当天值班领导
     * 
     * @return 查询结果
     */
    R getRotaLeaderByDate(String rotaDate);
    R getRotaLeaderByDate(String rotaDate,Long communityId);

    /**
     * 选择人员

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java

@@ -215,11 +215,11 @@
    }

    @Override
    public R getRotaPersonByDate(String rotaDate) {
    public R getRotaPersonByDate(String rotaDate,Long communityId) {
        ComSwRotaDO comSwRotaDO = new ComSwRotaDO();
        try {
            comSwRotaDO = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate,
                new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)));
                new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)).eq(ComSwRotaDO::getCommunityId,communityId));
        } catch (ParseException e) {
            e.printStackTrace();
        }
@@ -246,11 +246,11 @@
    }

    @Override
    public R getRotaLeaderByDate(String rotaDate) {
    public R getRotaLeaderByDate(String rotaDate,Long communityId) {
        ComSwRotaDO comSwRotaDO = new ComSwRotaDO();
        try {
            comSwRotaDO = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate,
                new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)));
                new SimpleDateFormat("yyyy-MM-dd").parse(rotaDate)).eq(ComSwRotaDO::getCommunityId,communityId));
        } catch (ParseException e) {
            e.printStackTrace();
        }