Skip to content

T
tianjin-cement
Commit 1fbe4ad2 authored by zhutianwei@hyzcservice.com's avatar zhutianwei@hyzcservice.com
Browse files
Options

用户选择下拉列表接口，

parent 7265b6de
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 58 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysGroupController.java
View file @ 1fbe4ad2
......@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
* @author ztw
* @since 2020-08-21
*/
@Api(tags="系统管理-组别管理")
@Api(tags="系统管理-工作组管理")
@RestController
@RequestMapping("/business/sys-group")
public class SysGroupController {
......@@ -34,40 +34,40 @@ public class SysGroupController {
@Autowired
private ISysGroupService groupService;
@ApiOperation(value = "组别分页列表")
@ApiOperation(value = "工作组分页列表")
@GetMapping("/getPage")
public BaseResponse getPage(PageQuery pageQuery) {
try {
return groupService.getPage(pageQuery);
} catch (Exception e) {
log.debug("组别分页列表{}", e);
log.debug("工作组分页列表{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "新增组别")
@ApiOperation(value = "新增工作组")
@PostMapping("/create")
public BaseResponse create(@RequestBody SysGroup query) {
try {
return groupService.create(query);
}catch (Exception e) {
log.debug("新增组别{}",e);
log.debug("新增工作组{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "修改组别")
@ApiOperation(value = "修改工作组")
@PostMapping("/update")
public BaseResponse update(@RequestBody SysGroup query) {
try {
return groupService.update(query);
}catch (Exception e) {
log.debug("修改组别{}",e);
log.debug("修改工作组{}",e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "组别详情")
@ApiOperation(value = "工作组详情")
@GetMapping("/{id}")
public BaseResponse getById(@PathVariable Integer id){
try {
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/SysUserController.java
View file @ 1fbe4ad2
......@@ -45,7 +45,7 @@ public class SysUserController {
@ApiOperation(value = "人员分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "status", value = "状态0:禁用 1:启用", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "groupId", value = "组别id", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "groupId", value = "工作组id", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "name", value = "姓名", paramType = "query", dataType = "String")
})
@GetMapping("/getPage")
......@@ -103,6 +103,23 @@ public class SysUserController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "人员列表")
@GetMapping("/getList")
public BaseResponse getById(){
try {
List<SysUser> list = userService.list();
return BaseResponse.okData(list);
}catch (Exception e){
log.debug("人员列表{}",e);
}
return BaseResponse.errorMsg("失败!");
}
//待完成接口： 导出
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/TeamController.java
View file @ 1fbe4ad2
......@@ -43,13 +43,13 @@ public class TeamController {
@ApiOperation(value = "检测项分页列表")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "status", value = "状态0:禁用 1:启用", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "gourpId", value = "所在分组id", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "groupName", value = "所在分组名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "name", value = "检测项目名称", paramType = "query", dataType = "String")
})
@GetMapping("/getPage")
public BaseResponse getPage(PageQuery pageQuery, Integer status, Integer gourpId, String name) {
public BaseResponse getPage(PageQuery pageQuery, Integer status, String groupName, String name) {
try {
return teamService.getPage(pageQuery, status, gourpId, name);
return teamService.getPage(pageQuery, status, groupName, name);
} catch (Exception e) {
log.debug("检测项分页列表{}", e);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysGroup.java
View file @ 1fbe4ad2
......@@ -27,7 +27,7 @@ public class SysGroup implements Serializable {
private Integer id;
/**
* 组别名称
* 工作组名称
*/
private String name;
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SysUser.java
View file @ 1fbe4ad2
......@@ -78,6 +78,11 @@ public class SysUser implements Serializable {
*/
private String phone;
/**
* 传真
*/
private String fax;
/**
* 专业
*/
......
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Team.java
View file @ 1fbe4ad2
......@@ -30,22 +30,6 @@ public class Team extends BaseEntity implements Serializable {
private static final long serialVersionUID=1L;
public static Team crate(TeamQuery query) {
Team newObj = new Team();
BeanUtils.copyProperties(query, newObj);
newObj.setStatus(true);
return newObj;
}
@Override
public TeamVo toVo() {
TeamVo teamVo = new TeamVo();
BeanUtils.copyProperties(this, teamVo, "status");
teamVo.setStatus(this.getStatus() ? "启用" : "禁用");
return teamVo;
}
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
......@@ -55,10 +39,15 @@ public class Team extends BaseEntity implements Serializable {
private String name;
/**
* 分组
* 元素分组id
*/
private Integer groupId;
/**
* 元素分组名称
*/
private String groupName;
/**
* 检测依据
*/
......
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml
View file @ 1fbe4ad2
......@@ -6,8 +6,8 @@
<if test="params.status != null and params.status != ''">
and t.status = #{params.status}
</if>
<if test="params.gourpId != null and params.gourpId != ''">
and t.group_id = #{params.gourpId}
<if test="params.groupName != null and params.groupName != ''">
and t.group_name = #{params.groupName}
</if>
<if test="params.name != null and params.name != ''">
and t.name like concat('%', #{params.name}, '%')
......@@ -17,9 +17,8 @@
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.TeamVo">
SELECT t.*,
sg.name as groupName
t.group_name as groupName
FROM team t
left join sys_group sg on sg.id = t.group_id
<include refid="where" />
ORDER BY t.id DESC
</select>
......@@ -28,13 +27,12 @@
SELECT
(@i:=@i+1) as 序号,
t.name as 检测项目,
sg.name as 分组,
t.group_name as 分组,
t.basis as 检测依据,
t.charge as 收费标准,
t.pro_charge as 建议产值,
t.qualifications as 资质范围
FROM team t
left join sys_group sg on sg.id = t.group_id
,(select @i:=0)t
<include refid="where" />
ORDER BY t.id DESC
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/GroupVo.java
View file @ 1fbe4ad2
......@@ -12,13 +12,13 @@ import java.time.LocalDateTime;
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel("组别Vo")
@ApiModel("工作组Vo")
public class GroupVo {
private Integer id;
/**
* 组别名称
* 工作组名称
*/
private String name;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/UserVo.java
View file @ 1fbe4ad2
......@@ -67,6 +67,11 @@ public class UserVo {
*/
private String phone;
/**
* 传真
*/
private String fax;
/**
* 专业
*/
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/ITeamService.java
View file @ 1fbe4ad2
......@@ -29,7 +29,7 @@ public interface ITeamService extends IService<Team> {
* @param name
* @return
*/
BaseResponse<IPage<TeamVo>> getPage(PageQuery pageQuery, Integer status, Integer gourpId, String name);
BaseResponse<IPage<TeamVo>> getPage(PageQuery pageQuery, Integer status, String groupName, String name);
/**
* 获取所有启动的信息
......@@ -42,14 +42,14 @@ public interface ITeamService extends IService<Team> {
* @param query
* @return
*/
BaseResponse<TeamVo> create(TeamQuery query);
BaseResponse<Team> create(TeamQuery query);
/**
* 编辑
* @param query
* @return
*/
BaseResponse<TeamVo> update(TeamQuery query);
BaseResponse<Team> update(TeamQuery query);
/**
* 启用禁用
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysApprovalServiceImpl.java
View file @ 1fbe4ad2
......@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.PageQuery;
import cn.wise.sc.cement.business.model.vo.ApprovalVo;
import cn.wise.sc.cement.business.model.vo.GroupVo;
import cn.wise.sc.cement.business.service.ISysApprovalService;
import cn.wise.sc.cement.business.wrapper.page.Query;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -16,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
/**
* <p>
......@@ -52,7 +54,7 @@ public class SysApprovalServiceImpl extends ServiceImpl<SysApprovalMapper, SysAp
@Override
public BaseResponse<SysApproval> create(SysApproval query) {
if (StringUtils.isEmpty(query.getName())) {
return BaseResponse.errorMsg("组别名称不能为空!");
return BaseResponse.errorMsg("工作组名称不能为空!");
}
QueryWrapper<SysApproval> qw = new QueryWrapper<>();
qw.eq("name", query.getName());
......@@ -61,6 +63,7 @@ public class SysApprovalServiceImpl extends ServiceImpl<SysApprovalMapper, SysAp
return BaseResponse.errorMsg(query.getName() + "已存在");
}
query.setStatus(true);
query.setCreateTime(LocalDateTime.now());
approvalMapper.insert(query);
return BaseResponse.okData(query);
}
......@@ -74,7 +77,7 @@ public class SysApprovalServiceImpl extends ServiceImpl<SysApprovalMapper, SysAp
public BaseResponse<SysApproval> update(SysApproval query) {
if (StringUtils.isEmpty(query.getName())) {
return BaseResponse.errorMsg("组别名称不能为空!");
return BaseResponse.errorMsg("工作组名称不能为空!");
}
QueryWrapper<SysApproval> qw = new QueryWrapper<>();
qw.eq("name", query.getName());
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysGroupServiceImpl.java
View file @ 1fbe4ad2
......@@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
/**
* <p>
......@@ -44,14 +45,14 @@ public class SysGroupServiceImpl extends ServiceImpl<SysGroupMapper, SysGroup> i
}
/**
* 新增组别
* 新增工作组
* @param query
* @return
*/
@Override
public BaseResponse<SysGroup> create(SysGroup query) {
if (StringUtils.isEmpty(query.getName())) {
return BaseResponse.errorMsg("组别名称不能为空!");
return BaseResponse.errorMsg("工作组名称不能为空!");
}
QueryWrapper<SysGroup> qw = new QueryWrapper<>();
qw.eq("name", query.getName());
......@@ -59,13 +60,14 @@ public class SysGroupServiceImpl extends ServiceImpl<SysGroupMapper, SysGroup> i
if (count > 0) {
return BaseResponse.errorMsg(query.getName() + "已存在");
}
query.setCreateTime(LocalDateTime.now());
query.setStatus(true);
groupMapper.insert(query);
return BaseResponse.okData(query);
}
/**
* 修改组别
* 修改工作组
* @param query
* @return
*/
......@@ -73,7 +75,7 @@ public class SysGroupServiceImpl extends ServiceImpl<SysGroupMapper, SysGroup> i
public BaseResponse<SysGroup> update(SysGroup query) {
if (StringUtils.isEmpty(query.getName())) {
return BaseResponse.errorMsg("组别名称不能为空!");
return BaseResponse.errorMsg("工作组名称不能为空!");
}
QueryWrapper<SysGroup> qw = new QueryWrapper<>();
qw.eq("name", query.getName());
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamServiceImpl.java
View file @ 1fbe4ad2
......@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -44,10 +45,10 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
private TeamMapper teamMapper;
@Override
public BaseResponse<IPage<TeamVo>> getPage(PageQuery pageQuery, Integer status, Integer gourpId, String name) {
public BaseResponse<IPage<TeamVo>> getPage(PageQuery pageQuery, Integer status, String groupName, String name) {
Map<String, Object> params = new HashMap<>();
params.put("status", status);
params.put("gourpId", gourpId);
params.put("groupName", groupName);
params.put("name", name);
Page<TeamVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<TeamVo> pages = teamMapper.getPage(page,params);
......@@ -72,19 +73,20 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
@Override
@Transactional
public BaseResponse<TeamVo> create(TeamQuery query) {
Team crate = Team.crate(query);
this.save(crate);
return BaseResponse.okData(crate.toVo());
public BaseResponse<Team> create(TeamQuery query) {
Team create = new Team();
BeanUtils.copyProperties(query, create);
create.setStatus(true);
teamMapper.insert(create);
return BaseResponse.okData(create);
}
@Override
@Transactional
public BaseResponse<TeamVo> update(TeamQuery query) {
Team update = Team.crate(query);
update.setId(query.getId());
this.updateById(update);
return BaseResponse.okData(update.toVo());
public BaseResponse<Team> update(TeamQuery query) {
Team update = teamMapper.selectById(query.getId());
teamMapper.updateById(update);
return BaseResponse.okData(update);
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment