Skip to content

涂亚平 / laowu

Go to a project
Commit dbbb4ef4 by 涂亚平
Options

准备周六在家加班......

1 parent 1687837a
Inline Side-by-side
Showing with 280 additions and 131 deletions
logs/springboot-logback-info.log
This diff could not be displayed because it is too large.
src/main/java/com/laowu/controller/PositionAloneInfoController.java
...@@ -45,7 +45,7 @@ public class PositionAloneInfoController { ...@@ -45,7 +45,7 @@ public class PositionAloneInfoController {
@PostMapping("addRequirement") @PostMapping("addRequirement")
@ApiOperation("添加独立职位需求管理 {companyId positionStatus requireCount positionName recruitType jobSortId" + @ApiOperation("添加独立职位需求管理 {companyId positionStatus requireCount positionName recruitType jobSortId" +
"positionId province city county address jobId positionDesc positionRequire startSalary endSalary infoOrigin}") "positionId province city county address jobId positionDesc positionRequire startSalary endSalary infoOrigin stationId}")
public ResponseVO addRequirement(@RequestBody AddAloneDTO addAloneDTO){ public ResponseVO addRequirement(@RequestBody AddAloneDTO addAloneDTO){
return ResponseData.generateCreatedResponse(0,positionAloneInfoService.addRequirement(addAloneDTO)); return ResponseData.generateCreatedResponse(0,positionAloneInfoService.addRequirement(addAloneDTO));
} }
......
src/main/java/com/laowu/controller/PositionRequireItemController.java
...@@ -50,7 +50,7 @@ public class PositionRequireItemController { ...@@ -50,7 +50,7 @@ public class PositionRequireItemController {
} }
@PostMapping("addRequirements") @PostMapping("addRequirements")
@ApiOperation("添加需求 id userId module itemName itemStatus companyId jobId infoOrigin province city county") @ApiOperation("添加需求 id userId module itemName itemStatus companyId jobId infoOrigin province city county stationId")
public ResponseVO addRequirements(@RequestBody AddRequirementsDTO addRequirementsDTO) { public ResponseVO addRequirements(@RequestBody AddRequirementsDTO addRequirementsDTO) {
return ResponseData.generateCreatedResponse(0, positionRequireItemService.addRequirements(addRequirementsDTO)); return ResponseData.generateCreatedResponse(0, positionRequireItemService.addRequirements(addRequirementsDTO));
} }
......
src/main/java/com/laowu/controller/TeamDictController.java
...@@ -2,7 +2,6 @@ package com.laowu.controller; ...@@ -2,7 +2,6 @@ package com.laowu.controller;
import com.laowu.dto.team.*; import com.laowu.dto.team.*;
import com.laowu.model.LibGeoLocationDO;
import com.laowu.model.TeamDictDO; import com.laowu.model.TeamDictDO;
import com.laowu.service.TeamDictService; import com.laowu.service.TeamDictService;
import com.laowu.util.ResponseData; import com.laowu.util.ResponseData;
...@@ -115,10 +114,4 @@ public class TeamDictController { ...@@ -115,10 +114,4 @@ public class TeamDictController {
return ResponseData.generateCreatedResponse(0,teamDictService.memberManagementCount(memberManagementDTO)); return ResponseData.generateCreatedResponse(0,teamDictService.memberManagementCount(memberManagementDTO));
} }
@PostMapping("homepage")
@ApiOperation("主页 province city county")
public ResponseVO homepage(@RequestBody LibGeoLocationDO libGeoLocationDO){
return ResponseData.generateCreatedResponse(0,teamDictService.homepage(libGeoLocationDO));
}
} }
src/main/java/com/laowu/controller/WorkstationDictController.java
package com.laowu.controller; package com.laowu.controller;
import com.laowu.dto.station.ProvinceStationsDTO;
import com.laowu.dto.station.StationAccountDTO; import com.laowu.dto.station.StationAccountDTO;
import com.laowu.dto.station.StationsDTO; import com.laowu.dto.station.StationsDTO;
import com.laowu.dto.station.UpdateAdministerDTO; import com.laowu.dto.station.UpdateAdministerDTO;
...@@ -70,9 +71,9 @@ public class WorkstationDictController { ...@@ -70,9 +71,9 @@ public class WorkstationDictController {
} }
@PostMapping("provinceStations") @PostMapping("provinceStations")
@ApiOperation("以省为单位查看工作站 ") @ApiOperation("以省为单位查看工作站 ")
public ResponseVO provinceStations(){ public ResponseVO provinceStations(@RequestBody ProvinceStationsDTO provinceStationsDTO){
return ResponseData.generateCreatedResponse(0,workstationDictService.provinceStations()); return ResponseData.generateCreatedResponse(0,workstationDictService.provinceStations(provinceStationsDTO));
} }
@PostMapping("updateAdminister") @PostMapping("updateAdminister")
...@@ -87,4 +88,11 @@ public class WorkstationDictController { ...@@ -87,4 +88,11 @@ public class WorkstationDictController {
return ResponseData.generateCreatedResponse(0,workstationDictService.addAdminister(updateAdministerDTO)); return ResponseData.generateCreatedResponse(0,workstationDictService.addAdminister(updateAdministerDTO));
} }
@PostMapping("homepage")
@ApiOperation("主页 id 工作站id")
public ResponseVO homepage(@RequestBody WorkstationDictDO workstationDictDO){
return ResponseData.generateCreatedResponse(0,workstationDictService.homepage(workstationDictDO));
}
} }
src/main/java/com/laowu/dto/position/AddAloneDTO.java
...@@ -10,4 +10,5 @@ public class AddAloneDTO extends PositionAloneInfoDO { ...@@ -10,4 +10,5 @@ public class AddAloneDTO extends PositionAloneInfoDO {
private String module; private String module;
private Long stationId;
} }
src/main/java/com/laowu/dto/position/AddRequirementsDTO.java
...@@ -9,4 +9,6 @@ public class AddRequirementsDTO extends PositionRequireItemDO { ...@@ -9,4 +9,6 @@ public class AddRequirementsDTO extends PositionRequireItemDO {
private Long userId; private Long userId;
private String module; private String module;
private Long stationId;
} }
src/main/java/com/laowu/dto/station/ProvinceStationsDTO.java 0 → 100644
package com.laowu.dto.station;
import lombok.Data;
@Data
public class ProvinceStationsDTO {
private Long userId;
}
src/main/java/com/laowu/mapper/WorkstationAdministersMapper.java
...@@ -24,7 +24,6 @@ public interface WorkstationAdministersMapper extends BaseMapper<WorkstationAdmi ...@@ -24,7 +24,6 @@ public interface WorkstationAdministersMapper extends BaseMapper<WorkstationAdmi
*/ */
List<AdministerVO> administers(Long id); List<AdministerVO> administers(Long id);
/** /**
* 根据人去找工作站信息 * 根据人去找工作站信息
*/ */
......
src/main/java/com/laowu/mapper/WorkstationDictMapper.java
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.laowu.model.WorkstationDictDO; import com.laowu.model.WorkstationDictDO;
import com.laowu.vo.station.StationAccountVO; import com.laowu.vo.station.StationAccountVO;
import com.laowu.vo.station.StationsVO; import com.laowu.vo.station.StationsVO;
import com.laowu.vo.team.HomepageVO;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
...@@ -35,7 +36,11 @@ public interface WorkstationDictMapper extends BaseMapper<WorkstationDictDO> { ...@@ -35,7 +36,11 @@ public interface WorkstationDictMapper extends BaseMapper<WorkstationDictDO> {
/** /**
* 工作站主页 * 工作站主页
*/ */
void homepage(Long stationId); HomepageVO homepage(Long stationId);
/**
* 站长id 省 去查询工作站
*/
List<WorkstationDictDO> administerProvinceStations(String province,Long administerId);
} }
src/main/java/com/laowu/mapper/WorkstationMemberMappingMapper.java
...@@ -15,4 +15,6 @@ import org.springframework.stereotype.Repository; ...@@ -15,4 +15,6 @@ import org.springframework.stereotype.Repository;
@Repository @Repository
public interface WorkstationMemberMappingMapper extends BaseMapper<WorkstationMemberMappingDO> { public interface WorkstationMemberMappingMapper extends BaseMapper<WorkstationMemberMappingDO> {
} }
src/main/java/com/laowu/model/PositionAloneInfoDO.java
...@@ -107,4 +107,9 @@ public class PositionAloneInfoDO extends BaseModel { ...@@ -107,4 +107,9 @@ public class PositionAloneInfoDO extends BaseModel {
*/ */
private String infoOrigin; private String infoOrigin;
/**
* 源
*/
private Long originId;
} }
src/main/java/com/laowu/service/AdministerService.java
...@@ -28,4 +28,5 @@ public interface AdministerService extends IService<AdministerDO> { ...@@ -28,4 +28,5 @@ public interface AdministerService extends IService<AdministerDO> {
String updateAdminister(AdministerDO administerDO); String updateAdminister(AdministerDO administerDO);
String deleteAdminister(AdministerDO administerDO); String deleteAdminister(AdministerDO administerDO);
} }
src/main/java/com/laowu/service/TeamDictService.java
...@@ -3,7 +3,6 @@ package com.laowu.service; ...@@ -3,7 +3,6 @@ package com.laowu.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.laowu.dto.team.*; import com.laowu.dto.team.*;
import com.laowu.model.LibGeoLocationDO;
import com.laowu.model.MemberDictDO; import com.laowu.model.MemberDictDO;
import com.laowu.model.TeamDictDO; import com.laowu.model.TeamDictDO;
import com.laowu.vo.team.*; import com.laowu.vo.team.*;
...@@ -48,6 +47,6 @@ public interface TeamDictService extends IService<TeamDictDO> { ...@@ -48,6 +47,6 @@ public interface TeamDictService extends IService<TeamDictDO> {
TotalTeamsVO memberManagementCount(MemberManagementDTO memberManagementDTO); TotalTeamsVO memberManagementCount(MemberManagementDTO memberManagementDTO);
HomepageVO homepage(LibGeoLocationDO libGeoLocationDO);
} }
src/main/java/com/laowu/service/WorkstationDictService.java
...@@ -2,6 +2,7 @@ package com.laowu.service; ...@@ -2,6 +2,7 @@ package com.laowu.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.laowu.dto.station.ProvinceStationsDTO;
import com.laowu.dto.station.StationAccountDTO; import com.laowu.dto.station.StationAccountDTO;
import com.laowu.dto.station.StationsDTO; import com.laowu.dto.station.StationsDTO;
import com.laowu.dto.station.UpdateAdministerDTO; import com.laowu.dto.station.UpdateAdministerDTO;
...@@ -9,6 +10,7 @@ import com.laowu.model.AdministerDO; ...@@ -9,6 +10,7 @@ import com.laowu.model.AdministerDO;
import com.laowu.model.WorkstationDictDO; import com.laowu.model.WorkstationDictDO;
import com.laowu.vo.station.OneStationAccountVO; import com.laowu.vo.station.OneStationAccountVO;
import com.laowu.vo.station.ProvinceStationsVO; import com.laowu.vo.station.ProvinceStationsVO;
import com.laowu.vo.team.HomepageVO;
import java.util.List; import java.util.List;
...@@ -34,9 +36,11 @@ public interface WorkstationDictService extends IService<WorkstationDictDO> { ...@@ -34,9 +36,11 @@ public interface WorkstationDictService extends IService<WorkstationDictDO> {
OneStationAccountVO oneStationAccount(AdministerDO administerDO); OneStationAccountVO oneStationAccount(AdministerDO administerDO);
List<ProvinceStationsVO> provinceStations(); List<ProvinceStationsVO> provinceStations(ProvinceStationsDTO provinceStationsDTO);
String updateAdminister(UpdateAdministerDTO updateAdministerDTO); String updateAdminister(UpdateAdministerDTO updateAdministerDTO);
String addAdminister(UpdateAdministerDTO updateAdministerDTO); String addAdminister(UpdateAdministerDTO updateAdministerDTO);
HomepageVO homepage(WorkstationDictDO workstationDictDO);
} }
src/main/java/com/laowu/service/impl/AdministerServiceImpl.java
...@@ -8,8 +8,10 @@ import com.laowu.common.exception.HttpException; ...@@ -8,8 +8,10 @@ import com.laowu.common.exception.HttpException;
import com.laowu.dto.administer.AllDTO; import com.laowu.dto.administer.AllDTO;
import com.laowu.mapper.AdministerMapper; import com.laowu.mapper.AdministerMapper;
import com.laowu.mapper.RoleAdministerMappingMapper; import com.laowu.mapper.RoleAdministerMappingMapper;
import com.laowu.mapper.WorkstationAdministersMapper;
import com.laowu.model.AdministerDO; import com.laowu.model.AdministerDO;
import com.laowu.model.RoleAdministerMappingDO; import com.laowu.model.RoleAdministerMappingDO;
import com.laowu.model.WorkstationDictDO;
import com.laowu.service.AdministerService; import com.laowu.service.AdministerService;
import com.laowu.util.ConstantUtils; import com.laowu.util.ConstantUtils;
import com.laowu.util.JwtUtil; import com.laowu.util.JwtUtil;
...@@ -38,6 +40,9 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -38,6 +40,9 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
@Autowired @Autowired
private RoleAdministerMappingMapper roleAdministerMappingMapper; private RoleAdministerMappingMapper roleAdministerMappingMapper;
@Autowired
private WorkstationAdministersMapper workstationAdministersMapper;
public LoginVO login(AdministerDO administerDO) { public LoginVO login(AdministerDO administerDO) {
LoginVO login = new LoginVO(); LoginVO login = new LoginVO();
...@@ -93,6 +98,21 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -93,6 +98,21 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
if (null != roleAdministerMappingDO) { if (null != roleAdministerMappingDO) {
administerPermissionVO.setRole(roleAdministerMappingDO.getRoleId()); administerPermissionVO.setRole(roleAdministerMappingDO.getRoleId());
} }
//是不是管理员
int count = roleAdministerMappingMapper.selectCount(new QueryWrapper<RoleAdministerMappingDO>()
.lambda()
.eq(RoleAdministerMappingDO::getAdministerId,administerDO.getId())
.eq(RoleAdministerMappingDO::getRoleId,1));
if (count >0){
administerPermissionVO.setIsRole(true);
}else {
administerPermissionVO.setIsRole(false);
//站长所有的工作站
List<WorkstationDictDO> workstationDictDOS = workstationAdministersMapper.workstations(administerDO.getId());
administerPermissionVO.setWorkstationDictDOS(workstationDictDOS);
}
return administerPermissionVO; return administerPermissionVO;
} }
...@@ -113,6 +133,12 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis ...@@ -113,6 +133,12 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
administerDO.setStatus("正常"); administerDO.setStatus("正常");
administerDO.setPassword("123456"); administerDO.setPassword("123456");
this.baseMapper.insert(administerDO); this.baseMapper.insert(administerDO);
RoleAdministerMappingDO roleAdministerMappingDO = new RoleAdministerMappingDO();
roleAdministerMappingDO.setAdministerId(administerDO.getId());
roleAdministerMappingDO.setRoleId(2L);
roleAdministerMappingMapper.insert(roleAdministerMappingDO);
return ConstantUtils.ADD_SUCCESS; return ConstantUtils.ADD_SUCCESS;
} }
......
src/main/java/com/laowu/service/impl/PositionAloneInfoServiceImpl.java
...@@ -16,6 +16,7 @@ import com.laowu.vo.position.OneAloneRequirementVO; ...@@ -16,6 +16,7 @@ import com.laowu.vo.position.OneAloneRequirementVO;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
...@@ -68,6 +69,7 @@ public class PositionAloneInfoServiceImpl extends ServiceImpl<PositionAloneInfoM ...@@ -68,6 +69,7 @@ public class PositionAloneInfoServiceImpl extends ServiceImpl<PositionAloneInfoM
return ConstantUtils.DELETE_SUCCESS; return ConstantUtils.DELETE_SUCCESS;
} }
@Transactional(rollbackFor = Exception.class)
public String addRequirement(AddAloneDTO addAloneDTO) { public String addRequirement(AddAloneDTO addAloneDTO) {
PositionAloneInfoDO positionAloneInfoDO = new PositionAloneInfoDO(); PositionAloneInfoDO positionAloneInfoDO = new PositionAloneInfoDO();
...@@ -81,6 +83,15 @@ public class PositionAloneInfoServiceImpl extends ServiceImpl<PositionAloneInfoM ...@@ -81,6 +83,15 @@ public class PositionAloneInfoServiceImpl extends ServiceImpl<PositionAloneInfoM
positionAloneHistoryDO.setRequireId(positionAloneInfoDO.getId()); positionAloneHistoryDO.setRequireId(positionAloneInfoDO.getId());
positionAloneHistoryDO.setOpr("创建了独立职位需求信息"); positionAloneHistoryDO.setOpr("创建了独立职位需求信息");
positionAloneHistoryMapper.insert(positionAloneHistoryDO); positionAloneHistoryMapper.insert(positionAloneHistoryDO);
//添加映射
if (null != addAloneDTO.getStationId()){
WorkstationAloneMappingDO workstationAloneMappingDO = new WorkstationAloneMappingDO();
workstationAloneMappingDO.setStationId(addAloneDTO.getStationId());
workstationAloneMappingDO.setAloneId(positionAloneInfoDO.getId());
workstationAloneMappingMapper.insert(workstationAloneMappingDO);
}
return ConstantUtils.ADD_SUCCESS; return ConstantUtils.ADD_SUCCESS;
} }
......
src/main/java/com/laowu/service/impl/PositionRequireItemServiceImpl.java
...@@ -14,6 +14,7 @@ import com.laowu.vo.position.*; ...@@ -14,6 +14,7 @@ import com.laowu.vo.position.*;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
...@@ -132,12 +133,18 @@ public class PositionRequireItemServiceImpl extends ServiceImpl<PositionRequireI ...@@ -132,12 +133,18 @@ public class PositionRequireItemServiceImpl extends ServiceImpl<PositionRequireI
return ConstantUtils.SUCCESS_UPDATE; return ConstantUtils.SUCCESS_UPDATE;
} }
@Transactional(rollbackFor = Exception.class)
public String addRequirements(AddRequirementsDTO addRequirementsDTO) { public String addRequirements(AddRequirementsDTO addRequirementsDTO) {
PositionRequireItemDO positionRequireItemDO = new PositionRequireItemDO(); PositionRequireItemDO positionRequireItemDO = new PositionRequireItemDO();
BeanUtils.copyProperties(addRequirementsDTO,positionRequireItemDO); BeanUtils.copyProperties(addRequirementsDTO,positionRequireItemDO);
this.baseMapper.insert(positionRequireItemDO); this.baseMapper.insert(positionRequireItemDO);
WorkstationRequireMappingDO workstationRequireMappingDO = new WorkstationRequireMappingDO();
workstationRequireMappingDO.setStationId(addRequirementsDTO.getStationId());
workstationRequireMappingDO.setRequireId(positionRequireItemDO.getId());
workstationRequireMappingMapper.insert(workstationRequireMappingDO);
PositionRequireHistoryDO positionRequireHistoryDO = new PositionRequireHistoryDO(); PositionRequireHistoryDO positionRequireHistoryDO = new PositionRequireHistoryDO();
positionRequireHistoryDO.setRequireId(positionRequireHistoryDO.getId()); positionRequireHistoryDO.setRequireId(positionRequireHistoryDO.getId());
positionRequireHistoryDO.setAdministerId(addRequirementsDTO.getUserId()); positionRequireHistoryDO.setAdministerId(addRequirementsDTO.getUserId());
......
src/main/java/com/laowu/service/impl/TeamDictServiceImpl.java
...@@ -269,11 +269,4 @@ public class TeamDictServiceImpl extends ServiceImpl<TeamDictMapper, TeamDictDO> ...@@ -269,11 +269,4 @@ public class TeamDictServiceImpl extends ServiceImpl<TeamDictMapper, TeamDictDO>
return totalTeamsVO; return totalTeamsVO;
} }
public HomepageVO homepage(LibGeoLocationDO libGeoLocationDO) {
HomepageVO homepageVO = new HomepageVO();
return homepageVO;
}
} }
src/main/java/com/laowu/service/impl/WorkstationDictServiceImpl.java
...@@ -5,18 +5,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -5,18 +5,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.laowu.common.exception.HttpException; import com.laowu.common.exception.HttpException;
import com.laowu.dto.station.ProvinceStationsDTO;
import com.laowu.dto.station.StationAccountDTO; import com.laowu.dto.station.StationAccountDTO;
import com.laowu.dto.station.StationsDTO; import com.laowu.dto.station.StationsDTO;
import com.laowu.dto.station.UpdateAdministerDTO; import com.laowu.dto.station.UpdateAdministerDTO;
import com.laowu.mapper.AdministerMapper; import com.laowu.mapper.AdministerMapper;
import com.laowu.mapper.RoleAdministerMappingMapper;
import com.laowu.mapper.WorkstationAdministersMapper; import com.laowu.mapper.WorkstationAdministersMapper;
import com.laowu.mapper.WorkstationDictMapper; import com.laowu.mapper.WorkstationDictMapper;
import com.laowu.model.AdministerDO; import com.laowu.model.AdministerDO;
import com.laowu.model.RoleAdministerMappingDO;
import com.laowu.model.WorkstationAdministersDO; import com.laowu.model.WorkstationAdministersDO;
import com.laowu.model.WorkstationDictDO; import com.laowu.model.WorkstationDictDO;
import com.laowu.service.WorkstationDictService; import com.laowu.service.WorkstationDictService;
import com.laowu.util.ConstantUtils; import com.laowu.util.ConstantUtils;
import com.laowu.vo.station.*; import com.laowu.vo.station.*;
import com.laowu.vo.team.HomepageVO;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -41,6 +45,9 @@ public class WorkstationDictServiceImpl extends ServiceImpl<WorkstationDictMappe ...@@ -41,6 +45,9 @@ public class WorkstationDictServiceImpl extends ServiceImpl<WorkstationDictMappe
@Autowired @Autowired
private AdministerMapper administerMapper; private AdministerMapper administerMapper;
@Autowired
private RoleAdministerMappingMapper roleAdministerMappingMapper;
public IPage<StationsVO> stations(StationsDTO stationsDTO) { public IPage<StationsVO> stations(StationsDTO stationsDTO) {
Page pager = new Page(stationsDTO.getPageNum(), stationsDTO.getPageSize()); Page pager = new Page(stationsDTO.getPageNum(), stationsDTO.getPageSize());
...@@ -111,23 +118,40 @@ public class WorkstationDictServiceImpl extends ServiceImpl<WorkstationDictMappe ...@@ -111,23 +118,40 @@ public class WorkstationDictServiceImpl extends ServiceImpl<WorkstationDictMappe
return oneStationAccountVO; return oneStationAccountVO;
} }
public List<ProvinceStationsVO> provinceStations() { public List<ProvinceStationsVO> provinceStations(ProvinceStationsDTO provinceStationsDTO) {
List<ProvinceStationsVO> provinceStationsVOS = new ArrayList<>(); //判断该角色是管理员还是站长
int count = roleAdministerMappingMapper.selectCount(new QueryWrapper<RoleAdministerMappingDO>()
.lambda()
.eq(RoleAdministerMappingDO::getAdministerId,provinceStationsDTO.getUserId())
.eq(RoleAdministerMappingDO::getRoleId,1));
List<ProvinceStationsVO> provinceStationsVOS = new ArrayList<>();
//先查出所有省 //先查出所有省
List<String> provinces = this.baseMapper.provinces(); List<String> provinces = this.baseMapper.provinces();
if (count > 0){
//管理员
//省下面的工作站
for (String province : provinces) {
ProvinceStationsVO provinceStationsVO = new ProvinceStationsVO();
provinceStationsVO.setProvince(province);
List<WorkstationDictDO> workstationDictDOS = this.baseMapper.selectList(new QueryWrapper<WorkstationDictDO>()
.lambda()
.eq(WorkstationDictDO::getProvince, province));
provinceStationsVO.setWorkstationDictDOS(workstationDictDOS);
provinceStationsVOS.add(provinceStationsVO);
}
}else {
//站长
for (String province : provinces) {
ProvinceStationsVO provinceStationsVO = new ProvinceStationsVO();
provinceStationsVO.setProvince(province);
//省下面的工作站 List<WorkstationDictDO> workstationDictDOS = this.baseMapper.administerProvinceStations(province,provinceStationsDTO.getUserId());
for (String province : provinces) { provinceStationsVO.setWorkstationDictDOS(workstationDictDOS);
ProvinceStationsVO provinceStationsVO = new ProvinceStationsVO(); provinceStationsVOS.add(provinceStationsVO);
provinceStationsVO.setProvince(province); }
List<WorkstationDictDO> workstationDictDOS = this.baseMapper.selectList(new QueryWrapper<WorkstationDictDO>()
.lambda()
.eq(WorkstationDictDO::getProvince, province));
provinceStationsVO.setWorkstationDictDOS(workstationDictDOS);
provinceStationsVOS.add(provinceStationsVO);
} }
return provinceStationsVOS; return provinceStationsVOS;
...@@ -190,4 +214,10 @@ public class WorkstationDictServiceImpl extends ServiceImpl<WorkstationDictMappe ...@@ -190,4 +214,10 @@ public class WorkstationDictServiceImpl extends ServiceImpl<WorkstationDictMappe
return ConstantUtils.ADD_SUCCESS; return ConstantUtils.ADD_SUCCESS;
} }
public HomepageVO homepage(WorkstationDictDO workstationDictDO) {
return this.baseMapper.homepage(workstationDictDO.getId());
}
} }
src/main/java/com/laowu/service/impl/WorkstationRequireMappingServiceImpl.java
...@@ -8,14 +8,17 @@ import com.laowu.dto.station.RequiresDTO; ...@@ -8,14 +8,17 @@ import com.laowu.dto.station.RequiresDTO;
import com.laowu.dto.station.ShareDTO; import com.laowu.dto.station.ShareDTO;
import com.laowu.mapper.PositionItemInfoMapper; import com.laowu.mapper.PositionItemInfoMapper;
import com.laowu.mapper.PositionItemJobMappingMapper; import com.laowu.mapper.PositionItemJobMappingMapper;
import com.laowu.mapper.PositionRequireItemMapper;
import com.laowu.mapper.WorkstationRequireMappingMapper; import com.laowu.mapper.WorkstationRequireMappingMapper;
import com.laowu.model.LibJobSortDO; import com.laowu.model.LibJobSortDO;
import com.laowu.model.PositionRequireItemDO;
import com.laowu.model.WorkstationRequireMappingDO; import com.laowu.model.WorkstationRequireMappingDO;
import com.laowu.service.WorkstationRequireMappingService; import com.laowu.service.WorkstationRequireMappingService;
import com.laowu.util.ConstantUtils; import com.laowu.util.ConstantUtils;
import com.laowu.vo.position.PositionCountsVO; import com.laowu.vo.position.PositionCountsVO;
import com.laowu.vo.station.RequireStationsVO; import com.laowu.vo.station.RequireStationsVO;
import com.laowu.vo.station.RequiresVO; import com.laowu.vo.station.RequiresVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -39,6 +42,9 @@ public class WorkstationRequireMappingServiceImpl extends ServiceImpl<Workstatio ...@@ -39,6 +42,9 @@ public class WorkstationRequireMappingServiceImpl extends ServiceImpl<Workstatio
@Autowired @Autowired
private PositionItemJobMappingMapper positionItemJobMappingMapper; private PositionItemJobMappingMapper positionItemJobMappingMapper;
@Autowired
private PositionRequireItemMapper positionRequireItemMapper;
public IPage<RequiresVO> requires(RequiresDTO requiresDTO) { public IPage<RequiresVO> requires(RequiresDTO requiresDTO) {
Page pager = new Page(requiresDTO.getPageNum(), requiresDTO.getPageSize()); Page pager = new Page(requiresDTO.getPageNum(), requiresDTO.getPageSize());
...@@ -81,8 +87,15 @@ public class WorkstationRequireMappingServiceImpl extends ServiceImpl<Workstatio ...@@ -81,8 +87,15 @@ public class WorkstationRequireMappingServiceImpl extends ServiceImpl<Workstatio
if (newIds.size()>0){ if (newIds.size()>0){
for (Long id : newIds){ for (Long id : newIds){
PositionRequireItemDO positionRequireItemDO = positionRequireItemMapper.selectById(requireId);
PositionRequireItemDO positionRequireItemDO1 = new PositionRequireItemDO();
BeanUtils.copyProperties(positionRequireItemDO1,positionRequireItemDO);
positionRequireItemMapper.insert(positionRequireItemDO1);
WorkstationRequireMappingDO workstationRequireMappingDO = new WorkstationRequireMappingDO(); WorkstationRequireMappingDO workstationRequireMappingDO = new WorkstationRequireMappingDO();
workstationRequireMappingDO.setRequireId(requireId); workstationRequireMappingDO.setRequireId(positionRequireItemDO1.getId());
workstationRequireMappingDO.setStationId(id); workstationRequireMappingDO.setStationId(id);
this.baseMapper.insert(workstationRequireMappingDO); this.baseMapper.insert(workstationRequireMappingDO);
} }
......
src/main/java/com/laowu/vo/admin/AdministerPermissionVO.java
package com.laowu.vo.admin; package com.laowu.vo.admin;
import com.laowu.model.WorkstationDictDO;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -18,4 +19,6 @@ public class AdministerPermissionVO { ...@@ -18,4 +19,6 @@ public class AdministerPermissionVO {
private Boolean isRole; private Boolean isRole;
private List<PermissionsVO> permissions; private List<PermissionsVO> permissions;
private List<WorkstationDictDO> workstationDictDOS ;
} }
src/main/java/com/laowu/vo/team/HomepageVO.java
...@@ -4,4 +4,23 @@ import lombok.Data; ...@@ -4,4 +4,23 @@ import lombok.Data;
@Data @Data
public class HomepageVO { public class HomepageVO {
private String workstationName;
private String province;
private String city;
private String county;
private String memberCnt;
private String leaderCnt;
private String teamCnt;
private String companyCnt;
private String requireCnt;
} }
src/main/resources/mapper/WorkstationDictMapper.xml
...@@ -61,11 +61,13 @@ ...@@ -61,11 +61,13 @@
administer t1 administer t1
LEFT JOIN workstation_administers t2 ON t1.id = t2.administer_id LEFT JOIN workstation_administers t2 ON t1.id = t2.administer_id
LEFT JOIN workstation_dict t3 ON t2.workstation_id = t3.id LEFT JOIN workstation_dict t3 ON t2.workstation_id = t3.id
left join role_administer_mapping t4 on t1.id = t4.administer_id
WHERE WHERE
t1.delete_date IS NULL t1.delete_date IS NULL
AND t2.delete_date IS NULL AND t2.delete_date IS NULL
AND t3.delete_date IS NULL AND t3.delete_date IS NULL
<if test=" workingstationName!= null and workingstationName != ''"> and t4.role_id != 1
<if test=" workingstationName!= null and workingstationName != ''">
AND t3.workstation_name LIKE concat('%', #{workingstationName}, '%') AND t3.workstation_name LIKE concat('%', #{workingstationName}, '%')
</if> </if>
GROUP BY GROUP BY
...@@ -82,128 +84,144 @@ ...@@ -82,128 +84,144 @@
</select> </select>
<select id="homepage" parameterType="long"> <select id="homepage" parameterType="long" resultType="com.laowu.vo.team.HomepageVO">
SELECT SELECT
t1.workstation_name, t1.workstation_name,
CONCAT( t1.province, "-", t1.city, "-", t1.county ), t1.province,
IFNULL( t4.ct1, 0 ), t1.city,
IFNULL( t5.ct2, 0 ), t1.county,
IFNULL( t6.ct3, 0 ), IFNULL( t4.ct1, 0 ) AS memberCnt,
IFNULL( t7.ct4, 0 ), IFNULL( t5.ct2, 0 ) AS leaderCnt,
IFNULL( t8.ct5, 0 ) IFNULL( t6.ct3, 0 ) AS teamCnt,
IFNULL( t7.ct4, 0 ) AS companyCnt,
IFNULL( t8.ct5, 0 ) AS requireCnt
FROM
workstation_dict t1
LEFT JOIN (
SELECT
t1.id,
count( DISTINCT t3.member_id ) AS ct1
FROM
workstation_dict t1
LEFT JOIN team_dict t2 ON t1.id = t2.station_id
LEFT JOIN member_team_mapping t3 ON t2.id = t3.team_id
WHERE
t1.id = #{stationId}
AND t1.delete_date IS NULL
AND t2.delete_date IS NULL
AND t3.delete_date IS NULL
) t4 ON t1.id = t4.id
LEFT JOIN (
SELECT
t1.id,
count( DISTINCT t2.member_id ) AS ct2
FROM FROM
workstation_dict t1 workstation_dict t1
LEFT JOIN ( LEFT JOIN team_dict t2 ON t1.id = t2.station_id
WHERE
t1.id = #{stationId}
AND t1.delete_date IS NULL
AND t2.delete_date IS NULL
) t5 ON t1.id = t5.id
LEFT JOIN (
SELECT
t1.id,
count(*) AS ct3
FROM
workstation_dict t1
LEFT JOIN team_dict t2 ON t1.id = t2.station_id
WHERE
t1.id = #{stationId}
AND t1.delete_date IS NULL
AND t2.delete_date IS NULL
GROUP BY
t2.station_id
) t6 ON t1.id = t6.id
LEFT JOIN (
SELECT
t5.id,
count(*) AS ct4
FROM
(
SELECT SELECT
t1.id, t1.id,
count( DISTINCT t3.member_id ) AS ct1 t4.company_name
FROM FROM
workstation_dict t1 workstation_dict t1
LEFT JOIN team_dict t2 ON t1.id = t2.station_id LEFT JOIN workstation_alone_mapping t2 ON t1.id = t2.station_id
LEFT JOIN member_team_mapping t3 ON t2.id = t3.team_id LEFT JOIN position_alone_info t3 ON t2.alone_id = t3.id
LEFT JOIN company_dict t4 ON t3.company_id = t4.id
WHERE WHERE
t1.id = #{stationId} t1.id = #{stationId}
AND t1.delete_date IS NULL AND t1.delete_date IS NULL
AND t2.delete_date IS NULL AND t2.delete_date IS NULL
AND t3.delete_date IS NULL AND t3.delete_date IS NULL
) t4 ON t1.id = t4.id AND t4.delete_date IS NULL UNION
LEFT JOIN (
SELECT SELECT
t1.id, t1.id,
count( DISTINCT t2.member_id ) AS ct2 t4.company_name
FROM FROM
workstation_dict t1 workstation_dict t1
LEFT JOIN team_dict t2 ON t1.id = t2.station_id LEFT JOIN workstation_require_mapping t2 ON t1.id = t2.station_id
LEFT JOIN position_require_item t3 ON t2.require_id = t3.id
LEFT JOIN company_dict t4 ON t3.company_id = t4.id
WHERE WHERE
t1.id = #{stationId} t1.id = #{stationId}
AND t1.delete_date IS NULL AND t1.delete_date IS NULL
AND t2.delete_date IS NULL AND t2.delete_date IS NULL
) t5 ON t1.id = t5.id AND t3.delete_date IS NULL
LEFT JOIN ( AND t4.delete_date IS NULL
) t5
) t7 ON t1.id = t7.id
LEFT JOIN (
SELECT
t5.id,
sum( t5.require_counts ) AS ct5
FROM
(
SELECT SELECT
t1.id, t1.id,
count(*) AS ct3 t3.require_counts
FROM FROM
workstation_dict t1 workstation_dict t1
LEFT JOIN team_dict t2 ON t1.id = t2.station_id LEFT JOIN workstation_alone_mapping t2 ON t1.id = t2.station_id
LEFT JOIN position_alone_info t3 ON t2.alone_id = t3.id
WHERE WHERE
t1.id = #{stationId} t1.id = #{stationId}
AND t1.delete_date IS NULL AND t1.delete_date IS NULL
AND t2.delete_date IS NULL AND t2.delete_date IS NULL
GROUP BY AND t3.delete_date IS NULL UNION
t2.station_id
) t6 ON t1.id = t6.id
LEFT JOIN (
SELECT
t5.id,
count(*) AS ct4
FROM
(
SELECT
t1.id,
t4.company_name
FROM
workstation_dict t1
LEFT JOIN workstation_alone_mapping t2 ON t1.id = t2.station_id
LEFT JOIN position_alone_info t3 ON t2.alone_id = t3.id
LEFT JOIN company_dict t4 ON t3.company_id = t4.id
WHERE
t1.id = 1
AND t1.delete_date IS NULL
AND t2.delete_date IS NULL
AND t3.delete_date IS NULL
AND t4.delete_date IS NULL UNION
SELECT
t1.id,
t4.company_name
FROM
workstation_dict t1
LEFT JOIN workstation_require_mapping t2 ON t1.id = t2.station_id
LEFT JOIN position_require_item t3 ON t2.require_id = t3.id
LEFT JOIN company_dict t4 ON t3.company_id = t4.id
WHERE
t1.id = #{stationId}
AND t1.delete_date IS NULL
AND t2.delete_date IS NULL
AND t3.delete_date IS NULL
AND t4.delete_date IS NULL
) t5
) t7 ON t1.id = t7.id
LEFT JOIN (
SELECT SELECT
t5.id, t1.id,
sum( t5.require_counts ) AS ct5 t4.require_counts
FROM FROM
( workstation_dict t1
SELECT LEFT JOIN workstation_require_mapping t2 ON t1.id = t2.station_id
t1.id, LEFT JOIN position_require_item t3 ON t2.require_id = t3.id
t3.require_counts LEFT JOIN position_item_info t4 ON t3.id = t4.position_require_id
FROM WHERE
workstation_dict t1 t1.id = #{stationId}
LEFT JOIN workstation_alone_mapping t2 ON t1.id = t2.station_id AND t1.delete_date IS NULL
LEFT JOIN position_alone_info t3 ON t2.alone_id = t3.id AND t2.delete_date IS NULL
WHERE AND t3.delete_date IS NULL
t1.id = #{stationId} AND t4.delete_date IS NULL
AND t1.delete_date IS NULL ) t5
AND t2.delete_date IS NULL ) t8 ON t1.id = t8.id
AND t3.delete_date IS NULL UNION WHERE
SELECT t1.id = #{stationId}
t1.id,
t4.require_counts
FROM
workstation_dict t1
LEFT JOIN workstation_require_mapping t2 ON t1.id = t2.station_id
LEFT JOIN position_require_item t3 ON t2.require_id = t3.id
LEFT JOIN position_item_info t4 ON t3.id = t4.position_require_id
WHERE
t1.id = #{stationId}
AND t1.delete_date IS NULL
AND t2.delete_date IS NULL
AND t3.delete_date IS NULL
AND t4.delete_date IS NULL
) t5
) t8 ON t1.id = t8.id
where t1.id = #{stationId}
</select> </select>
<select id="administerProvinceStations" resultType="com.laowu.model.WorkstationDictDO">
SELECT
t.id,
t.workstation_name
FROM
workstation_dict t
LEFT JOIN workstation_administers t2 ON t.id = t2.workstation_id
WHERE
t.delete_date IS NULL
AND t2.delete_date IS NULL
and t2.administer_id = #{administerId}
and t.province = #{province}
</select>
</mapper> </mapper>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!