java/zhihuishenqu.git

			@@ -33,6 +33,7 @@
			import lombok.RequiredArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.context.annotation.Lazy;
			import org.springframework.core.io.ClassPathResource;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			@@ -610,6 +611,7 @@
			int reporterLevel;
			Long reporterId = null;
			String departmentName = "";
			String reporter = "";
			if (identityInformationVO.getIdentity() == 1) {
			PartyMember partyMember = partyMemberService.getPartyMemberByPhone(phone);
			superiorId = partyMember.getCommunityId();
			@@ -617,6 +619,7 @@
			reportType = 4;
			reporterLevel = 5;
			departmentName = partyMember.getDistricts() + "-" + partyMember.getStreet() + "-" + partyMember.getCommunity();
			reporter = partyMember.getName();
			} else if (identityInformationVO.getIdentity() == 2) {
			int accountLevel = adminUser.getAccountLevel(); // 改为基本类型
			if (accountLevel == 1) {
			@@ -624,6 +627,7 @@
			}
			reportType = accountLevel - 1;
			reporterLevel = accountLevel;
			reporter = adminUser.getName();

			// 使用基本类型比较并补充默认分支
			if (accountLevel == ReportTypeEnum.COMMUNITY.getCode()) {
			@@ -691,7 +695,7 @@
			complaintAuditRecord.setCreateTime(new Date());
			complaintAuditRecord.setUpdateBy(loginUserInfoVO.getUserId());
			complaintAuditRecord.setUpdateTime(new Date());
			complaintAuditRecord.setReporter(loginUserInfoVO.getNickName());
			complaintAuditRecord.setReporter(reporter);
			complaintAuditRecord.setReportType(reportType);
			complaintAuditRecord.setSuperiorId(superiorId);
			complaintAuditRecord.setComment(dto.getComment());
			@@ -807,6 +811,8 @@
			if (Objects.isNull(complaintAuditRecord)) {
			throw new ServiceException("上报申请记录不存在");
			}
			complaintAuditRecord.setAuditorName(systemUser.getName());
			complaintAuditRecord.setAuditorPhone(systemUser.getPhone());
			if (complaintReporAuditDTO.getAuditResult().equals(1)) {
			complaintAuditRecord.setAuditStatus(1);
			complaintAuditRecord.setAuditorId(loginUserInfoVO.getUserId());
			@@ -1235,8 +1241,8 @@
			response.setContentType("application/octet-stream");
			String fileNameEncode = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
			response.setHeader("Content-disposition", "attachment;filename=\"" + fileNameEncode + ".docx" + "\"");
			String fileTemplateName = FileUtil.getPath() + "template/" + fileName + ".docx";
			XWPFTemplate.compile(fileTemplateName).render(map).writeAndClose(response.getOutputStream());
			ClassPathResource resource = new ClassPathResource("template/" + fileName + ".docx");
			XWPFTemplate.compile(resource.getFile()).render(map).writeAndClose(response.getOutputStream());
			}