Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-31 9b583c3ae9f78328368b2eda8899f80204ed796f

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.java

@@ -56,4 +56,11 @@
     */
    @SqlParser(filter = true)
    Integer getDispatcherCount(@Param("dispatcherUnitVO1")DispatcherUnitVO dispatcherUnitVO1);

    /**
     * 查询用的派遣信息
     * @param userId 用户id
     * @return
     */
    DispatcherVO getDispatcherInfoByUserId(@Param("userId") Long userId);
}

 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml

@@ -81,4 +81,18 @@
        and dispatcher_unit_id = #{dispatcherUnitVO1.id}
    </select>

    <!--查询用的派遣信息-->
    <select id="getDispatcherInfoByUserId" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
        select
            sd.*
        from
            sys_dispatcher sd
        left join
            sys_dispatcher_unit sdu
        on
            sdu.id = sd.dispatcher_unit_id
        where sd.user_ids = #{userId}
        and sd.status = 0
    </select>

</mapper>

 src/main/java/org/springblade/modules/dispatcher/service/IDispatcherService.java

@@ -52,4 +52,11 @@
     * @return
     */
    Integer getDispatcherCount(DispatcherUnitVO dispatcherUnitVO1);

    /**
     * 查询用的派遣信息
     * @param userId 用户id
     * @return
     */
    DispatcherVO getDispatcherInfoByUserId(Long userId);
}

 src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherServiceImpl.java

@@ -87,4 +87,14 @@
    public Integer getDispatcherCount(DispatcherUnitVO dispatcherUnitVO1) {
        return baseMapper.getDispatcherCount(dispatcherUnitVO1);
    }

    /**
     * 查询用的派遣信息
     * @param userId 用户id
     * @return
     */
    @Override
    public DispatcherVO getDispatcherInfoByUserId(Long userId) {
        return baseMapper.getDispatcherInfoByUserId(userId);
    }
}

 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>

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -662,8 +662,8 @@
     * @return
     */
    @GetMapping("/seleL")
    public R seleL(String type,String deptid, String jurisdiction) {
        List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction);
    public R seleL(String type,String deptid, String jurisdiction,Long userId) {
        List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction,userId);
        return R.data(list);
    }


 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.node.TreeNode;
@@ -150,6 +151,14 @@
     */
    List<Map<String, Object>> getWorkReportInfo(@Param("type")String type,
                                                @Param("deptid")String deptid,
                                                @Param("jurisdiction")String jurisdiction);    /**
     * 工作汇报人员(向民警)
     * @param deptid
     * @param jurisdiction
     * @return
     */
    List<Map<String, Object>> getWorkReportInfos(@Param("type")String type,
                                                @Param("deptid")String deptid,
                                                @Param("jurisdiction")String jurisdiction);

    /**
@@ -165,4 +174,7 @@
     * @return
     */
    UserVO getUserDetails(@Param("user") User user);


    DispatcherVO getDispatcherInfoByUserId(Long userId);
}

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -447,4 +447,40 @@
            and dept_category=2
        </if>
    </select>


    <!--获取工作汇报 向民警-->
    <select id="getWorkReportInfos" resultType="java.util.HashMap">
        select bu.* from blade_user bu
        left join
        blade_dept bd
        on
        bd.id = bu.dept_id
        where
        1=1
        and bu.status = 1
        and bu.is_deleted = 0
        <if test="deptid!=null and deptid!=''">
            and bu.dept_id = #{deptid}
        </if>
        <if test="jurisdiction!=null and jurisdiction!=''">
            and bu.jurisdiction = #{jurisdiction}
            and dept_category=2
        </if>
    </select>

    <!--查询用的派遣信息-->
    <select id="getDispatcherInfoByUserId" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
        select
            sd.id,sdu.jurisdiction
        from
            sys_dispatcher sd
        left join
            sys_dispatcher_unit sdu
        on
            sdu.id = sd.dispatcher_unit_id
        where sd.user_ids = #{userId}
        and sd.status = 0
    </select>

</mapper>

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -298,5 +298,5 @@
     * @return
     */
    UserVO getUserDetails(User user);
    List<Map<String, Object>> seleL(String type,String deptid,String jurisdiction);
    List<Map<String, Object>> seleL(String type,String deptid,String jurisdiction,Long userId);
}

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -41,6 +41,9 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
@@ -633,7 +636,7 @@
     * @return
     */
    @Override
    public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction) {
    public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction,Long userId) {
        List<Map<String, Object>> list = new ArrayList<>();
        //派遣
        if (Integer.parseInt(type)==1){
@@ -646,10 +649,31 @@
        }
        //保安向民警
        if (Integer.parseInt(type)==3){
            Information information = new Information();
            information.setDepartmentid(deptid);
            Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
            list = baseMapper.getWorkReportInfo(type,null, one.getJurisdiction());
            //查询用户信息
            User user = this.getById(userId);
            //判断用户是否被派遣
            if (null!=user.getDispatch()){
                if (user.getDispatch().equals("0")) {
                    //在派遣中，向派遣所在地辖区民警汇报
                    //查询派遣信息
                    DispatcherVO dispatcherVO = baseMapper.getDispatcherInfoByUserId(userId);
                    list = baseMapper.getWorkReportInfos(null, null, dispatcherVO.getJurisdiction());
                }
                if (user.getDispatch().equals("1")){
                    //未派遣或已派遣结束，向单位所在辖区民警汇报
                    Information information = new Information();
                    information.setDepartmentid(user.getDeptId());
                    Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
                    list = baseMapper.getWorkReportInfos(type,null, one.getJurisdiction());
                }
            }else {
                //未派遣或已派遣结束，向单位所在辖区民警汇报
                Information information = new Information();
                information.setDepartmentid(user.getDeptId());
                Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
                list = baseMapper.getWorkReportInfos(type,null, one.getJurisdiction());
            }

        }
        //民警对民警
        if (Integer.parseInt(type)==4){