Commit 516822b9 authored by 竹天卫's avatar 竹天卫

更改会议纪要提出的问题

parent 8f760b2f
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
left join team_group tg on tg.id = t.group_id left join team_group tg on tg.id = t.group_id
left join method m on m.id = t.method_id left join method m on m.id = t.method_id
<include refid="where" /> <include refid="where" />
ORDER BY t.id DESC ORDER BY t.id ASC
</select> </select>
<select id="exportList" resultType="java.util.HashMap"> <select id="exportList" resultType="java.util.HashMap">
......
...@@ -77,7 +77,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i ...@@ -77,7 +77,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
if (StringUtils.isNotEmpty(supplierName)) { if (StringUtils.isNotEmpty(supplierName)) {
qw.like("supplier_name", supplierName); qw.like("supplier_name", supplierName);
} }
qw.orderByDesc("create_time"); qw.orderByDesc("name");
IPage<Standard> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize()); IPage<Standard> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
page = standardMapper.selectPage(page, qw); page = standardMapper.selectPage(page, qw);
return BaseResponse.okData(page); return BaseResponse.okData(page);
......
...@@ -49,7 +49,7 @@ public class TeamGroupServiceImpl extends ServiceImpl<TeamGroupMapper, TeamGroup ...@@ -49,7 +49,7 @@ public class TeamGroupServiceImpl extends ServiceImpl<TeamGroupMapper, TeamGroup
if(StringUtils.isNotEmpty(name)){ if(StringUtils.isNotEmpty(name)){
qw.like("name", name); qw.like("name", name);
} }
qw.orderByDesc("create_time"); qw.orderByAsc("id");
IPage<TeamGroup> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize()); IPage<TeamGroup> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
page = teamGroupMapper.selectPage(page, qw); page = teamGroupMapper.selectPage(page, qw);
return BaseResponse.okData(page); return BaseResponse.okData(page);
......
...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.service.impl; ...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.wise.sc.cement.business.entity.Team; import cn.wise.sc.cement.business.entity.Team;
import cn.wise.sc.cement.business.entity.TeamGroup;
import cn.wise.sc.cement.business.exception.BusinessExceptionEnum; import cn.wise.sc.cement.business.exception.BusinessExceptionEnum;
import cn.wise.sc.cement.business.mapper.TeamMapper; import cn.wise.sc.cement.business.mapper.TeamMapper;
import cn.wise.sc.cement.business.model.BaseResponse; import cn.wise.sc.cement.business.model.BaseResponse;
...@@ -87,6 +88,12 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT ...@@ -87,6 +88,12 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
if(query.getIsDisplay() != 1 && query.getIsDisplay() !=0){ if(query.getIsDisplay() != 1 && query.getIsDisplay() !=0){
return BaseResponse.errorMsg("委托是否可见参数错误"); return BaseResponse.errorMsg("委托是否可见参数错误");
} }
QueryWrapper<Team> qw = new QueryWrapper<>();
qw.eq("name", query.getName());
int count = teamMapper.selectCount(qw);
if (count > 0) {
return BaseResponse.errorMsg(query.getName() + "已存在");
}
BeanUtils.copyProperties(query, create); BeanUtils.copyProperties(query, create);
create.setStatus(1).setCreateTime(LocalDateTime.now()); create.setStatus(1).setCreateTime(LocalDateTime.now());
teamMapper.insert(create); teamMapper.insert(create);
...@@ -111,10 +118,18 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT ...@@ -111,10 +118,18 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
if(query.getMethodId() == null){ if(query.getMethodId() == null){
return BaseResponse.errorMsg("请选择检依据"); return BaseResponse.errorMsg("请选择检依据");
} }
QueryWrapper<Team> qw = new QueryWrapper<>();
qw.eq("name", query.getName());
qw.ne("id", query.getId());
int count = teamMapper.selectCount(qw);
if (count > 0) {
return BaseResponse.errorMsg(query.getName() + "已存在");
}
update.setGroupId(query.getGroupId()) update.setGroupId(query.getGroupId())
.setMethodId(query.getMethodId()) .setMethodId(query.getMethodId())
.setName(query.getName()) .setName(query.getName())
.setIsDisplay(query.getIsDisplay()); .setIsDisplay(query.getIsDisplay())
.setQualifications(query.getQualifications());
teamMapper.updateById(update); teamMapper.updateById(update);
return BaseResponse.okData(update); return BaseResponse.okData(update);
} }
......
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