Merge branch 'master' into hemenkou_dev

101captain

2021-12-27 75206d4e4ecd2a7789a21362b85906463d3f2c3d

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

@@ -174,7 +174,7 @@
                    return R.fail("该值班表不存在");
                }
                ComSwRotaDO checkCreditCode = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda()
                    .eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()));
                    .eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()).eq(ComSwRotaDO::getCommunityId,comSwRotaSaveDTO.getCommunityId()));
                if (null != checkCreditCode && !comSwRotaDO.getId().equals(checkCreditCode.getId())) {
                    return R.fail("该值班表已存在，值班日期重复");
                }
@@ -187,7 +187,7 @@
                comSwRotaDAO.updateById(comSwRotaDO);
            } else {
                Integer count = comSwRotaDAO.selectCount(new QueryWrapper<ComSwRotaDO>().lambda()
                    .eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()));
                    .eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()).eq(ComSwRotaDO::getCommunityId,comSwRotaSaveDTO.getCommunityId()));
                if (count > 0) {
                    return R.fail("该值班表已存在，值班日期重复");
                }
@@ -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();
        }
@@ -289,7 +289,8 @@
        for (ComSwRotaExcelVO comSwRotaExcelVO : list) {
            Date date = DateUtil.parse(comSwRotaExcelVO.getRotaDate(), parsePatterns);
            Integer count =
                comSwRotaDAO.selectCount(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate, date));
                comSwRotaDAO.selectCount(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate, date)
                        .eq(ComSwRotaDO::getCommunityId,communityId));
            if (count > 0) {
                return R.fail("值班日期已存在，" + comSwRotaExcelVO.getRotaDate() + "重复");
            }