java/zhihuishenqu.git

			@@ -162,6 +162,7 @@
			// 需要修改的认证记录集合
			List<ComPensionAuthRecordDO> updateList = new ArrayList<>();
			log.info("开始处理导入数据");
			Date nowDate = new Date();
			List<ComPensionAuthRecordImportMistakeExcelVO> mistakes = new ArrayList<>();
			try {
			// 查询所有人口数据放入HashMap中
			@@ -173,7 +174,6 @@
			});

			for (ComPensionAuthRecordImportExcelVO vo : list) {
			String cardNoAES = AESUtil.encrypt128(vo.getIdCard(), aesKey);
			// 判断实有人口是否已存在
			log.info("开始查询实有人口是否已存在");
			ComMngPopulationDO populationDO = null;
			@@ -187,7 +187,6 @@
			if (null == comPensionAuthPensionerDO) {
			ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO();
			BeanUtils.copyProperties(vo, mistake);
			setMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在，但本社区不存在养老信息，请先导入养老人口");
			mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format));
			mistakes.add(mistake);
			@@ -196,7 +195,6 @@
			if (!comPensionAuthPensionerDO.getIsRegister().equals(1) \|\| !comPensionAuthPensionerDO.getIsAlive().equals(1)) {
			ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO();
			BeanUtils.copyProperties(vo, mistake);
			setMistake(mistake, vo);
			mistake.setMistake("该人口不健在，或者未做养老登记");
			mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format));
			mistakes.add(mistake);
			@@ -204,16 +202,7 @@
			//满足认证条件，判断是否存在当期认证记录
			List<ComPensionAuthRecordDO> pensionAuthList = null;
			ComPensionAuthRecordDO comPensionAuthRecordDO = null;
			Date nowDate = new Date();
			// 获取当前年
			int year = DateUtils.getYear(nowDate);
			String authPeriod = "";
			if (nowDate.before(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(String.valueOf(year) + "-03-01 00:00:00"))) {
			authPeriod = String.valueOf(year - 1);
			}else {
			authPeriod = String.valueOf(year);
			}

			String authPeriod = vo.getAuthPeriod();
			pensionAuthList = comPensionAuthRecordDAO.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda().
			eq(ComPensionAuthRecordDO::getPensionerId, comPensionAuthPensionerDO.getId())
			.eq(ComPensionAuthRecordDO::getAuthPeriod, authPeriod).orderByDesc(ComPensionAuthRecordDO::getCreateAt));
			@@ -224,28 +213,21 @@
			if (comPensionAuthRecordDO.getApprovalStatus().equals(ComPensionAuthRecordDO.approvalStatus.tg)) {
			ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO();
			BeanUtils.copyProperties(vo, mistake);
			setMistake(mistake, vo);
			mistake.setMistake("该人口本期已认证，不可重复认证");
			mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format));
			mistakes.add(mistake);
			}else if (comPensionAuthRecordDO.getApprovalStatus().equals(ComPensionAuthRecordDO.approvalStatus.dsh)) {
			//存在待审核记录，进行更新认证信息
			comPensionAuthRecordDO.setSubmitUserId(userId);
			comPensionAuthRecordDO.setApproverId(userId);
			comPensionAuthRecordDO.setApprovalStatus(ComPensionAuthRecordDO.approvalStatus.tg);
			comPensionAuthRecordDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz);
			comPensionAuthRecordDO.setApprovalDate(new Date());
			comPensionAuthRecordDO.setAuthStatus(ComPensionAuthRecordDO.authStatus.rez);
			comPensionAuthRecordDO.setCommunityId(communityId);
			comPensionAuthRecordDO = updatePensionAuthRecordsDO(vo, comPensionAuthRecordDO, userId,communityId,nowDate);
			updateList.add(comPensionAuthRecordDO);
			}else {
			// 不存在记录,则新增
			comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId);
			comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId,nowDate);
			saveList.add(comPensionAuthRecordDO);
			}
			}else {
			// 不存在记录,则新增
			comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId);
			comPensionAuthRecordDO = savePensionAuthRecordsDO(vo, comPensionAuthPensionerDO, authPeriod, userId,communityId,nowDate);
			saveList.add(comPensionAuthRecordDO);
			}
			}
			@@ -254,7 +236,6 @@
			// 不存在实有人口,则新增
			ComPensionAuthRecordImportMistakeExcelVO mistake = new ComPensionAuthRecordImportMistakeExcelVO();
			BeanUtils.copyProperties(vo, mistake);
			setMistake(mistake, vo);
			mistake.setMistake("不存在该实有人口，请先导入实有人口信息");
			mistake.setAuthDate(DateUtils.format(vo.getAuthDate(),DateUtils.yyyyMMdd_format));
			mistakes.add(mistake);
			@@ -373,20 +354,21 @@
			}

			private ComPensionAuthRecordDO updatePensionAuthRecordsDO(ComPensionAuthRecordImportExcelVO vo
			, ComPensionAuthRecordDO comPensionAuthRecordsDO, Long userId , Long communityId) {
			, ComPensionAuthRecordDO comPensionAuthRecordsDO, Long userId , Long communityId,Date date) {
			BeanUtils.copyProperties(vo, comPensionAuthRecordsDO);
			comPensionAuthRecordsDO.setSubmitUserId(userId);
			comPensionAuthRecordsDO.setApproverId(userId);
			comPensionAuthRecordsDO.setApprovalStatus(PASS_THROUGH.getStatus());
			comPensionAuthRecordsDO.setApprovalDate(new Date());
			comPensionAuthRecordsDO.setAuthStatus(CERTIFIED.getStatus());
			comPensionAuthRecordsDO.setCommunityId(communityId);
			comPensionAuthRecordsDO.setApprovalStatus(ComPensionAuthRecordDO.approvalStatus.tg);
			comPensionAuthRecordsDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz);
			comPensionAuthRecordsDO.setApprovalDate(date);
			comPensionAuthRecordsDO.setAuthStatus(ComPensionAuthRecordDO.authStatus.rez);
			comPensionAuthRecordsDO.setCommunityId(communityId);
			comPensionAuthRecordsDO.setMark(vo.getMark());
			return comPensionAuthRecordsDO;
			}

			private ComPensionAuthRecordDO savePensionAuthRecordsDO(ComPensionAuthRecordImportExcelVO vo
			, ComPensionAuthPensionerDO comPensionAuthPensionerDO, String authPeriod, Long userId, Long communityId) {
			, ComPensionAuthPensionerDO comPensionAuthPensionerDO, String authPeriod, Long userId, Long communityId,Date date) {
			ComPensionAuthRecordDO comPensionAuthRecordDO = new ComPensionAuthRecordDO();
			BeanUtils.copyProperties(vo, comPensionAuthRecordDO);
			comPensionAuthRecordDO.setId(Snowflake.getId());
			@@ -399,12 +381,9 @@
			comPensionAuthRecordDO.setAuthStatus(CERTIFIED.getStatus());
			comPensionAuthRecordDO.setAuthMethod(ComPensionAuthRecordDO.authMethod.xxrz);
			comPensionAuthRecordDO.setCommunityId(communityId);
			comPensionAuthRecordDO.setCreateAt(date);
			comPensionAuthRecordDO.setMark(vo.getMark());
			return comPensionAuthRecordDO;
			}

			private void setMistake(ComPensionAuthRecordImportMistakeExcelVO mvo,
			ComPensionAuthRecordImportExcelVO vo) {
			mvo.setIsAlive(PopulHouseUseEnum.getCnDescByName(vo.getIsAlive()));
			}

			/**
			@@ -441,7 +420,8 @@
			return R.fail("该人员未在社区报道无法认证");
			}
			boolean isInfoCorrect = !comPensionAuthPensionerDO.getName().equals(addIdentityAuthDTO.getName()) \|\|
			!(comPensionAuthPensionerDO.getIsRegister() && comPensionAuthPensionerDO.getIsAlive());
			!(comPensionAuthPensionerDO.getIsRegister().equals(ComPensionAuthPensionerDO.isOk.yes)
			&& comPensionAuthPensionerDO.getIsAlive().equals(ComPensionAuthPensionerDO.isOk.yes));
			if (isInfoCorrect) {
			return R.fail("信息有误,请检查!");
			}