Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-07-24 5b45ad37abfa89d93080bb49c008b9629917d0d5

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -34,6 +34,7 @@
    private String activityName;

    @ApiModelProperty("负责人userID")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long sponsorId;

    @ApiModelProperty("负责人名字")
@@ -250,6 +251,7 @@
    private Integer duration;

    @ApiModelProperty("项目Id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long projectId;

    @ApiModelProperty("项目名称")
@@ -290,10 +292,12 @@

    private String jumpArticleUrl;
    @ApiModelProperty("关联服务id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long relationId;
    @ApiModelProperty("关联手机")
    private String phone;
    @ApiModelProperty("单位id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long checkUnitId;

    @ApiModelProperty(value = "街道id", hidden = true)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComPropertyVO.java

@@ -18,6 +18,7 @@
     * 主键
     */
    @ApiModelProperty(value = "主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    /**
@@ -54,12 +55,14 @@
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    @ApiModelProperty("账号")
@@ -69,6 +72,7 @@
    private String password;

    @ApiModelProperty("权限id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;

    @ApiModelProperty("创建时间")

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -465,7 +465,7 @@
     * @return 删除结果
     */
    @PostMapping("deletepartybuildingmember")
    public R deleteDynUser(@RequestParam("id") Integer id) {
    public R deleteDynUser(@RequestParam("id") Long id) {
        return comPbMemberService.deleteDynUser(id);

    }

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java

@@ -161,7 +161,7 @@
     *            党员主键
     * @return 删除结果
     */
    R deleteDynUser(Integer id);
    R deleteDynUser(Long id);

    /**
     * 定时任务刷新党建动态发布状态

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -622,7 +622,7 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R deleteDynUser(Integer id) {
    public R deleteDynUser(Long id) {
        ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(id);
        if (ObjectUtils.isEmpty(comPbMemberDO)) {
            return R.fail("党员不存在");