|
@@ -157,19 +157,6 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
crk.setNowInSelect(provinceCz + cityCz + regionCz + villageTownsCz + villageCz);
|
|
|
}
|
|
|
}
|
|
|
-/* List<CzrkJzdz> czrkJzdzs = czrkJzdzService.selectCzrkJzdzList(czrkJzdz);
|
|
|
- List<String> idCardList = new ArrayList<>();
|
|
|
- if (czrkJzdzs != null && czrkJzdzs.size() > 0) {
|
|
|
- for (CzrkJzdz jzdz : czrkJzdzs) {
|
|
|
- String idCard = jzdz.getIdCard();
|
|
|
- if (StringUtils.isNotBlank(idCard)) {
|
|
|
- idCardList.add(idCard);
|
|
|
- }
|
|
|
- }
|
|
|
- czrk.setIdCardList(idCardList);
|
|
|
- czrks = czrkMapper.listByRlry(czrk);
|
|
|
- handleList(czrks, Czrk.HJ, czrkJzdzs);
|
|
|
- }*/
|
|
|
return czrks;
|
|
|
}
|
|
|
if (null == provinceId && null == cityId && null == regionId && null == villageTownsId && null == villageId) {
|
|
@@ -764,7 +751,7 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType, String houseType, String isConfirm) {
|
|
|
+ public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String idCard, String queryType, String houseType, String isConfirm) {
|
|
|
Long areaId = null;
|
|
|
int type = 0, yrl = 0, wrl = 0;
|
|
|
if (ObjectUtils.isNotEmpty(provinceId)) {
|
|
@@ -786,11 +773,11 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
|
|
|
|
if (Czrk.HJ.equals(queryType)) {
|
|
|
// 户籍
|
|
|
- yrl = czrkMapper.stsByYrl(type, areaId, userName, houseType, isConfirm);
|
|
|
- wrl = czrkMapper.stsByWrl(type, areaId, userName, houseType, isConfirm);
|
|
|
+ yrl = czrkMapper.stsByYrl(type, areaId, idCard, houseType, isConfirm);
|
|
|
+ wrl = czrkMapper.stsByWrl(type, areaId, idCard, houseType, isConfirm);
|
|
|
} else {
|
|
|
// 常住
|
|
|
- List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, userName, houseType, isConfirm);
|
|
|
+ List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, idCard, houseType, isConfirm);
|
|
|
for (Czrk czrk : rls) {
|
|
|
if ("是".equals(czrk.getIsRl())) {
|
|
|
yrl++;
|