Commit 953310f5 authored by xd's avatar xd

代码整理

parent 45b1b801
package com.tanpu.feo.feojob.mapper; package com.tanpu.feo.feojob.mapper.jyzy;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
package com.tanpu.feo.feojob.mapper; package com.tanpu.feo.feojob.mapper.jyzy;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
package com.tanpu.feo.feojob.mapper; package com.tanpu.feo.feojob.mapper.jyzy;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
...@@ -9,6 +9,9 @@ import com.tanpu.feo.feojob.dto.OrgInfoDto; ...@@ -9,6 +9,9 @@ import com.tanpu.feo.feojob.dto.OrgInfoDto;
import com.tanpu.feo.feojob.dto.OrgSyncDto; import com.tanpu.feo.feojob.dto.OrgSyncDto;
import com.tanpu.feo.feojob.dto.WorkDataDto; import com.tanpu.feo.feojob.dto.WorkDataDto;
import com.tanpu.feo.feojob.entity.*; import com.tanpu.feo.feojob.entity.*;
import com.tanpu.feo.feojob.service.jyzy.JyzyOrgService;
import com.tanpu.feo.feojob.service.jyzy.JyzyTeamService;
import com.tanpu.feo.feojob.service.jyzy.JyzyUserInfoService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
package com.tanpu.feo.feojob.service; package com.tanpu.feo.feojob.service.jyzy;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.tanpu.feo.feojob.mapper.JyzyOrgMapper; import com.tanpu.feo.feojob.mapper.jyzy.JyzyOrgMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
package com.tanpu.feo.feojob.service; package com.tanpu.feo.feojob.service.jyzy;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.tanpu.feo.feojob.entity.JyzyTeamEntity; import com.tanpu.feo.feojob.entity.JyzyTeamEntity;
import com.tanpu.feo.feojob.mapper.JyzyTeamMapper; import com.tanpu.feo.feojob.mapper.jyzy.JyzyTeamMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
package com.tanpu.feo.feojob.service; package com.tanpu.feo.feojob.service.jyzy;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.tanpu.feo.feojob.entity.JyzyUserInfoEntity; import com.tanpu.feo.feojob.entity.JyzyUserInfoEntity;
import com.tanpu.feo.feojob.mapper.JyzyUserInfoMapper; import com.tanpu.feo.feojob.mapper.jyzy.JyzyUserInfoMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -28,7 +28,8 @@ public class JyzyUserInfoService { ...@@ -28,7 +28,8 @@ public class JyzyUserInfoService {
private JyzyUserInfoMapper JyzyUserInfoMapper; private JyzyUserInfoMapper JyzyUserInfoMapper;
public List<JyzyUserInfoEntity> getUserListByOrgId(String orgId) { public List<JyzyUserInfoEntity> getUserListByOrgId(String orgId) {
LambdaQueryWrapper<JyzyUserInfoEntity> queryWrapper = Wrappers.lambdaQuery(JyzyUserInfoEntity.class).eq(JyzyUserInfoEntity::getOrgId, orgId) LambdaQueryWrapper<JyzyUserInfoEntity> queryWrapper = Wrappers.lambdaQuery(JyzyUserInfoEntity.class)
.eq(JyzyUserInfoEntity::getOrgId, orgId)
.eq(JyzyUserInfoEntity::getDeletetag, "0").ne(JyzyUserInfoEntity::getUiShenfen, 2); .eq(JyzyUserInfoEntity::getDeletetag, "0").ne(JyzyUserInfoEntity::getUiShenfen, 2);
return JyzyUserInfoMapper.selectList(queryWrapper); return JyzyUserInfoMapper.selectList(queryWrapper);
} }
......
...@@ -3,12 +3,13 @@ package com.tanpu.feo.feojob; ...@@ -3,12 +3,13 @@ package com.tanpu.feo.feojob;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.tanpu.feo.feojob.entity.*; import com.tanpu.feo.feojob.entity.*;
import com.tanpu.feo.feojob.service.*; import com.tanpu.feo.feojob.service.*;
import com.tanpu.feo.feojob.service.jyzy.JyzyOrgService;
import com.tanpu.feo.feojob.service.jyzy.JyzyTeamService;
import com.tanpu.feo.feojob.service.jyzy.JyzyUserInfoService;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import java.util.List;
@SpringBootTest @SpringBootTest
class FeoJobApplicationTests { class FeoJobApplicationTests {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment