Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-20 5ade6f6e4532b65b96d80eabe5d92302f6f817f4

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/vaccines/VaccinesEnrollByAdminDTO.java

@@ -26,8 +26,8 @@
    private String phone;

    @ApiModelProperty("登记时间开始")
    private Date startTime;
    private String startTime;

    @ApiModelProperty("登记时间结束")
    private Date endTime;
    private String endTime;
}

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

@@ -29,4 +29,10 @@
        return communityService.getVaccinesEnrollListByAdmin(vaccinesByAdminDTO);
    }

//    @ApiOperation(value = "疫苗登记列表导出" , response = VaccinesEnrollByAdminVO.class)
//    @PostMapping("/enroll/export")
//    public R exportVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO) {
//        return communityService.getVaccinesEnrollListByAdmin(vaccinesByAdminDTO);
//    }

}

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

@@ -108,7 +108,7 @@
     * @param id    疫苗分类id
     * @return      删除结果
     */
    @PostMapping("/admin/delete")
    @PostMapping("/admin/enroll/delete")
    public R deleteVaccinesByAdmin(@RequestParam("id") Long id) {
        return comMngVaccinesService.deleteVaccinesByAdmin(id);
    }

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

@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollUserByAppVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComMngVaccinesDAO;
import com.panzhihua.service_community.dao.ComMngVaccinesEnrollRecordDAO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesDO;
@@ -44,6 +45,7 @@
    public R getVaccinesUserListByApp(VaccinesEnrollUserByAppDTO enrollUserByAppDTO){
        //查询当前用户的家庭成员列表
        List<VaccinesEnrollUserByAppVO> userLists = new ArrayList<>();
        List<VaccinesEnrollUserByAppVO> newUserLists = new ArrayList<>();
        //将自己的信息组装进家庭成员列表中
        VaccinesEnrollUserByAppVO ownUser = this.baseMapper.getSysUser(enrollUserByAppDTO.getUserId());
        if(ownUser != null){
@@ -62,18 +64,23 @@
                if(user.getIsUser() == null){
                    user.setIsUser(2);
                }
                if(StringUtils.isEmpty(user.getJob())){
                    user.setJob("暂无");
                }
                //查询当前用户是否已经报名
                ComMngVaccinesEnrollRecordDO enrollRecordDO = this.baseMapper.selectOne(new QueryWrapper<ComMngVaccinesEnrollRecordDO>()
                        .lambda().eq(ComMngVaccinesEnrollRecordDO::getFamilyUserId,user.getUserId()).eq(ComMngVaccinesEnrollRecordDO::getType,enrollUserByAppDTO.getVaccinesId()));
                        .lambda().eq(ComMngVaccinesEnrollRecordDO::getFamilyUserId,user.getUserId())
                        .eq(ComMngVaccinesEnrollRecordDO::getType,enrollUserByAppDTO.getVaccinesId())
                        .eq(ComMngVaccinesEnrollRecordDO::getFamilyUserType,user.getIsUser()));
                if(enrollRecordDO != null){
                    user.setIsEnroll(VaccinesEnrollUserByAppVO.isEnroll.yes);
                }else{
                    user.setIsEnroll(VaccinesEnrollUserByAppVO.isEnroll.no);
                    newUserLists.add(user);
                }

            });
        }
        return R.ok(userLists);
        return R.ok(newUserLists);
    }

    /**