java/zhihuishenqu.git

			@@ -92,7 +92,7 @@
			lastestOne.setIdCard(null);
			lastestOne.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
			lastestOne.setIsExist(Objects.equals("是", e.getIsExist()) ? 1 : 2);
			lastestOne.setIsBigAge(Objects.equals("是", e.getIsExist()) ? 1 : 2);
			lastestOne.setIsBigAge(Objects.equals("是", e.getIsBigAge()) ? 1 : 2);
			lastestOne.setUpdateAt(new Date());
			listUpdateDO.add(lastestOne);
			} else {
			@@ -103,7 +103,7 @@
			comEldersAuthElderlyDO.setCreateBy(createBy);
			comEldersAuthElderlyDO.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
			comEldersAuthElderlyDO.setIsExist(Objects.equals("是", e.getIsExist()) ? 1 : 2);
			comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是", e.getIsExist()) ? 1 : 2);
			comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是", e.getIsBigAge()) ? 1 : 2);
			comEldersAuthElderlyDO.setBirthday(e.getBirthday());
			comEldersAuthElderlyDO.setLevel(e.getLevel());
			listNewDO.add(comEldersAuthElderlyDO);
			@@ -145,15 +145,23 @@
			@Override
			public R updateEldersAuthElderly(EldersAuthElderlyDTO eldersAuthElderlyDTO) {
			ComEldersAuthElderlyDO comEldersAuthElderlyDO = this.baseMapper.selectById(eldersAuthElderlyDTO.getId());
			if(comEldersAuthElderlyDO == null){
			return R.fail("未查询到该老人信息");
			}
			if (!ObjectUtils.isEmpty(eldersAuthElderlyDTO.getName())) {
			comEldersAuthElderlyDO.setName(eldersAuthElderlyDTO.getName());
			}
			if (eldersAuthElderlyDTO.getIsExist() != null && eldersAuthElderlyDTO.getIsExist().intValue() != 1
			&& eldersAuthElderlyDTO.getIsExist() != 2) {
			return R.fail("参数错误，是否健在只能为1或2");
			}
			comEldersAuthElderlyDO.setIsExist(eldersAuthElderlyDTO.getIsExist());
			comEldersAuthElderlyDO.setIsBigAge(eldersAuthElderlyDTO.getIsBigAge());
			comEldersAuthElderlyDO.setIdCard(eldersAuthElderlyDTO.getIdCard());
			// if (!ObjectUtils.isEmpty(eldersAuthElderlyDTO.getIdCard())) {
			// try {
			// String idCard = AESUtil.encrypt128(eldersAuthElderlyDTO.getIdCard(), aesKey);
			// comEldersAuthElderlyDO.setIdCard(idCard);
			// } catch (Exception exp) {
			// log.error("身份证转义失败");
			// }
			// }
			baseMapper.updateEldersAuthElderly(comEldersAuthElderlyDO);
			return R.ok();
			}