出资人，主要管理人修改，新增字段 dept_id 修改保安公司绑定

Administrator

2021-10-22 52fcdf0dff15b882024581cb393fbcbe70f29148

出资人，主要管理人修改，新增字段 dept_id 修改保安公司绑定

 src/main/java/org/springblade/modules/member/controller/MemberController.java

@@ -124,12 +124,12 @@

    /**
     * 主要管理员信息
     * @param creditcode
     * @param deptId
     * @return
     */
    @PostMapping("/selectMemberInfo")
    public R<IPage<MemberVO>> selectMemberInfo(String creditcode,Query query) {
        IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), creditcode);
    public R<IPage<MemberVO>> selectMemberInfo(String deptId,Query query) {
        IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), deptId);
        return R.data(pages);
    }


 src/main/java/org/springblade/modules/member/entity/Member.java

@@ -76,4 +76,11 @@
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date rtime;

    /**
     * 公司id
     */
    @ApiModelProperty(value = "公司id")
    @TableField("dept_id")
    private String deptId;
}

 src/main/java/org/springblade/modules/member/mapper/MemberMapper.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.member.mapper;

import org.apache.ibatis.annotations.Param;
import org.springblade.modules.member.entity.Member;
import org.springblade.modules.member.vo.MemberVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,5 +40,5 @@
     * @return
     */
    List<MemberVO> selectMemberPage(IPage page, MemberVO member);
    List<MemberVO> selectMemberInfo(IPage page,String creditcode);
    List<MemberVO> selectMemberInfo(IPage page,@Param("deptId") String deptId);
}

 src/main/java/org/springblade/modules/member/mapper/MemberMapper.xml

@@ -11,6 +11,7 @@
        <result column="cell" property="cell"/>
        <result column="creditCode" property="creditcode"/>
        <result column="rtime" property="rtime"/>
        <result column="dept_id" property="deptId"/>
    </resultMap>


@@ -19,7 +20,7 @@
    </select>

    <select id="selectMemberInfo" resultMap="memberResultMap">
        select * from sys_member where creditCode=#{creditcode}
        select * from sys_member where dept_id=#{deptId}
    </select>

</mapper>

 src/main/java/org/springblade/modules/member/service/IMemberService.java

@@ -40,5 +40,5 @@
     * @return
     */
    IPage<MemberVO> selectMemberPage(IPage<MemberVO> page, MemberVO member);
    IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,String creditcode);
    IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,String deptId);
}

 src/main/java/org/springblade/modules/member/service/impl/MemberServiceImpl.java

@@ -42,8 +42,8 @@
    }

    @Override
    public IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,String creditcode) {
        return page.setRecords(baseMapper.selectMemberInfo(page,creditcode));
    public IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,String deptId) {
        return page.setRecords(baseMapper.selectMemberInfo(page,deptId));
    }

}

 src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java

@@ -127,12 +127,12 @@

    /**
     * 出资人信息
     * @param creditcode
     * @param deptId
     * @return
     */
    @PostMapping("/selectShareholderInfo")
    public R<IPage<ShareholderVO>> selectShareholderInfo(String creditcode, Query query) {
        IPage<ShareholderVO> pages=shareholderService.selectShareholderInfo(Condition.getPage(query), creditcode);
    public R<IPage<ShareholderVO>> selectShareholderInfo(String deptId, Query query) {
        IPage<ShareholderVO> pages=shareholderService.selectShareholderInfo(Condition.getPage(query), deptId);
        return R.data(pages);
    }


 src/main/java/org/springblade/modules/shareholder/entity/Shareholder.java

@@ -88,4 +88,11 @@
    @ApiModelProperty(value = "社会信用代码")
    @TableField("creditCode")
    private String creditcode;

    /**
     * 公司id
     */
    @ApiModelProperty(value = "公司id")
    @TableField("dept_id")
    private String deptId;
}

 src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.shareholder.mapper;

import org.apache.ibatis.annotations.Param;
import org.springblade.modules.shareholder.entity.Shareholder;
import org.springblade.modules.shareholder.vo.ShareholderVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,5 +40,5 @@
     * @return
     */
    List<ShareholderVO> selectShareholderPage(IPage page, ShareholderVO shareholder);
    List<ShareholderVO> selectShareholderInfo(IPage page,String creditcode);
    List<ShareholderVO> selectShareholderInfo(IPage page,@Param("deptId") String deptId);
}

 src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml

@@ -13,6 +13,7 @@
        <result column="cardid" property="cardid"/>
        <result column="cell" property="cell"/>
        <result column="creditCode" property="creditcode"/>
        <result column="dept_id" property="deptId"/>
    </resultMap>


@@ -22,7 +23,7 @@


    <select id="selectShareholderInfo" resultMap="shareholderResultMap">
        select * from sys_shareholder where creditCode=#{creditcode}
        select * from sys_shareholder where dept_id=#{deptId}
    </select>

</mapper>

 src/main/java/org/springblade/modules/shareholder/service/IShareholderService.java

@@ -40,5 +40,5 @@
     * @return
     */
    IPage<ShareholderVO> selectShareholderPage(IPage<ShareholderVO> page, ShareholderVO shareholder);
    IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String creditcode);
    IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String deptId);
}

 src/main/java/org/springblade/modules/shareholder/service/impl/ShareholderServiceImpl.java

@@ -42,8 +42,8 @@
    }

    @Override
    public IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String creditcode) {
        return page.setRecords(baseMapper.selectShareholderInfo(page,creditcode));
    public IPage<ShareholderVO> selectShareholderInfo(IPage<ShareholderVO> page, String deptId) {
        return page.setRecords(baseMapper.selectShareholderInfo(page,deptId));
    }



 src/main/resources/application-test.yml

@@ -16,7 +16,7 @@

  datasource:
    # MySql
    url: jdbc:mysql://223.82.109.183:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://223.82.109.183:2083/zhba-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: zhba0728

@@ -64,4 +64,3 @@
    remote-mode: true
    upload-domain: http://localhost:8999
    remote-path: /usr/share/nginx/html