Niko
/
shuili_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

dev_kxc
xzt 1 year ago
parent
66929ca33f 9e37f43e6b
commit
07afa6bf69
18 changed files with 236 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java
  2. 18
      jwtech-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java
  3. 24
      jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
  4. 40
      jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java
  5. 34
      jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java
  6. 15
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java
  7. 18
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java
  8. 15
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java
  9. 16
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java
  10. 18
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java
  11. 3
      jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java
  12. 1
      jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRegulatoryInspectionsMapper.java
  13. 15
      jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java
  14. 5
      jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
  15. 4
      jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml
  16. 5
      jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml
  17. 32
      jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
  18. 2
      jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiRegulatoryInspectionsMapper.xml

13
jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java
View File

@ -50,7 +50,7 @@ public class WaterScheduled {
SysRoleService roleService;
@Scheduled(cron = "0 * * * * ?")
@Scheduled(cron = "0 0/10 * * * ? ")
public void userScheduled(){
log.info("----------------------开始执行用户同步功能----------------------------");
WaterResult waterResult = waterRequestUtil.usersPage();
@ -72,7 +72,6 @@ public class WaterScheduled {
user.setId(IdUtils.fastSimpleUUID());
user.setIsPcUser("0");
user.setDelFlag("0");
user.setUserType("00");
user.setMd5(MD5Util.MD5Encode(singleUser.toString(), "utf-8"));
}else {
String md = MD5Util.MD5Encode(singleUser.toString(), "utf-8");
@ -83,6 +82,12 @@ public class WaterScheduled {
SingleOrg org = singleUser.getOrg();
if(org!=null){
user.setDeptId(org.getId());
String type = org.getType();
if(type.equals("GA")){
user.setUserType("00");
}else if(type.equals("SVA")){
user.setUserType("01");
}
}
user.setPhonenumber(singleUser.getPhone());
user.setNickName(singleUser.getName());
@ -110,7 +115,7 @@ public class WaterScheduled {
/**
*
*/
@Scheduled(cron = "0 * * * * ?")
@Scheduled(cron = "0 0/10 * * * ? ")
public void orgScheduled(){
log.info("----------------------开始执行部门同步功能----------------------------");
WaterResult waterResult = waterRequestUtil.getOrgPage();
@ -167,7 +172,7 @@ public class WaterScheduled {
}
}
@Scheduled(cron = "0 * * * * ?")
@Scheduled(cron = "0 0/10 * * * ? ")
public void roleScheduled(){
log.info("----------------------开始执行角色同步功能----------------------------");
WaterResult rolePage = waterRequestUtil.getRolePage();

18
jwtech-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java
View File

@ -81,7 +81,7 @@ public class CmsCallBackController {
user.setId(IdUtils.fastSimpleUUID());
user.setIsPcUser("0");
user.setDelFlag("0");
user.setUserType("04");
user.setPhonenumber(singleUser.getPhone());
user.setNickName(singleUser.getName());
user.setUserName(singleUser.getUsername());
@ -95,6 +95,16 @@ public class CmsCallBackController {
}else {
user.setStatus("1");
}
SingleOrg org = singleUser.getOrg();
if(org!=null){
user.setDeptId(org.getId());
String orgType = org.getType();
if(orgType.equals("GA")){
user.setUserType("00");
}else if(orgType.equals("SVA")){
user.setUserType("01");
}
}
if(CollectionUtil.isNotEmpty(singleUser.getRoleList())) {
List<String> collect = singleUser.getRoleList().stream().map(singleRole -> singleRole.getId()).collect(Collectors.toList());
user.setRoleIds(collect.toArray(new String[collect.size()]));
@ -111,6 +121,12 @@ public class CmsCallBackController {
SingleOrg org = singleUser.getOrg();
if(org!=null){
user.setDeptId(org.getId());
String orgType = org.getType();
if(orgType.equals("GA")){ //政务
user.setUserType("00");
}else if(orgType.equals("SVA")){ //服务
user.setUserType("01");
}
}
user.setPhonenumber(singleUser.getPhone());
user.setNickName(singleUser.getName());

24
jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
View File

@ -35,6 +35,7 @@ import com.kms.framework.manager.factory.AsyncFactory;
import com.kms.framework.web.service.SysPermissionService;
import com.kms.system.domain.CmsTag;
import com.kms.system.domain.SysRoleMenu;
import com.kms.system.domain.vo.RouterVo;
import com.kms.system.service.SysMenuService;
import com.kms.system.service.SysRoleMenuService;
import com.kms.system.service.SysRoleService;
@ -221,13 +222,31 @@ public class SysLoginController extends BaseController {
userService.updateWithReids(sysUser);
ajax.put("token",tokenValue);
ajax.put("authorization",token);
RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue+"&page="+page);
ModelAndView modelAndView = new ModelAndView(redirectView);
try {
countDownLatch.await();
} catch (InterruptedException e) {
e.printStackTrace();
}
// if(StringUtils.isEmpty(page)){
// List<SysMenu> menus = menuService.selectMenuTreeByUserId(sysUser.getId());
// List<RouterVo> routerVos = menuService.buildMenus(menus);
// StringBuffer stringBuffer = new StringBuffer();
// for (RouterVo routerVo : routerVos) {
// stringBuffer.append("/"+routerVo.getPath());
// List<RouterVo> children = routerVo.getChildren();
// if(CollectionUtil.isEmpty(children)){
// continue;
// }else {
// RouterVo vo = children.get(0);
// List<RouterVo> childrenTwo = vo.getChildren();
// if(CollectionUtil.isEmpty(childrenTwo)){
//
// }
// }
// }
// }
RedirectView redirectView = new RedirectView(redirect+"?token="+tokenValue+"&page="+page);
ModelAndView modelAndView = new ModelAndView(redirectView);
return modelAndView;
}
@ -279,7 +298,6 @@ public class SysLoginController extends BaseController {
@Transactional
public void run() {
try {
System.out.println("---------------------------------------------------");
WaterResult result = waterRequestUtil.getUserResource(token);
List<SingleMenu> singleMenus = JSONObject.parseArray(result.getData(), SingleMenu.class);
List<SingleMenu> singleAllMenus = new ArrayList<>();

40
jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java
View File

@ -4,10 +4,14 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.google.common.base.Joiner;
import com.kms.config.WaterRequestUtil;
import com.kms.config.WaterResult;
import com.kms.config.singleDomain.SingleMenu;
import com.kms.config.singleDomain.SingleUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
@ -47,13 +51,45 @@ public class TestController extends BaseController
@GetMapping("test")
public WaterResult test(){
WaterResult waterResult = waterRequestUtil.getUserResource("bearer b6f84142-5a1a-4726-acff-3cc7344bb737");
String data = waterResult.getData();
WaterResult waterResult = waterRequestUtil.getOrgPage();
List<SingleMenu> singleMenus = JSONObject.parseArray(waterResult.getData(), SingleMenu.class);
List<SingleMenu> singleAllMenus = new ArrayList<>();
setChildren(singleMenus,singleAllMenus);
List<String> collect = singleAllMenus.stream().map(singleMenu -> singleMenu.getName()).collect(Collectors.toList());
// String records = JSONObject.parseObject(data).getString("records");
// List<SingleUser> singleUserList = JSONObject.parseArray(records, SingleUser.class);
String join = Joiner.on(",").join(collect);
System.out.println(join);
return waterResult;
}
public static void setChildren(List<SingleMenu> singleMenus,List<SingleMenu> singleAllMenus){
if(CollectionUtil.isNotEmpty(singleMenus)) {
for (SingleMenu singleMenu :
singleMenus) { //剔除掉不符合的
if(singleMenu.getVisible()!=null&&singleMenu.getStatus()!=null) {
if (singleMenu.getStatus().equals("1")) {
singleAllMenus.add(singleMenu);
}
}
if (CollectionUtil.isNotEmpty(singleMenu.getChildren())) {
List<SingleMenu> children = singleMenu.getChildren();
for (SingleMenu child : children) {
if(singleMenu.getVisible()!=null&&singleMenu.getStatus()!=null) {
if (singleMenu.getStatus().equals("1")) {
singleAllMenus.add(child);
}
}
if(CollectionUtil.isNotEmpty(child.getChildren())) {
setChildren(child.getChildren(),singleAllMenus);
}
}
}
}
}
}
@ApiOperation("获取用户列表")
@GetMapping("/list")
public AjaxResult userList()

34
jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java
View File

@ -106,7 +106,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
SysUser sysUser = UserUtils.getUser();
BsSgcjsjdBuiProInfo data = sp.getData();
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
String deptId = sysUser.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
data.setAdcd(xzqhId);
}
Map<String, Object> params = sp.getParams();
assert sysUser != null;
@ -115,11 +120,11 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
if (ObjectUtil.isNull(params)) {
list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
sysXzqhService.getSubString(sp.getData().getAdcd()),
sysXzqhService.getSubString(data.getAdcd()),
"create_time", sp.getPageNum(), sp.getPageSize());
} else {
list = bsSgcjsjdBuiProInfoMapper.getByUserPro(sysUser.getId(), sysUser.getUserType(), data.getId(),
data.getProjectName(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
data.getProjectName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
}
Page<BsSgcjsjdBuiProInfo> page = new Page<>();
@ -156,7 +161,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
SysUser sysUser = UserUtils.getUser();
BsSgcjsjdBuiProInfo data = sp.getData();
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
String deptId = sysUser.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
data.setAdcd(xzqhId);
}
Map<String, Object> params = sp.getParams();
String isMajor = null;
@ -174,12 +184,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
}
assert sysUser != null;
// assert sysUser != null;
IPage<BsSgcjsjdBuiProInfo> list = null;
list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType,
sysXzqhService.getSubString(sp.getData().getAdcd()),
sysXzqhService.getSubString(data.getAdcd()),
"create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
@ -242,7 +252,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
SysUser sysUser = UserUtils.getUser();
BsSgcjsjdBuiProInfo data = sp.getData();
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
String deptId = sysUser.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
data.setAdcd(xzqhId);
}
Map<String, Object> params = sp.getParams();
String isMajor = null;
@ -264,8 +279,9 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
IPage<BsSgcjsjdBuiProInfo> list = null;
list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType,
sysXzqhService.getSubString(sp.getData().getAdcd()),
list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),
sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType,
sysXzqhService.getSubString(data.getAdcd()),
"create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));

15
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java
View File

@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jianwei.common.core.domain.ConditionView;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysUser;
import com.kms.common.utils.UserUtils;
import com.kms.earlyStage.domain.SpecialProjectInfo;
import com.kms.earlyStage.domain.SpecialProjectProposal;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -35,12 +37,19 @@ public class SpecialProjectFeasibilityService extends BaseService<SpecialProject
@Autowired
private SysXzqhService sysXzqhService;
@Autowired
private SysDeptService sysDeptService;
public IPage selectPage(SearchParam<SpecialProjectFeasibility> sp) {
SysUser sysUser = UserUtils.getUser();
SpecialProjectFeasibility data = sp.getData();
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
String deptId = sysUser.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
data.setAdcd(xzqhId);
}
Map<String, Object> params = sp.getParams();
ConditionView cv = sp.getCv();
@ -50,10 +59,10 @@ public class SpecialProjectFeasibilityService extends BaseService<SpecialProject
if (ObjectUtil.isNull(params)) {
list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
sysXzqhService.getSubString(data.getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
}else {
list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
}
return list;

18
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java
View File

@ -8,10 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysUser;
import com.kms.common.utils.UserUtils;
import com.kms.earlyStage.domain.SpecialProjectInfo;
import com.kms.earlyStage.mapper.SpecialProjectInfoMapper;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -36,6 +38,9 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
@Autowired
private SysXzqhService sysXzqhService;
@Autowired
private SysDeptService sysDeptService;
/*public IPage selectPage(SearchParam<SpecialProjectInfo> sp,String adcd){
SpecialProjectInfo data = sp.getData();
@ -66,23 +71,30 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
SpecialProjectInfo data = sp.getData();
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
String deptId = sysUser.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
data.setAdcd(xzqhId);
}
Map<String, Object> params = sp.getParams();
assert sysUser != null;
List<SpecialProjectInfo> list = null;
IPage<SpecialProjectInfo> list1 = null;
if (ObjectUtil.isNull(params)) {
list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(),
data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), "create_time");
data.getProjectType(), sysXzqhService.getSubString(data.getAdcd()), "create_time");
} else {
list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),
sysUser.getId(), sysUser.getUserType(),
data.getId(),
data.getProjectName(),
data.getProNo(),
data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"));
data.getProjectType(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"));
}

15
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java
View File

@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysUser;
import com.kms.common.utils.UserUtils;
import com.kms.earlyStage.domain.SpecialProjectInfo;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -33,10 +35,19 @@ public class SpecialProjectPlanInfoService extends BaseService<SpecialProjectPla
@Autowired
private SysXzqhService sysXzqhService;
@Autowired
private SysDeptService sysDeptService;
public IPage selectPage(SearchParam<SpecialProjectPlanInfo> sp){
SysUser sysUser = UserUtils.getUser();
SpecialProjectPlanInfo data = sp.getData();
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
String deptId = sysUser.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
data.setAdcd(xzqhId);
}
Map<String, Object> params = sp.getParams();
assert sysUser != null;
@ -44,10 +55,10 @@ public class SpecialProjectPlanInfoService extends BaseService<SpecialProjectPla
if (ObjectUtil.isNull(params)) {
list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(),
data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
data.getPlanType(),sysXzqhService.getSubString(data.getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
}else {
list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(),
data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
data.getPlanType(),sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
}

16
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java
View File

@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysUser;
import com.jianwei.common.mybaitsplus.BeanToWrapper;
import com.kms.common.utils.UserUtils;
import com.kms.earlyStage.domain.SpecialProjectFeasibility;
import com.kms.earlyStage.domain.SpecialProjectInfo;
import com.kms.earlyStage.domain.SpecialProjectPlanInfo;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -36,12 +38,20 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
@Autowired
private SysXzqhService sysXzqhService;
@Autowired
private SysDeptService sysDeptService;
public IPage selectPage(SearchParam<SpecialProjectPreDesign> sp) {
SysUser sysUser = UserUtils.getUser();
SpecialProjectPreDesign data = sp.getData();
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
String deptId = sysUser.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
data.setAdcd(xzqhId);
}
Map<String, Object> params = sp.getParams();
@ -54,10 +64,10 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
if (ObjectUtil.isNull(params)) {
list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
sysXzqhService.getSubString(data.getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
}else {
list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
}

18
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java
View File

@ -8,11 +8,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jianwei.common.core.domain.ConditionView;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysUser;
import com.jianwei.common.mybaitsplus.BeanToWrapper;
import com.kms.common.utils.UserUtils;
import com.kms.earlyStage.domain.SpecialProjectInfo;
import com.kms.earlyStage.domain.SpecialProjectPlanInfo;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -38,6 +40,9 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
@Autowired
private SysXzqhService sysXzqhService;
@Autowired
private SysDeptService sysDeptService;
public List<SpecialProjectProposal> geProCodeList(String proNo) {
List<SpecialProjectProposal> list=specialProjectProposalMapper.geProCodeList(proNo);
@ -49,7 +54,12 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
SysUser sysUser = UserUtils.getUser();
SpecialProjectProposal data = sp.getData();
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
String deptId = sysUser.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
data.setAdcd(xzqhId);
}
ConditionView cv = sp.getCv();
Map<String, Object> params = sp.getParams();
@ -60,7 +70,7 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
if (ObjectUtil.isNull(data.getGetList())) {
LambdaQueryWrapper<SpecialProjectProposal> wrapper = Wrappers.lambdaQuery(SpecialProjectProposal.class).like(data.getProjectName() != null, SpecialProjectProposal::getProjectName, data.getProjectName())
.like(data.getProjectCode() != null, SpecialProjectProposal::getProjectCode, data.getProjectCode())
.likeRight(data.getAdcd() != null, SpecialProjectProposal::getAdcd, sysXzqhService.getSubString(sp.getData().getAdcd()));
.likeRight(data.getAdcd() != null, SpecialProjectProposal::getAdcd, sysXzqhService.getSubString(data.getAdcd()));
return specialProjectProposalMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), wrapper);
}
@ -68,10 +78,10 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
if (ObjectUtil.isNull(params)) {
list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
data.getProjectCode(),sysXzqhService.getSubString(data.getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
}else {
list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
data.getProjectCode(),sysXzqhService.getSubString(data.getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
}

3
jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java
View File

@ -88,4 +88,7 @@ public class BsSgcJsjdBuiRegulatoryInspections extends BaseEntity
@TableField(exist = false)
private String projectName;
@TableField(exist = false)
private String adcd;
}

1
jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRegulatoryInspectionsMapper.java
View File

@ -18,6 +18,7 @@ public interface BsSgcJsjdBuiRegulatoryInspectionsMapper extends BaseMapper<BsSg
List<BsSgcJsjdBuiRegulatoryInspections> getByUserPro(@Param("userId") String userId,
@Param("userType") String userType,
@Param("adcd") String adcd,
@Param("id") String id1,
@Param("projectName") String projectName,
@Param("inspectionTypes") String inspectionTypes,

15
jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java
View File

@ -4,9 +4,11 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysUser;
import com.kms.common.utils.UserUtils;
import com.kms.earlyStage.domain.SpecialProjectPlanInfo;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -29,6 +31,9 @@ public class BsSgcJsjdBuiRegulatoryInspectionsService extends BaseService<BsSgcJ
@Autowired
private BsSgcJsjdBuiRegulatoryInspectionsMapper bsSgcJsjdBuiRegulatoryInspectionsMapper;
@Autowired
private SysDeptService sysDeptService;
@Autowired
private SysXzqhService sysXzqhService;
@ -36,6 +41,12 @@ public class BsSgcJsjdBuiRegulatoryInspectionsService extends BaseService<BsSgcJ
SysUser sysUser = UserUtils.getUser();
BsSgcJsjdBuiRegulatoryInspections data = sp.getData();
if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
String deptId = sysUser.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
data.setAdcd(xzqhId);
}
Map<String, Object> params = sp.getParams();
assert sysUser != null;
@ -43,11 +54,11 @@ public class BsSgcJsjdBuiRegulatoryInspectionsService extends BaseService<BsSgcJ
if (ObjectUtil.isNull(params)) {
list = bsSgcJsjdBuiRegulatoryInspectionsMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),
list = bsSgcJsjdBuiRegulatoryInspectionsMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),sysXzqhService.getSubString(data.getAdcd()),
data.getId(),data.getProjectName(),data.getInspectionTypes(),"create_time",sp.getPageNum(),
sp.getPageSize());
}else {
list = bsSgcJsjdBuiRegulatoryInspectionsMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),
list = bsSgcJsjdBuiRegulatoryInspectionsMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),sysXzqhService.getSubString(data.getAdcd()),
data.getId(),data.getProjectName(),data.getInspectionTypes(),(String)params.get("orderBy"),
sp.getPageNum(),sp.getPageSize());
}

5
jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
View File

@ -163,7 +163,6 @@
<select id="selectManagePage" resultMap="projectManage">
<include refid="projectMangeInfo"></include>
<if test="userType==01">
WHERE
@ -200,7 +199,9 @@
<if test="projectType!=null and projectType!=''">
and pi.project_type=#{projectType}
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
<if test="adcd!=null and adcd !=''">
and pp.adcd like concat(#{adcd},'%')
</if>
</where>
order by pi.${orderBy} desc
</if>

4
jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml
View File

@ -76,7 +76,9 @@
<if test="projectCode!=null and projectCode!=''">
and pp.project_code like concat('%',#{projectCode},'%')
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
<if test="adcd!=null and adcd !=''">
and pp.adcd like concat(#{adcd},'%')
</if>
</where>
order by ${orderBy} desc
</if>

5
jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml
View File

@ -73,8 +73,9 @@
<if test="projectName!=null and projectName!=''">
and pp.project_name like concat('%',#{projectName},'%')
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
<if test="adcd!=null and adcd !=''">
and pp.adcd like concat(#{adcd},'%')
</if>
</where>
order by da.${orderBy} desc
</if>

32
jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml
View File

@ -65,6 +65,36 @@
<select id="getByUser" resultMap="EnterpriseInfo">
<include refid="info"></include>
<if test="userType==01">
WHERE
unified_social_credit_code IN (
SELECT
sd.unified_social_credit_code
FROM
sys_user su left join sys_dept sd on su.dept_id=sd.id
<where>
<if test="userId!=null and userId!=''">
AND su.id=#{userId})
</if>
<if test="enterpriseName!=null and enterpriseName!=''">
and enterprise_name like concat('%',#{enterpriseName},'%')
</if>
</where>
order by ${orderBy} desc
</if>
<if test="userType==00">
<where>
<if test="enterpriseName!=null and enterpriseName!=''">
and enterprise_name like concat('%',#{enterpriseName},'%')
</if>
<if test="adcd!=null and adcd !=''">
and adcd like concat(#{adcd},'%')
</if>
</where>
order by ${orderBy} desc
</if>
<!--<if test="userType==01">
WHERE
ei.PRO_NO IN (
SELECT
@ -113,7 +143,7 @@
</where>
order by ${orderBy} desc
</if>
</if>-->
</select>
<select id="listProject" resultMap="EnterpriseInfo">

2
jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiRegulatoryInspectionsMapper.xml
View File

@ -47,6 +47,7 @@
<if test="id!=null and id!=''">
and id=#{id}
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where>
order by ri.${orderBy} desc LIMIT #{pageNum},#{pageSize};
</if>
@ -58,6 +59,7 @@
<if test="id!=null and id!=''">
and id=#{id}
</if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where>
order by ri.${orderBy} desc LIMIT #{pageNum},#{pageSize};
</if>

Write Preview
Loading…
Cancel
Save