1.主要管理人员查询接口修改 2.招聘查询接口修改

Administrator

2021-08-31 96ae28f258226057242f145951d315acf0e6051b

1.主要管理人员查询接口修改
2.招聘查询接口修改

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

@@ -137,8 +137,8 @@
     * @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(Member member,Query query) {
        IPage<MemberVO> pages = memberService.selectMemberInfo(Condition.getPage(query), member);
        return R.data(pages);
    }


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

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.member.entity.Member;
import org.springblade.modules.member.vo.MemberVO;

@@ -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("member") Member member);
}

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

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

    <select id="selectMemberInfo" resultMap="memberResultMap">
        select * from sys_member where creditCode=#{creditcode}
        select * from sys_member
        where
        1=1
        <if test="member.creditcode!=null and member.creditcode!=''" >
            and creditCode=#{member.creditcode}
        </if>
        <if test="member.name!=null and member.name!=''" >
            and name like concat ('%',#{member.name},'%')
        </if>
        <if test="member.post!=null and member.post!=''" >
            and post like concat ('%',#{member.post},'%')
        </if>

    </select>

</mapper>

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

@@ -41,6 +41,6 @@
     * @return
     */
    IPage<MemberVO> selectMemberPage(IPage<MemberVO> page, MemberVO member);
    IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,String creditcode);
    IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,Member member);
    void importmember(List<memberExcel> data, Boolean isCovered);
}

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

@@ -45,8 +45,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,Member member) {
        return page.setRecords(baseMapper.selectMemberInfo(page,member));
    }

    @Override

 src/main/java/org/springblade/modules/recruitment/mapper/RecruitmentMapper.xml

@@ -17,6 +17,12 @@
        <if test="recruitment.tenantName!=null and  recruitment.tenantName!=''">
            and bt.dept_name like concat('%', #{recruitment.tenantName},'%')
        </if>
        <if test="recruitment.welfare!=null and  recruitment.welfare!=''">
            and sr.welfare like concat('%', #{recruitment.welfare},'%')
        </if>
        <if test="recruitment.unitsScale!=null and  recruitment.unitsScale!=''">
            and sr.units_scale like concat('%', #{recruitment.unitsScale},'%')
        </if>
        <if test="recruitment.province!=null">
            and sr.province = #{recruitment.province}
        </if>