|
@@ -99,6 +99,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
, sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
|
|
, sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
|
|
//拆分搜索接口中年龄字段
|
|
//拆分搜索接口中年龄字段
|
|
setAgeScope(czrk);
|
|
setAgeScope(czrk);
|
|
|
|
+ startPage();
|
|
List<Czrk> czrkNotRl = czrkMapper.selectCzrkByNotRl(czrk);
|
|
List<Czrk> czrkNotRl = czrkMapper.selectCzrkByNotRl(czrk);
|
|
return czrkNotRl;
|
|
return czrkNotRl;
|
|
}
|
|
}
|
|
@@ -117,6 +118,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
, sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
|
|
, sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
|
|
//拆分搜索接口中年龄字段
|
|
//拆分搜索接口中年龄字段
|
|
setAgeScope(czrk);
|
|
setAgeScope(czrk);
|
|
|
|
+ startPage();
|
|
List<Czrk> czrkNotRl = czrkMapper.selectCzrkByNotRlCz(czrk);
|
|
List<Czrk> czrkNotRl = czrkMapper.selectCzrkByNotRlCz(czrk);
|
|
return czrkNotRl;
|
|
return czrkNotRl;
|
|
}
|
|
}
|
|
@@ -142,6 +144,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
//如果查询参数有居住地址,进行连表查询
|
|
//如果查询参数有居住地址,进行连表查询
|
|
if (StringUtils.isNotBlank(provinceId) || StringUtils.isNotBlank(cityId) || StringUtils.isNotBlank(regionId) || StringUtils.isNotBlank(villageTownsId) || StringUtils.isNotBlank(villageId)) {
|
|
if (StringUtils.isNotBlank(provinceId) || StringUtils.isNotBlank(cityId) || StringUtils.isNotBlank(regionId) || StringUtils.isNotBlank(villageTownsId) || StringUtils.isNotBlank(villageId)) {
|
|
long startTimeSql = System.currentTimeMillis();
|
|
long startTimeSql = System.currentTimeMillis();
|
|
|
|
+ startPage();
|
|
List<Czrk> czrks = czrkMapper.listCzrkByJzdz(czrk);
|
|
List<Czrk> czrks = czrkMapper.listCzrkByJzdz(czrk);
|
|
long endTimeSql = System.currentTimeMillis() - startTimeSql;
|
|
long endTimeSql = System.currentTimeMillis() - startTimeSql;
|
|
log.info("执行查询人员信息中包含居住地址的sql语句时间:" + endTimeSql + "ms");
|
|
log.info("执行查询人员信息中包含居住地址的sql语句时间:" + endTimeSql + "ms");
|
|
@@ -150,6 +153,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
}
|
|
}
|
|
long startTimeSql = System.currentTimeMillis();
|
|
long startTimeSql = System.currentTimeMillis();
|
|
//没有搜索居住地址的条件,进行单表查询
|
|
//没有搜索居住地址的条件,进行单表查询
|
|
|
|
+ startPage();
|
|
List<Czrk> czrks = czrkMapper.listByCzrk(czrk);
|
|
List<Czrk> czrks = czrkMapper.listByCzrk(czrk);
|
|
long endTimeSql = System.currentTimeMillis() - startTimeSql;
|
|
long endTimeSql = System.currentTimeMillis() - startTimeSql;
|
|
log.info("执行查询sql语句时间:" + endTimeSql + "ms");
|
|
log.info("执行查询sql语句时间:" + endTimeSql + "ms");
|
|
@@ -169,7 +173,6 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
log.info("{}于{}查询非正常人员人员列表,查询条件:{}"
|
|
log.info("{}于{}查询非正常人员人员列表,查询条件:{}"
|
|
, sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
|
|
, sysUser.getUserName(), DateUtils.dateTimeNow(), JSON.toJSONString(czrk));
|
|
setAgeScope(czrk);
|
|
setAgeScope(czrk);
|
|
-
|
|
|
|
//设置权限
|
|
//设置权限
|
|
setQueryRole(czrk, sysUser, Czrk.HJ);
|
|
setQueryRole(czrk, sysUser, Czrk.HJ);
|
|
startPage();
|
|
startPage();
|
|
@@ -625,6 +628,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public AjaxResult changeCzrk(Czrk czrk) {
|
|
public AjaxResult changeCzrk(Czrk czrk) {
|
|
|
|
+ SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
|
|
//判断一下id是否存在
|
|
//判断一下id是否存在
|
|
Long id = czrk.getId();
|
|
Long id = czrk.getId();
|
|
if (id == null) {
|
|
if (id == null) {
|
|
@@ -632,34 +636,35 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
}
|
|
}
|
|
//如果是迁出,则放到待认领中
|
|
//如果是迁出,则放到待认领中
|
|
String status = czrk.getStatus();
|
|
String status = czrk.getStatus();
|
|
|
|
+ //根据id查询出这个人信息
|
|
|
|
+ Czrk czrkQianchu = czrkMapper.selectCzrkById(id);
|
|
|
|
+ //先保存这个人的信息,当做历史记录
|
|
|
|
+ czrkChangeMapper.insertCzrkChange(czrkQianchu);
|
|
if (StringUtils.isNotBlank(status) && "2".equals(status)) {
|
|
if (StringUtils.isNotBlank(status) && "2".equals(status)) {
|
|
- //根据id查询出这个人信息
|
|
|
|
- Czrk czrkQianchu = czrkMapper.selectCzrkById(id);
|
|
|
|
- //先保存这个人的信息,当做历史记录
|
|
|
|
- czrkChangeMapper.insertCzrkChange(czrkQianchu);
|
|
|
|
czrkQianchu.setIsRl("否");
|
|
czrkQianchu.setIsRl("否");
|
|
czrkQianchu.setRlr("");
|
|
czrkQianchu.setRlr("");
|
|
czrkQianchu.setRlrNike("");
|
|
czrkQianchu.setRlrNike("");
|
|
|
|
+ czrkQianchu.setIsConfirm("N");
|
|
|
|
+ czrkQianchu.setConfirmInfoUser("");
|
|
|
|
+ czrkQianchu.setChangNikeUser("");
|
|
|
|
+ czrkQianchu.setChangUserTime(null);
|
|
|
|
+ czrkQianchu.setChangUser(sysUser.getUserName());
|
|
|
|
+ czrkQianchu.setChangNikeUser(sysUser.getNickName());
|
|
|
|
+ czrkQianchu.setChangUserTime(DateUtils.getNowDate());
|
|
|
|
+ czrkQianchu.setStatus("1");
|
|
czrkMapper.updateCzrk(czrkQianchu);
|
|
czrkMapper.updateCzrk(czrkQianchu);
|
|
return AjaxResult.success();
|
|
return AjaxResult.success();
|
|
}
|
|
}
|
|
//接下来则放入其他状态中
|
|
//接下来则放入其他状态中
|
|
- //往czrk_change表中插入历史数据
|
|
|
|
- czrkChangeMapper.insertCzrkChange(czrk);
|
|
|
|
- LoginUser loginUser = tokenService.getLoginUser();
|
|
|
|
- if (loginUser != null) {
|
|
|
|
- SysUser sysUser = loginUser.getSysUser();
|
|
|
|
- if (sysUser != null) {
|
|
|
|
- String userName = sysUser.getUserName();
|
|
|
|
- czrk.setChangUser(userName);
|
|
|
|
- czrk.setChangUserTime(DateUtils.getNowDate());
|
|
|
|
- czrk.setChangNikeUser(sysUser.getNickName());
|
|
|
|
- czrkMapper.changeCzrk(czrk);
|
|
|
|
- return AjaxResult.success();
|
|
|
|
- }
|
|
|
|
- return AjaxResult.error("变更失败:没有获取到登录人信息");
|
|
|
|
|
|
+ if (sysUser != null) {
|
|
|
|
+ String userName = sysUser.getUserName();
|
|
|
|
+ czrk.setChangUser(userName);
|
|
|
|
+ czrk.setChangUserTime(DateUtils.getNowDate());
|
|
|
|
+ czrk.setChangNikeUser(sysUser.getNickName());
|
|
|
|
+ czrkMapper.changeCzrk(czrk);
|
|
|
|
+ return AjaxResult.success();
|
|
}
|
|
}
|
|
- return AjaxResult.error("变更失败");
|
|
|
|
|
|
+ return AjaxResult.error("变更失败:没有获取到登录人信息");
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -879,7 +884,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
//没有搜索居住地址的条件,进行单表查询
|
|
//没有搜索居住地址的条件,进行单表查询
|
|
czrks = czrkMapper.listByCzrk(czrk);
|
|
czrks = czrkMapper.listByCzrk(czrk);
|
|
}
|
|
}
|
|
- if (czrks != null && czrks.size() > 0){
|
|
|
|
|
|
+ if (czrks != null && czrks.size() > 0) {
|
|
//户籍人口全部人员
|
|
//户籍人口全部人员
|
|
total = czrks.size();
|
|
total = czrks.size();
|
|
//户籍人口已认领
|
|
//户籍人口已认领
|