Commit dd8c30e9 authored by zhanghonggang's avatar zhanghonggang

月份统计修改 名字修改

parent d3c6214b
...@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -101,7 +102,7 @@ public class FhjwCommentController { ...@@ -101,7 +102,7 @@ public class FhjwCommentController {
public Result<List<CommitteeCountDTO>> getCountByMouth() { public Result<List<CommitteeCountDTO>> getCountByMouth() {
List<CommitteeCountDTO> getCounts= fhjwCommentService.getCountByMouth(); List<CommitteeCountDTO> getCounts= fhjwCommentService.getCountByMouth();
Collections.reverse(getCounts);
return new Result<List<CommitteeCountDTO>>().ok(getCounts); return new Result<List<CommitteeCountDTO>>().ok(getCounts);
} }
......
...@@ -156,6 +156,8 @@ public class UserServiceImpl extends CrudServiceImpl<UserDao, UserEntity, UserDT ...@@ -156,6 +156,8 @@ public class UserServiceImpl extends CrudServiceImpl<UserDao, UserEntity, UserDT
user.setMobile(dto.getMobile()); user.setMobile(dto.getMobile());
user.setCreateDate(new Date()); user.setCreateDate(new Date());
user.setUserIdno(dto.getUserIdno()); user.setUserIdno(dto.getUserIdno());
user.setGender(dto.getGender());
user.setIdentity(dto.getIdentity());
insert(user); insert(user);
//人员-权限对应关系表 //人员-权限对应关系表
......
...@@ -132,7 +132,7 @@ public class FhiwFunctionServiceImpl extends CrudServiceImpl<FhiwFunctionDao, Fh ...@@ -132,7 +132,7 @@ public class FhiwFunctionServiceImpl extends CrudServiceImpl<FhiwFunctionDao, Fh
} }
//根据是否存在代理人,判断是否添加 "我要填写评测" 的权限! //根据是否存在代理人,判断是否添加 "我要填写评测" 的权限!
Long funcId = baseDao.selectOne(new QueryWrapper<FhiwFunctionEntity>().eq("name","我要填写评测")).getId(); Long funcId = baseDao.selectOne(new QueryWrapper<FhiwFunctionEntity>().eq("name","我要填写测评")).getId();
List<Long> funIds = new ArrayList<>(); List<Long> funIds = new ArrayList<>();
if(flag){ if(flag){
logger.info("存在代理人"); logger.info("存在代理人");
......
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