党委修改

findyguo

2021-03-03 8bb0a52f33f71836c015e9a28b26fc8e35b3f5a7

党委修改

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberRoleDAO.java

@@ -30,30 +30,15 @@
//            "</script>")
    @Select("<script> " +
            "SELECT\n" +
            "mr.id,\n" +
            "m.NAME,\n" +
            "u.phone,\n" +
            "'党员' politicalOutlook,\n"+
            "m.photo_path,\n" +
            "*,\n" +            
            "TIMESTAMPDIFF(\n" +
            "YEAR,\n" +
            "m.employment_time,\n" +
            "DATE_FORMAT( NOW(), '%Y-%m-%d' )) partyAge,\n" +
            "r.role_name ,\n" +
            "mr.role_id \n"+
            "t.birth_time,\n" +
            "DATE_FORMAT( NOW(), '%Y-%m-%d' )) age\n" +            
            "FROM\n" +
            "com_pb_member_role mr\n" +
            "JOIN com_pb_member m ON mr.member_id = m.id\n" +
            "JOIN sys_role r ON mr.role_id = r.role_id \n" +
            "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
            "com_pb_member_role t\n" +
            "WHERE\n" +
            "mr.community_id = #{partyCommitteeVO.communityId} \n" +
            "<if test='partyCommitteeVO.name != null and partyCommitteeVO.name.trim() != &quot;&quot;'>" +
            "AND m.`name` like concat(#{partyCommitteeVO.name},'%')  \n" +
            " </if> " +
            "<if test='partyCommitteeVO.roleId != null and partyCommitteeVO.roleId != 0'>" +
            "AND r.role_id =#{partyCommitteeVO.roleId}" +
            " </if> " +
            "t.community_id = #{partyCommitteeVO.communityId} \n" +
            "</script>")
    IPage<PartyCommitteeVO> pagePartyOrganization(Page page, @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberRoleDO.java

@@ -6,6 +6,7 @@
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -26,17 +27,57 @@
    private Long id;

    /**
     * 党员id
     * 电话
     */
    private Long memberId;
     private String phone;

    /**
     * 党员身份id
     /**
     * 是否注册
     */
    private Long roleId;
     private Integer isReg;

    /**
     /**
     * 姓名
     */
     private String name;

     /**
     * 性别
     */
     private Integer sex;

     /**
     * 出生日期
     */
     private Date birthTime;

     /**
     * 职位
     */
     private String position;

     /**
     * 岗位职责
     */
     private String jobResponsibilities;

     /**
     * 头像图片路径
     */
     private String photoPath;

     /**
     * 创建时间
     */
     private Date createAt;

     /**
     * 修改时间
     */
     private Date updateAt;

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

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

@@ -213,18 +213,10 @@
     */
    @Override
    public R addPartyCommittee(PartyCommitteeVO partyCommitteeVO) {
        Long partyMemberId = partyCommitteeVO.getPartyMemberId();
        if (null==partyMemberId||0==partyMemberId) {
            return R.fail("党员id不能为空");
        }
        ComPbMemberRoleDO comPbMemberRoleDO1 = comPbMemberRoleDAO.selectOne(new QueryWrapper<ComPbMemberRoleDO>().lambda().eq(ComPbMemberRoleDO::getMemberId, partyMemberId));
        if (!ObjectUtils.isEmpty(comPbMemberRoleDO1)) {
            return R.fail("党员身份已经存在");
        }
        ComPbMemberRoleDO comPbMemberRoleDO=new ComPbMemberRoleDO();
        comPbMemberRoleDO.setCommunityId(partyCommitteeVO.getCommunityId());
        comPbMemberRoleDO.setMemberId(partyMemberId);
        comPbMemberRoleDO.setRoleId(partyCommitteeVO.getRoleId());
        BeanUtils.copyProperties(partyCommitteeVO,comPbMemberRoleDO);
        comPbMemberRoleDO.setCreateAt(new Date());
        comPbMemberRoleDO.setUpdateAt(new Date());
        int insert = comPbMemberRoleDAO.insert(comPbMemberRoleDO);
        if (insert>0) {
            return R.ok();
@@ -241,10 +233,10 @@
    @Override
    public R updatePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
        ComPbMemberRoleDO comPbMemberRoleDO=new ComPbMemberRoleDO();
        comPbMemberRoleDO.setCommunityId(partyCommitteeVO.getCommunityId());
        comPbMemberRoleDO.setMemberId(partyCommitteeVO.getPartyMemberId());
        comPbMemberRoleDO.setRoleId(partyCommitteeVO.getRoleId());
        comPbMemberRoleDO.setId(partyCommitteeVO.getId());
        BeanUtils.copyProperties(partyCommitteeVO,comPbMemberRoleDO);
        ComPbMemberRoleDO comPbMemberRoleDOOld = comPbMemberRoleDAO.selectById(partyCommitteeVO.getId());
        comPbMemberRoleDO.setCreateAt(comPbMemberRoleDOOld.getCreateAt());
        comPbMemberRoleDO.setUpdateAt(new Date());
        int update = comPbMemberRoleDAO.updateById(comPbMemberRoleDO);
        if (update>0) {
            return R.ok();