zhenghaoyu
2 years ago
18 changed files with 0 additions and 1333 deletions
@ -1,79 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
/** |
||||
* 基础班组表 实体类 |
||||
* |
||||
* @author BladeX |
||||
* @since 2023-05-25 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_basic_team_group") |
||||
@ApiModel(value = "BasicTeamGroup对象", description = "基础班组表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class BasicTeamGroupEntity extends TenantEntity { |
||||
|
||||
/** |
||||
* 预留1 |
||||
*/ |
||||
@ApiModelProperty(value = "预留1") |
||||
private String reserve1; |
||||
/** |
||||
* 预留2 |
||||
*/ |
||||
@ApiModelProperty(value = "预留2") |
||||
private String reserve2; |
||||
/** |
||||
* 预留3 |
||||
*/ |
||||
@ApiModelProperty(value = "预留3") |
||||
private String reserve3; |
||||
/** |
||||
* 预留4 |
||||
*/ |
||||
@ApiModelProperty(value = "预留4") |
||||
private String reserve4; |
||||
/** |
||||
* 预留5 |
||||
*/ |
||||
@ApiModelProperty(value = "预留5") |
||||
private String reserve5; |
||||
/** |
||||
* 组名 |
||||
*/ |
||||
@ApiModelProperty(value = "组名") |
||||
private String groupName; |
||||
/** |
||||
* 归属 |
||||
*/ |
||||
@ApiModelProperty(value = "归属") |
||||
private String belongTo; |
||||
/** |
||||
* 班组类型 |
||||
*/ |
||||
@ApiModelProperty(value = "班组类型") |
||||
private Integer groupType; |
||||
|
||||
} |
||||
@ -1,88 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
import javax.validation.constraints.NotEmpty; |
||||
|
||||
/** |
||||
* 班组人员表 实体类 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-05-29 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_basic_team_staff") |
||||
@ApiModel(value = "BasicTeamStaff对象", description = "班组人员表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class BasicTeamStaffEntity extends TenantEntity { |
||||
|
||||
/** |
||||
* 预留1 |
||||
*/ |
||||
@ApiModelProperty(value = "预留1") |
||||
private String reserve1; |
||||
/** |
||||
* 预留2 |
||||
*/ |
||||
@ApiModelProperty(value = "预留2") |
||||
private String reserve2; |
||||
/** |
||||
* 预留3 |
||||
*/ |
||||
@ApiModelProperty(value = "预留3") |
||||
private String reserve3; |
||||
/** |
||||
* 预留4 |
||||
*/ |
||||
@ApiModelProperty(value = "预留4") |
||||
private String reserve4; |
||||
/** |
||||
* 预留5 |
||||
*/ |
||||
@ApiModelProperty(value = "预留5") |
||||
private String reserve5; |
||||
/** |
||||
* 班组ID |
||||
*/ |
||||
@ApiModelProperty(value = "班组ID") |
||||
private String teamGroupId; |
||||
/** |
||||
* 姓名 |
||||
*/ |
||||
@ApiModelProperty(value = "姓名") |
||||
@NotEmpty(message = "姓名不能为空") |
||||
private String name; |
||||
/** |
||||
* 工号 |
||||
*/ |
||||
@ApiModelProperty(value = "工号") |
||||
@NotEmpty(message = "工号不能为空") |
||||
private String jobNumber; |
||||
/** |
||||
* 员工表ID |
||||
*/ |
||||
@ApiModelProperty(value = "员工表ID") |
||||
private String staffId; |
||||
|
||||
} |
||||
@ -1,49 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.feign; |
||||
|
||||
import org.springblade.core.mp.support.BladePage; |
||||
import com.logpm.basic.entity.BasicTeamStaffEntity; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
||||
/** |
||||
* 班组人员表 Feign接口类 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-05-29 |
||||
*/ |
||||
@FeignClient( |
||||
value = "logpm-basic" |
||||
) |
||||
public interface IBasicTeamStaffClient { |
||||
|
||||
String API_PREFIX = "/client"; |
||||
String TOP = API_PREFIX + "/top"; |
||||
|
||||
/** |
||||
* 获取班组人员表列表 |
||||
* |
||||
* @param current 页号 |
||||
* @param size 页数 |
||||
* @return BladePage |
||||
*/ |
||||
@GetMapping(TOP) |
||||
BladePage<BasicTeamStaffEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); |
||||
|
||||
} |
||||
@ -1,151 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.basic.entity.BasicTeamGroupEntity; |
||||
import com.logpm.basic.excel.BasicTeamGroupExcel; |
||||
import com.logpm.basic.service.IBasicTeamGroupService; |
||||
import com.logpm.basic.vo.BasicTeamGroupVO; |
||||
import com.logpm.basic.wrapper.BasicTeamGroupWrapper; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import io.swagger.annotations.ApiParam; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.excel.util.ExcelUtil; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.secure.BladeUser; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.constant.BladeConstant; |
||||
import org.springblade.core.tool.utils.DateUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springframework.web.bind.annotation.*; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
import javax.servlet.http.HttpServletResponse; |
||||
import javax.validation.Valid; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 基础班组表 控制器 |
||||
* |
||||
* @author BladeX |
||||
* @since 2023-05-25 |
||||
*/ |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/basicTeamGroup") |
||||
@Api(value = "基础班组表", tags = "基础班组表接口") |
||||
public class BasicTeamGroupController extends BladeController { |
||||
|
||||
private final IBasicTeamGroupService basicTeamGroupService; |
||||
|
||||
/** |
||||
* 基础班组表 详情 |
||||
*/ |
||||
@GetMapping("/detail") |
||||
@ApiOperationSupport(order = 1) |
||||
@ApiOperation(value = "详情", notes = "传入basicTeamGroup") |
||||
public R<BasicTeamGroupVO> detail(BasicTeamGroupEntity basicTeamGroup) { |
||||
BasicTeamGroupEntity detail = basicTeamGroupService.getOne(Condition.getQueryWrapper(basicTeamGroup)); |
||||
return R.data(BasicTeamGroupWrapper.build().entityVO(detail)); |
||||
} |
||||
/** |
||||
* 基础班组表 分页 |
||||
*/ |
||||
@GetMapping("/list") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "分页", notes = "传入basicTeamGroup") |
||||
public R<IPage<BasicTeamGroupVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicTeamGroup, Query query) { |
||||
IPage<BasicTeamGroupEntity> pages = basicTeamGroupService.page(Condition.getPage(query), Condition.getQueryWrapper(basicTeamGroup, BasicTeamGroupEntity.class)); |
||||
return R.data(BasicTeamGroupWrapper.build().pageVO(pages)); |
||||
} |
||||
|
||||
/** |
||||
* 基础班组表 自定义分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@ApiOperationSupport(order = 3) |
||||
@ApiOperation(value = "分页", notes = "传入basicTeamGroup") |
||||
public R<IPage<BasicTeamGroupVO>> page(BasicTeamGroupVO basicTeamGroup, Query query) { |
||||
IPage<BasicTeamGroupVO> pages = basicTeamGroupService.selectBasicTeamGroupPage(Condition.getPage(query), basicTeamGroup); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
/** |
||||
* 基础班组表 新增 |
||||
*/ |
||||
@PostMapping("/save") |
||||
@ApiOperationSupport(order = 4) |
||||
@ApiOperation(value = "新增", notes = "传入basicTeamGroup") |
||||
public R save(@Valid @RequestBody BasicTeamGroupEntity basicTeamGroup) { |
||||
return R.status(basicTeamGroupService.save(basicTeamGroup)); |
||||
} |
||||
|
||||
/** |
||||
* 基础班组表 修改 |
||||
*/ |
||||
@PostMapping("/update") |
||||
@ApiOperationSupport(order = 5) |
||||
@ApiOperation(value = "修改", notes = "传入basicTeamGroup") |
||||
public R update(@Valid @RequestBody BasicTeamGroupEntity basicTeamGroup) { |
||||
return R.status(basicTeamGroupService.updateById(basicTeamGroup)); |
||||
} |
||||
|
||||
/** |
||||
* 基础班组表 新增或修改 |
||||
*/ |
||||
@PostMapping("/submit") |
||||
@ApiOperationSupport(order = 6) |
||||
@ApiOperation(value = "新增或修改", notes = "传入basicTeamGroup") |
||||
public R submit(@Valid @RequestBody BasicTeamGroupVO basicTeamGroup) { |
||||
return R.status(basicTeamGroupService.saveOrUpdateNew(basicTeamGroup)); |
||||
} |
||||
|
||||
/** |
||||
* 基础班组表 删除 |
||||
*/ |
||||
@PostMapping("/remove") |
||||
@ApiOperationSupport(order = 7) |
||||
@ApiOperation(value = "逻辑删除", notes = "传入ids") |
||||
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { |
||||
return R.status(basicTeamGroupService.deleteLogic(Func.toLongList(ids))); |
||||
} |
||||
|
||||
|
||||
/** |
||||
* 导出数据 |
||||
*/ |
||||
@GetMapping("/export-basicTeamGroup") |
||||
@ApiOperationSupport(order = 9) |
||||
@ApiOperation(value = "导出数据", notes = "传入basicTeamGroup") |
||||
public void exportBasicTeamGroup(@ApiIgnore @RequestParam Map<String, Object> basicTeamGroup, BladeUser bladeUser, HttpServletResponse response) { |
||||
QueryWrapper<BasicTeamGroupEntity> queryWrapper = Condition.getQueryWrapper(basicTeamGroup, BasicTeamGroupEntity.class); |
||||
//if (!AuthUtil.isAdministrator()) {
|
||||
// queryWrapper.lambda().eq(BasicTeamGroup::getTenantId, bladeUser.getTenantId());
|
||||
//}
|
||||
queryWrapper.lambda().eq(BasicTeamGroupEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); |
||||
List<BasicTeamGroupExcel> list = basicTeamGroupService.exportBasicTeamGroup(queryWrapper); |
||||
ExcelUtil.export(response, "基础班组表数据" + DateUtil.time(), "基础班组表数据表", list, BasicTeamGroupExcel.class); |
||||
} |
||||
|
||||
} |
||||
@ -1,175 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.basic.entity.BasicTeamStaffEntity; |
||||
import com.logpm.basic.excel.BasicTeamStaffExcel; |
||||
import com.logpm.basic.service.IBasicTeamStaffService; |
||||
import com.logpm.basic.vo.BasicTeamStaffVO; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import io.swagger.annotations.ApiParam; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.log4j.Log4j2; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.excel.util.ExcelUtil; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.secure.BladeUser; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.constant.BladeConstant; |
||||
import org.springblade.core.tool.utils.DateUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springframework.util.StringUtils; |
||||
import org.springframework.web.bind.annotation.*; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
import javax.servlet.http.HttpServletResponse; |
||||
import javax.validation.Valid; |
||||
import java.util.HashMap; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 班组人员表 控制器 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-05-29 |
||||
*/ |
||||
@Log4j2 |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("/basicTeamStaff") |
||||
@Api(value = "班组人员表", tags = "班组人员表接口") |
||||
public class BasicTeamStaffController extends BladeController { |
||||
|
||||
private final IBasicTeamStaffService basicTeamStaffService; |
||||
|
||||
/** |
||||
* 班组人员表 详情 |
||||
*/ |
||||
@GetMapping("/detail") |
||||
@ApiOperationSupport(order = 1) |
||||
@ApiOperation(value = "详情", notes = "传入basicTeamStaff") |
||||
public R<BasicTeamStaffEntity> detail(BasicTeamStaffEntity basicTeamStaff) { |
||||
BasicTeamStaffEntity detail = basicTeamStaffService.getOne(Condition.getQueryWrapper(basicTeamStaff)); |
||||
return R.data(detail); |
||||
} |
||||
/** |
||||
* 班组人员表 分页 |
||||
*/ |
||||
@GetMapping("/list") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "分页", notes = "传入basicTeamStaff") |
||||
public R<IPage<BasicTeamStaffEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicTeamStaff, Query query) { |
||||
IPage<BasicTeamStaffEntity> pages = basicTeamStaffService.page(Condition.getPage(query), Condition.getQueryWrapper(basicTeamStaff, BasicTeamStaffEntity.class)); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
/** |
||||
* 班组人员表 自定义分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@ApiOperationSupport(order = 3) |
||||
@ApiOperation(value = "分页", notes = "传入basicTeamStaff") |
||||
public R<IPage<BasicTeamStaffVO>> page(BasicTeamStaffVO basicTeamStaff, Query query) { |
||||
IPage<BasicTeamStaffVO> pages = basicTeamStaffService.selectBasicTeamStaffPage(Condition.getPage(query), basicTeamStaff); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
/** |
||||
* 班组人员表 新增 |
||||
*/ |
||||
@PostMapping("/save") |
||||
@ApiOperationSupport(order = 4) |
||||
@ApiOperation(value = "新增", notes = "传入basicTeamStaff") |
||||
public R save(@Valid @RequestBody BasicTeamStaffEntity basicTeamStaff) { |
||||
return R.status(basicTeamStaffService.save(basicTeamStaff)); |
||||
} |
||||
|
||||
/** |
||||
* 班组人员表 修改 |
||||
*/ |
||||
@PostMapping("/update") |
||||
@ApiOperationSupport(order = 5) |
||||
@ApiOperation(value = "修改", notes = "传入basicTeamStaff") |
||||
public R update(@Valid @RequestBody BasicTeamStaffEntity basicTeamStaff) { |
||||
return R.status(basicTeamStaffService.updateById(basicTeamStaff)); |
||||
} |
||||
|
||||
/** |
||||
* 班组人员表 新增或修改 |
||||
*/ |
||||
@PostMapping("/submit") |
||||
@ApiOperationSupport(order = 6) |
||||
@ApiOperation(value = "新增或修改", notes = "传入basicTeamStaff") |
||||
public R submit(@Valid @RequestBody BasicTeamStaffEntity basicTeamStaff) { |
||||
return R.status(basicTeamStaffService.saveOrUpdate(basicTeamStaff)); |
||||
} |
||||
|
||||
/** |
||||
* 班组人员表 删除 |
||||
*/ |
||||
@PostMapping("/remove") |
||||
@ApiOperationSupport(order = 7) |
||||
@ApiOperation(value = "逻辑删除", notes = "传入ids") |
||||
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { |
||||
return R.status(basicTeamStaffService.deleteLogic(Func.toLongList(ids))); |
||||
} |
||||
|
||||
|
||||
/** |
||||
* 导出数据 |
||||
*/ |
||||
@GetMapping("/export-basicTeamStaff") |
||||
@ApiOperationSupport(order = 9) |
||||
@ApiOperation(value = "导出数据", notes = "传入basicTeamStaff") |
||||
public void exportBasicTeamStaff(@ApiIgnore @RequestParam Map<String, Object> basicTeamStaff, BladeUser bladeUser, HttpServletResponse response) { |
||||
QueryWrapper<BasicTeamStaffEntity> queryWrapper = Condition.getQueryWrapper(basicTeamStaff, BasicTeamStaffEntity.class); |
||||
//if (!AuthUtil.isAdministrator()) {
|
||||
// queryWrapper.lambda().eq(BasicTeamStaff::getTenantId, bladeUser.getTenantId());
|
||||
//}
|
||||
queryWrapper.lambda().eq(BasicTeamStaffEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); |
||||
List<BasicTeamStaffExcel> list = basicTeamStaffService.exportBasicTeamStaff(queryWrapper); |
||||
ExcelUtil.export(response, "班组人员表数据" + DateUtil.time(), "班组人员表数据表", list, BasicTeamStaffExcel.class); |
||||
} |
||||
|
||||
|
||||
@GetMapping("/allList") |
||||
@ApiOperationSupport(order = 3) |
||||
@ApiOperation(value = "所有班组人员列表", notes = "传入basicTeamStaff") |
||||
public R<Map> allList(BasicTeamStaffVO basicTeamStaff) { |
||||
//获取没有被选择的班组人员
|
||||
List<BasicTeamStaffVO> allNoChanceList = basicTeamStaffService.selectAllNoChanceStaffList(); |
||||
//获取已被当前班组选择的人员
|
||||
//班组id
|
||||
String teamGroupId = basicTeamStaff.getTeamGroupId(); |
||||
List<BasicTeamStaffVO> readyChanceList = null; |
||||
if(!StringUtils.hasLength(teamGroupId)){ |
||||
readyChanceList = basicTeamStaffService.selectReadyChancneStaffList(teamGroupId); |
||||
} |
||||
//组装返回数据
|
||||
Map<String,Object> map = new HashMap<>(); |
||||
map.put("allNoChanceList",allNoChanceList); |
||||
map.put("readyChanceList",readyChanceList); |
||||
return R.data(map); |
||||
} |
||||
|
||||
} |
||||
@ -1,104 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.excel; |
||||
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
||||
import com.alibaba.excel.annotation.write.style.ContentRowHeight; |
||||
import com.alibaba.excel.annotation.write.style.HeadRowHeight; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
|
||||
/** |
||||
* 基础班组表 Excel实体类 |
||||
* |
||||
* @author BladeX |
||||
* @since 2023-05-25 |
||||
*/ |
||||
@Data |
||||
@ColumnWidth(25) |
||||
@HeadRowHeight(20) |
||||
@ContentRowHeight(18) |
||||
public class BasicTeamGroupExcel implements Serializable { |
||||
|
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 租户号 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("租户号") |
||||
private String tenantId; |
||||
/** |
||||
* 是否已删除 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("是否已删除") |
||||
private Integer isDeleted; |
||||
/** |
||||
* 预留1 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("预留1") |
||||
private String reserve1; |
||||
/** |
||||
* 预留2 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("预留2") |
||||
private String reserve2; |
||||
/** |
||||
* 预留3 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("预留3") |
||||
private String reserve3; |
||||
/** |
||||
* 预留4 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("预留4") |
||||
private String reserve4; |
||||
/** |
||||
* 预留5 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("预留5") |
||||
private String reserve5; |
||||
/** |
||||
* 组名 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("组名") |
||||
private String groupName; |
||||
/** |
||||
* 归属 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("归属") |
||||
private String belongTo; |
||||
/** |
||||
* 班组类型 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("班组类型") |
||||
private Integer groupType; |
||||
|
||||
} |
||||
@ -1,110 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.excel; |
||||
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
||||
import com.alibaba.excel.annotation.write.style.ContentRowHeight; |
||||
import com.alibaba.excel.annotation.write.style.HeadRowHeight; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
|
||||
/** |
||||
* 班组人员表 Excel实体类 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-05-29 |
||||
*/ |
||||
@Data |
||||
@ColumnWidth(25) |
||||
@HeadRowHeight(20) |
||||
@ContentRowHeight(18) |
||||
public class BasicTeamStaffExcel implements Serializable { |
||||
|
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 租户号 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("租户号") |
||||
private String tenantId; |
||||
/** |
||||
* 是否已删除 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("是否已删除") |
||||
private Integer isDeleted; |
||||
/** |
||||
* 预留1 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("预留1") |
||||
private String reserve1; |
||||
/** |
||||
* 预留2 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("预留2") |
||||
private String reserve2; |
||||
/** |
||||
* 预留3 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("预留3") |
||||
private String reserve3; |
||||
/** |
||||
* 预留4 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("预留4") |
||||
private String reserve4; |
||||
/** |
||||
* 预留5 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("预留5") |
||||
private String reserve5; |
||||
/** |
||||
* 班组ID |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("班组ID") |
||||
private String teamGroupId; |
||||
/** |
||||
* 姓名 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("姓名") |
||||
private String name; |
||||
/** |
||||
* 工号 |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("工号") |
||||
private String jobNumber; |
||||
/** |
||||
* 员工表ID |
||||
*/ |
||||
@ColumnWidth(20) |
||||
@ExcelProperty("员工表ID") |
||||
private String staffId; |
||||
|
||||
} |
||||
@ -1,53 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.feign; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.mp.support.BladePage; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import com.logpm.basic.entity.BasicTeamStaffEntity; |
||||
import com.logpm.basic.service.IBasicTeamStaffService; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
/** |
||||
* 班组人员表 Feign实现类 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-05-29 |
||||
*/ |
||||
@ApiIgnore() |
||||
@RestController |
||||
@AllArgsConstructor |
||||
public class BasicTeamStaffClient implements IBasicTeamStaffClient { |
||||
|
||||
private final IBasicTeamStaffService basicTeamStaffService; |
||||
|
||||
@Override |
||||
@GetMapping(TOP) |
||||
public BladePage<BasicTeamStaffEntity> top(Integer current, Integer size) { |
||||
Query query = new Query(); |
||||
query.setCurrent(current); |
||||
query.setSize(size); |
||||
IPage<BasicTeamStaffEntity> page = basicTeamStaffService.page(Condition.getPage(query)); |
||||
return BladePage.of(page); |
||||
} |
||||
|
||||
} |
||||
@ -1,18 +0,0 @@
|
||||
package com.logpm.basic.feign; |
||||
|
||||
import com.logpm.basic.entity.BasicTeamStaffEntity; |
||||
import org.springblade.common.constant.LauncherConstant; |
||||
import org.springblade.core.mp.support.BladePage; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
||||
@FeignClient( |
||||
value = LauncherConstant.APPLICATION_SYSTEM_NAME+"-zhy" |
||||
) |
||||
public interface ISystemClient { |
||||
|
||||
@GetMapping("/user/selectUserByRoleId") |
||||
BladePage<BasicTeamStaffEntity> selectUserByRoleId(@RequestParam("roleId") String roleId); |
||||
|
||||
} |
||||
@ -1,54 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.mapper; |
||||
|
||||
import com.logpm.basic.entity.BasicTeamGroupEntity; |
||||
import com.logpm.basic.vo.BasicTeamGroupVO; |
||||
import com.logpm.basic.excel.BasicTeamGroupExcel; |
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.apache.ibatis.annotations.Param; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 基础班组表 Mapper 接口 |
||||
* |
||||
* @author BladeX |
||||
* @since 2023-05-25 |
||||
*/ |
||||
public interface BasicTeamGroupMapper extends BaseMapper<BasicTeamGroupEntity> { |
||||
|
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param basicTeamGroup |
||||
* @return |
||||
*/ |
||||
List<BasicTeamGroupVO> selectBasicTeamGroupPage(IPage page, BasicTeamGroupVO basicTeamGroup); |
||||
|
||||
|
||||
/** |
||||
* 获取导出数据 |
||||
* |
||||
* @param queryWrapper |
||||
* @return |
||||
*/ |
||||
List<BasicTeamGroupExcel> exportBasicTeamGroup(@Param("ew") Wrapper<BasicTeamGroupEntity> queryWrapper); |
||||
|
||||
} |
||||
@ -1,36 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="com.logpm.basic.mapper.BasicTeamGroupMapper"> |
||||
|
||||
<!-- 通用查询映射结果 --> |
||||
<resultMap id="basicTeamGroupResultMap" type="com.logpm.basic.entity.BasicTeamGroupEntity"> |
||||
<result column="tenant_id" property="tenantId"/> |
||||
<result column="create_user" property="createUser"/> |
||||
<result column="create_time" property="createTime"/> |
||||
<result column="update_user" property="updateUser"/> |
||||
<result column="update_time" property="updateTime"/> |
||||
<result column="status" property="status"/> |
||||
<result column="is_deleted" property="isDeleted"/> |
||||
<result column="create_dept" property="createDept"/> |
||||
<result column="id" property="id"/> |
||||
<result column="reserve1" property="reserve1"/> |
||||
<result column="reserve2" property="reserve2"/> |
||||
<result column="reserve3" property="reserve3"/> |
||||
<result column="reserve4" property="reserve4"/> |
||||
<result column="reserve5" property="reserve5"/> |
||||
<result column="group_name" property="groupName"/> |
||||
<result column="belong_to" property="belongTo"/> |
||||
<result column="group_type" property="groupType"/> |
||||
</resultMap> |
||||
|
||||
|
||||
<select id="selectBasicTeamGroupPage" resultMap="basicTeamGroupResultMap"> |
||||
select * from logpm_basic_team_group where is_deleted = 0 |
||||
</select> |
||||
|
||||
|
||||
<select id="exportBasicTeamGroup" resultType="com.logpm.basic.excel.BasicTeamGroupExcel"> |
||||
SELECT * FROM logpm_basic_team_group ${ew.customSqlSegment} |
||||
</select> |
||||
|
||||
</mapper> |
||||
@ -1,73 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.mapper; |
||||
|
||||
import com.logpm.basic.entity.BasicTeamStaffEntity; |
||||
import com.logpm.basic.vo.BasicTeamStaffVO; |
||||
import com.logpm.basic.excel.BasicTeamStaffExcel; |
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.apache.ibatis.annotations.Param; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 班组人员表 Mapper 接口 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-05-29 |
||||
*/ |
||||
public interface BasicTeamStaffMapper extends BaseMapper<BasicTeamStaffEntity> { |
||||
|
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param basicTeamStaff |
||||
* @return |
||||
*/ |
||||
List<BasicTeamStaffVO> selectBasicTeamStaffPage(IPage page, BasicTeamStaffVO basicTeamStaff); |
||||
|
||||
|
||||
/** |
||||
* 获取导出数据 |
||||
* |
||||
* @param queryWrapper |
||||
* @return |
||||
*/ |
||||
List<BasicTeamStaffExcel> exportBasicTeamStaff(@Param("ew") Wrapper<BasicTeamStaffEntity> queryWrapper); |
||||
|
||||
/** |
||||
* 判断班组人员是否存在 |
||||
* @param jobNumber |
||||
* @return |
||||
*/ |
||||
BasicTeamStaffEntity selectTeamStaffByJobNumber(@Param("jobNumber") String jobNumber); |
||||
|
||||
/** |
||||
* 查询所有位被选择的班组人员 |
||||
* @return |
||||
*/ |
||||
List<BasicTeamStaffVO> selectAllNoChanceStaffList(); |
||||
|
||||
/** |
||||
* 查询已被该班组选中的人员 |
||||
* @param teamGroupId |
||||
* @return |
||||
*/ |
||||
List<BasicTeamStaffVO> selectReadyChancneStaffList(@Param("teamGroupId") String teamGroupId); |
||||
} |
||||
@ -1,59 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="com.logpm.basic.mapper.BasicTeamStaffMapper"> |
||||
|
||||
<!-- 通用查询映射结果 --> |
||||
<resultMap id="basicTeamStaffResultMap" type="com.logpm.basic.entity.BasicTeamStaffEntity"> |
||||
<result column="tenant_id" property="tenantId"/> |
||||
<result column="create_user" property="createUser"/> |
||||
<result column="create_time" property="createTime"/> |
||||
<result column="update_user" property="updateUser"/> |
||||
<result column="update_time" property="updateTime"/> |
||||
<result column="status" property="status"/> |
||||
<result column="is_deleted" property="isDeleted"/> |
||||
<result column="create_dept" property="createDept"/> |
||||
<result column="id" property="id"/> |
||||
<result column="reserve1" property="reserve1"/> |
||||
<result column="reserve2" property="reserve2"/> |
||||
<result column="reserve3" property="reserve3"/> |
||||
<result column="reserve4" property="reserve4"/> |
||||
<result column="reserve5" property="reserve5"/> |
||||
<result column="team_group_id" property="teamGroupId"/> |
||||
<result column="name" property="name"/> |
||||
<result column="job_number" property="jobNumber"/> |
||||
<result column="staff_id" property="staffId"/> |
||||
</resultMap> |
||||
|
||||
|
||||
<select id="selectBasicTeamStaffPage" resultMap="basicTeamStaffResultMap"> |
||||
select * from logpm_basic_team_staff where is_deleted = 0 |
||||
</select> |
||||
|
||||
|
||||
<select id="exportBasicTeamStaff" resultType="com.logpm.basic.excel.BasicTeamStaffExcel"> |
||||
SELECT * FROM logpm_basic_team_staff ${ew.customSqlSegment} |
||||
</select> |
||||
|
||||
<select id="selectTeamStaffByJobNumber" resultMap="basicTeamStaffResultMap"> |
||||
SELECT * FROM logpm_basic_team_staff |
||||
<where> |
||||
job_number = ${jobNumber} |
||||
</where> |
||||
</select> |
||||
|
||||
|
||||
<select id="selectAllNoChanceStaffList" resultMap="basicTeamStaffResultMap"> |
||||
SELECT * FROM logpm_basic_team_staff |
||||
<where> |
||||
team_group_id is null |
||||
</where> |
||||
</select> |
||||
|
||||
<select id="selectReadyChancneStaffList" resultMap="basicTeamStaffResultMap"> |
||||
SELECT * FROM logpm_basic_team_staff |
||||
<where> |
||||
team_group_id = ${teamGroupId} |
||||
</where> |
||||
</select> |
||||
|
||||
</mapper> |
||||
@ -1,53 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.logpm.basic.entity.BasicTeamGroupEntity; |
||||
import com.logpm.basic.vo.BasicTeamGroupVO; |
||||
import com.logpm.basic.excel.BasicTeamGroupExcel; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 基础班组表 服务类 |
||||
* |
||||
* @author BladeX |
||||
* @since 2023-05-25 |
||||
*/ |
||||
public interface IBasicTeamGroupService extends BaseService<BasicTeamGroupEntity> { |
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param basicTeamGroup |
||||
* @return |
||||
*/ |
||||
IPage<BasicTeamGroupVO> selectBasicTeamGroupPage(IPage<BasicTeamGroupVO> page, BasicTeamGroupVO basicTeamGroup); |
||||
|
||||
|
||||
/** |
||||
* 导出数据 |
||||
* |
||||
* @param queryWrapper |
||||
* @return |
||||
*/ |
||||
List<BasicTeamGroupExcel> exportBasicTeamGroup(Wrapper<BasicTeamGroupEntity> queryWrapper); |
||||
|
||||
boolean saveOrUpdateNew(BasicTeamGroupVO basicTeamGroup); |
||||
} |
||||
@ -1,82 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.logpm.basic.entity.BasicTeamGroupEntity; |
||||
import com.logpm.basic.excel.BasicTeamGroupExcel; |
||||
import com.logpm.basic.mapper.BasicTeamGroupMapper; |
||||
import com.logpm.basic.service.IBasicTeamGroupService; |
||||
import com.logpm.basic.service.IBasicTeamStaffService; |
||||
import com.logpm.basic.vo.BasicTeamGroupVO; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springframework.stereotype.Service; |
||||
import org.springframework.transaction.annotation.Transactional; |
||||
|
||||
import java.util.List; |
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 基础班组表 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
* @since 2023-05-25 |
||||
*/ |
||||
@Service |
||||
@AllArgsConstructor |
||||
public class BasicTeamGroupServiceImpl extends BaseServiceImpl<BasicTeamGroupMapper, BasicTeamGroupEntity> implements IBasicTeamGroupService { |
||||
|
||||
private IBasicTeamStaffService basicTeamStaffService; |
||||
|
||||
@Override |
||||
public IPage<BasicTeamGroupVO> selectBasicTeamGroupPage(IPage<BasicTeamGroupVO> page, BasicTeamGroupVO basicTeamGroup) { |
||||
return page.setRecords(baseMapper.selectBasicTeamGroupPage(page, basicTeamGroup)); |
||||
} |
||||
|
||||
|
||||
@Override |
||||
public List<BasicTeamGroupExcel> exportBasicTeamGroup(Wrapper<BasicTeamGroupEntity> queryWrapper) { |
||||
List<BasicTeamGroupExcel> basicTeamGroupList = baseMapper.exportBasicTeamGroup(queryWrapper); |
||||
//basicTeamGroupList.forEach(basicTeamGroup -> {
|
||||
// basicTeamGroup.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicTeamGroup.getType()));
|
||||
//});
|
||||
return basicTeamGroupList; |
||||
} |
||||
|
||||
@Override |
||||
@Transactional |
||||
public boolean saveOrUpdateNew(BasicTeamGroupVO basicTeamGroup) { |
||||
Long id = basicTeamGroup.getId(); |
||||
if(!Objects.isNull(id)){ |
||||
//更新
|
||||
//先重置当前班组的关联信息
|
||||
basicTeamStaffService.updateTeamGroupIdById(id); |
||||
} |
||||
//保存班组信息
|
||||
saveOrUpdate(basicTeamGroup); |
||||
//如果是新增，重新获取一次id
|
||||
id = basicTeamGroup.getId(); |
||||
//重新保存班组人员的关联信息
|
||||
basicTeamStaffService.updateTeamGroupIdByTeamGroupIdAndList(id,basicTeamGroup.getStaffs()); |
||||
|
||||
return true; |
||||
} |
||||
|
||||
|
||||
} |
||||
@ -1,98 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.service.impl; |
||||
|
||||
import cn.hutool.core.bean.BeanUtil; |
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.logpm.basic.entity.BasicTeamStaffEntity; |
||||
import com.logpm.basic.excel.BasicTeamStaffExcel; |
||||
import com.logpm.basic.mapper.BasicTeamStaffMapper; |
||||
import com.logpm.basic.service.IBasicTeamStaffService; |
||||
import com.logpm.basic.vo.BasicTeamStaffVO; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 班组人员表 服务实现类 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-05-29 |
||||
*/ |
||||
@Service |
||||
@AllArgsConstructor |
||||
public class BasicTeamStaffServiceImpl extends BaseServiceImpl<BasicTeamStaffMapper, BasicTeamStaffEntity> implements IBasicTeamStaffService { |
||||
|
||||
|
||||
|
||||
|
||||
@Override |
||||
public IPage<BasicTeamStaffVO> selectBasicTeamStaffPage(IPage<BasicTeamStaffVO> page, BasicTeamStaffVO basicTeamStaff) { |
||||
return page.setRecords(baseMapper.selectBasicTeamStaffPage(page, basicTeamStaff)); |
||||
} |
||||
|
||||
|
||||
@Override |
||||
public List<BasicTeamStaffExcel> exportBasicTeamStaff(Wrapper<BasicTeamStaffEntity> queryWrapper) { |
||||
List<BasicTeamStaffExcel> basicTeamStaffList = baseMapper.exportBasicTeamStaff(queryWrapper); |
||||
//basicTeamStaffList.forEach(basicTeamStaff -> {
|
||||
// basicTeamStaff.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicTeamStaff.getType()));
|
||||
//});
|
||||
return basicTeamStaffList; |
||||
} |
||||
|
||||
@Override |
||||
public BasicTeamStaffEntity selectTeamStaffByJobNumber(String jobNumber) { |
||||
return baseMapper.selectTeamStaffByJobNumber(jobNumber); |
||||
} |
||||
|
||||
@Override |
||||
public List<BasicTeamStaffVO> selectAllNoChanceStaffList() { |
||||
return baseMapper.selectAllNoChanceStaffList(); |
||||
} |
||||
|
||||
@Override |
||||
public List<BasicTeamStaffVO> selectReadyChancneStaffList(String teamGroupId) { |
||||
return baseMapper.selectReadyChancneStaffList(teamGroupId); |
||||
} |
||||
|
||||
@Override |
||||
public void updateTeamGroupIdById(Long teamGroupId) { |
||||
LambdaUpdateWrapper<BasicTeamStaffEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); |
||||
lambdaUpdateWrapper.eq(BasicTeamStaffEntity::getTeamGroupId,teamGroupId) |
||||
.set(BasicTeamStaffEntity::getTeamGroupId,null); |
||||
getBaseMapper().update(null,lambdaUpdateWrapper); |
||||
} |
||||
|
||||
@Override |
||||
public void updateTeamGroupIdByTeamGroupIdAndList(Long id, List<BasicTeamStaffVO> staffs) { |
||||
List<BasicTeamStaffEntity> list = new ArrayList<>(); |
||||
staffs.forEach(basicTeamStaffVO -> { |
||||
BasicTeamStaffEntity b = new BasicTeamStaffEntity(); |
||||
BeanUtil.copyProperties(basicTeamStaffVO,b,true); |
||||
b.setTeamGroupId(id.toString()); |
||||
list.add(b); |
||||
}); |
||||
saveBatch(list); |
||||
} |
||||
|
||||
} |
||||
@ -1,50 +0,0 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basic.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import com.logpm.basic.entity.BasicTeamGroupEntity; |
||||
import com.logpm.basic.vo.BasicTeamGroupVO; |
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 基础班组表 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author BladeX |
||||
* @since 2023-05-25 |
||||
*/ |
||||
public class BasicTeamGroupWrapper extends BaseEntityWrapper<BasicTeamGroupEntity, BasicTeamGroupVO> { |
||||
|
||||
public static BasicTeamGroupWrapper build() { |
||||
return new BasicTeamGroupWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public BasicTeamGroupVO entityVO(BasicTeamGroupEntity basicTeamGroup) { |
||||
BasicTeamGroupVO basicTeamGroupVO = Objects.requireNonNull(BeanUtil.copy(basicTeamGroup, BasicTeamGroupVO.class)); |
||||
|
||||
//User createUser = UserCache.getUser(basicTeamGroup.getCreateUser());
|
||||
//User updateUser = UserCache.getUser(basicTeamGroup.getUpdateUser());
|
||||
//basicTeamGroupVO.setCreateUserName(createUser.getName());
|
||||
//basicTeamGroupVO.setUpdateUserName(updateUser.getName());
|
||||
|
||||
return basicTeamGroupVO; |
||||
} |
||||
|
||||
|
||||
} |
||||
Loading…
Reference in new issue