修改bug

huanghongfa

2021-05-20 a4cdb10605bee6e894333cf8a3a07628b48ac9d5

修改bug

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

@@ -58,6 +58,7 @@
            return R.fail("请先登录");
        }
        enrollByAppDTO.setUserId(loginUserInfo.getUserId());
        enrollByAppDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.VaccinesEnrollByApp(enrollByAppDTO);
    }


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

@@ -30,4 +30,7 @@

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

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;
}

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

@@ -16,6 +16,9 @@
    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty("报名用户列表")
    private List<EnrollUserByAppDTO> enrollUserList;


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

@@ -1,6 +1,8 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollByAdminVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -18,7 +20,7 @@
@RestController
@RequestMapping("/vaccines/")
@Api(tags = {"疫苗服务"})
public class VaccinesApi {
public class VaccinesApi  extends BaseController {

    @Resource
    private CommunityService communityService;
@@ -26,13 +28,21 @@
    @ApiOperation(value = "疫苗登记列表" , response = VaccinesEnrollByAdminVO.class)
    @PostMapping("/enroll/list")
    public R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if(loginUserInfo != null){
            vaccinesByAdminDTO.setCommunityId(loginUserInfo.getCommunityId());
        }
        return communityService.getVaccinesEnrollListByAdmin(vaccinesByAdminDTO);
    }

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

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVaccinesEnrollRecordDO.java

@@ -83,6 +83,11 @@
    private Integer sex;

    /**
     * 社区id
     */
    private Long communityId;

    /**
     * 报名类型（1.小程序用户  2.小程序家庭成员）
     */
    public interface familyUserType{

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

@@ -132,6 +132,7 @@
                vaccinesEnrollRecordDO.setUserId(enrollByAppDTO.getUserId());
                vaccinesEnrollRecordDO.setFamilyUserId(userByAppDTO.getUserId());
                vaccinesEnrollRecordDO.setType(enrollByAppDTO.getVaccinesId());
                vaccinesEnrollRecordDO.setCommunityId(enrollByAppDTO.getCommunityId());
                vaccinesEnrollRecordDOList.add(vaccinesEnrollRecordDO);
            }
        }