社区新增党员修改用户表党员状态

huanghongfa

2021-01-12 2e23c0d3ab2cbcea034d84948afba84271ba0c2d

社区新增党员修改用户表党员状态

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,7 +23,20 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -388,7 +401,7 @@
      <workItem from="1610088905473" duration="10469000" />
      <workItem from="1610326930387" duration="5497000" />
      <workItem from="1610368400707" duration="771000" />
      <workItem from="1610415637750" duration="2950000" />
      <workItem from="1610415637750" duration="5205000" />
    </task>
    <servers />
  </component>
@@ -412,10 +425,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="249" y="0" key="#Project_Structure/0.0.1536.824@0.0.1536.824" timestamp="1608546608273" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1610093667474">
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1610429000238">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1610093667474" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1610429000238" />
    <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -440,54 +453,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610368574903" />
    <state width="1031" height="528" key="GridCell.Tab.0.bottom" timestamp="1610351113864">
    <state width="1031" height="528" key="GridCell.Tab.0.bottom" timestamp="1610429337111">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610351113864" />
    <state width="1031" height="528" key="GridCell.Tab.0.center" timestamp="1610351113864">
    <state width="1031" height="528" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610429337111" />
    <state width="1031" height="528" key="GridCell.Tab.0.center" timestamp="1610429337111">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610351113864" />
    <state width="1031" height="528" key="GridCell.Tab.0.left" timestamp="1610351113864">
    <state width="1031" height="528" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610429337111" />
    <state width="1031" height="528" key="GridCell.Tab.0.left" timestamp="1610429337111">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610351113864" />
    <state width="1031" height="528" key="GridCell.Tab.0.right" timestamp="1610351113864">
    <state width="1031" height="528" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610429337111" />
    <state width="1031" height="528" key="GridCell.Tab.0.right" timestamp="1610429337111">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610351113864" />
    <state width="1031" height="528" key="GridCell.Tab.1.bottom" timestamp="1610351113865">
    <state width="1031" height="528" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610429337111" />
    <state width="1031" height="528" key="GridCell.Tab.1.bottom" timestamp="1610429336793">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.1.center" timestamp="1610351113865">
    <state width="1031" height="528" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610429336793" />
    <state width="1031" height="528" key="GridCell.Tab.1.center" timestamp="1610429336793">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.1.left" timestamp="1610351113865">
    <state width="1031" height="528" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610429336793" />
    <state width="1031" height="528" key="GridCell.Tab.1.left" timestamp="1610429336793">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.1.right" timestamp="1610351113865">
    <state width="1031" height="528" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610429336793" />
    <state width="1031" height="528" key="GridCell.Tab.1.right" timestamp="1610429336793">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.2.bottom" timestamp="1610351113865">
    <state width="1031" height="528" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610429336793" />
    <state width="1031" height="528" key="GridCell.Tab.2.bottom" timestamp="1610429336795">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.2.center" timestamp="1610351113865">
    <state width="1031" height="528" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610429336795" />
    <state width="1031" height="528" key="GridCell.Tab.2.center" timestamp="1610429336794">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.2.left" timestamp="1610351113865">
    <state width="1031" height="528" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610429336794" />
    <state width="1031" height="528" key="GridCell.Tab.2.left" timestamp="1610429336794">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.2.right" timestamp="1610351113865">
    <state width="1031" height="528" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610429336794" />
    <state width="1031" height="528" key="GridCell.Tab.2.right" timestamp="1610429336794">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="528" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610351113865" />
    <state width="1031" height="528" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610429336794" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610072873414">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -508,10 +521,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610420488246">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610429189718">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610420488246" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610429189718" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -460,4 +460,12 @@
     */
    @PostMapping("addnotice")
    R addNotice(@RequestBody SysUserNoticeVO sysUserNoticeVO);

    /**
     * 修改用户的党员状态
     * @param idCard 身份证号
     * @return 修改结果
     */
    @PostMapping("updateuserispartymember")
    R updateUserIsPartymember(@RequestParam("idCard")String idCard);
}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.class

Binary files differ

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

@@ -73,7 +73,11 @@
    public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        Long communityId = this.getCommunityId();
        partyBuildingMemberVO.setCommunityId(communityId);
        return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
        R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
        if (R.isOk(r)) {
            R r1=userService.updateUserIsPartymember(partyBuildingMemberVO.getIdCard());
        }
        return r;
    }

    @OperLog(operModul = "党员管理",operType = 2)

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -485,4 +485,14 @@
    public R addNotice(@RequestBody SysUserNoticeVO sysUserNoticeVO){
        return userService.addNotice(sysUserNoticeVO);
    }

    /**
     * 修改用户的党员状态
     * @param idCard 身份证号
     * @return 修改结果
     */
    @PostMapping("updateuserispartymember")
    public R updateUserIsPartymember(@RequestParam("idCard")String idCard){
        return userService.updateUserIsPartymember(idCard);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -298,4 +298,10 @@
     * @return 新增结果
     */
    R addNotice(SysUserNoticeVO sysUserNoticeVO);
    /**
     * 修改用户的党员状态
     * @param idCard 身份证号
     * @return 修改结果
     */
    R updateUserIsPartymember(String idCard);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1242,6 +1242,24 @@
        return R.fail();
    }

    /**
     * 修改用户的党员状态
     *
     * @param idCard 身份证号
     * @return 修改结果
     */
    @Override
    public R updateUserIsPartymember(String idCard) {
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setIsPartymember(1);
        int update = userDao.update(sysUserDO, new UpdateWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
        if (update>0) {
            log.info("新增党员修改用户党员状态成功 身份证号【{}】",idCard);
            return R.ok();
        }
        return R.fail();
    }

    public static void main(String[] args) {
        String encode = new BCryptPasswordEncoder().encode("admin123456");
        System.out.println(encode);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml

@@ -6,9 +6,9 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: test  # 指定配置文件的环境
      profile: dev  # 指定配置文件的环境
  profiles:
    active: test
    active: dev


eureka: