|
|
@@ -83,7 +83,7 @@ public class RateService {
|
|
|
orig.setApplyTime(now);
|
|
|
//发送短信给地区考级管理人员
|
|
|
Map<String, String> applyMap = this.applyMessage(district, now);
|
|
|
- njwlSmsService.sendSms(applyMap.get("phone"), applyMap.get("message"));
|
|
|
+// njwlSmsService.sendSms(applyMap.get("phone"), applyMap.get("message"));
|
|
|
break;
|
|
|
case REVIEW_PENDING: // 分配专家组 3
|
|
|
// 发送给专家组长和组员
|
|
|
@@ -91,8 +91,8 @@ public class RateService {
|
|
|
throw new BusinessException("专家组长或组员不能为空");
|
|
|
}
|
|
|
Map<String, String> map = this.reviewTimesMessage(orig);
|
|
|
- njwlSmsService.sendSms(map.get("phone"), map.get("message"));
|
|
|
- njwlSmsService.sendSms(map.get("phone1"), map.get("message1"));
|
|
|
+// njwlSmsService.sendSms(map.get("phone"), map.get("message"));
|
|
|
+// njwlSmsService.sendSms(map.get("phone1"), map.get("message1"));
|
|
|
break;
|
|
|
case SUBMIT_GRADE:// 专家组提交成绩 4
|
|
|
orig.setUndertakeExamination(examination);
|
|
|
@@ -105,7 +105,7 @@ public class RateService {
|
|
|
rateAuditRepo.save(rateAudit);
|
|
|
Map<String, String> gradeMessage = this.gradeMessage(now, orig.getExpertUserId(), orig
|
|
|
.getName());
|
|
|
- njwlSmsService.sendSms(gradeMessage.get("phone"), gradeMessage.get("message"));
|
|
|
+// njwlSmsService.sendSms(gradeMessage.get("phone"), gradeMessage.get("message"));
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
|
@@ -125,7 +125,7 @@ public class RateService {
|
|
|
record.setApplyTime(now);
|
|
|
//发送短信给地区考级管理人员
|
|
|
Map<String, String> map = this.applyMessage(district, now);
|
|
|
- njwlSmsService.sendSms(map.get("phone"), map.get("message"));
|
|
|
+// njwlSmsService.sendSms(map.get("phone"), map.get("message"));
|
|
|
}
|
|
|
record.setSort(record.getStatus().getSort());
|
|
|
return rateRepo.save(record);
|
|
|
@@ -169,7 +169,7 @@ public class RateService {
|
|
|
switch (status) {
|
|
|
case FIRST_REVIEW_DENY:
|
|
|
// 发送短信给承办单位
|
|
|
- njwlSmsService.sendSms(rate.getOwnerPhone(), "你单位等级评定申请被" + rate.getDistrict() + "文化和旅游局退回,请根据反馈意见及时处理!");
|
|
|
+// njwlSmsService.sendSms(rate.getOwnerPhone(), "你单位等级评定申请被" + rate.getDistrict() + "文化和旅游局退回,请根据反馈意见及时处理!");
|
|
|
break;
|
|
|
case ASSIGN_EXPERT:
|
|
|
DateTimeFormatter dtf = DateTimeFormatter.ofPattern(DateConfig.DEFAULT_DATE_TIME_FORMAT);
|
|
|
@@ -178,7 +178,7 @@ public class RateService {
|
|
|
.map(User::getPhone)
|
|
|
.collect(Collectors.joining(","));
|
|
|
String message1 = "您于" + dtf.format(LocalDateTime.now()) + ",收到" + rate.getDistrict() + "文化和旅游局上报的承办单位等级评定申请。";
|
|
|
- njwlSmsService.sendSms(phone1, message1);
|
|
|
+// njwlSmsService.sendSms(phone1, message1);
|
|
|
break;
|
|
|
case REVIEW_DENY:
|
|
|
String phone = userRepo.findAllByDistrictAndAuthoritiesContainsAndDelFalse(rate.getDistrict(), Authority
|
|
|
@@ -187,7 +187,7 @@ public class RateService {
|
|
|
.map(User::getPhone)
|
|
|
.collect(Collectors.joining(","));
|
|
|
String message = "你区上报的承办单位等级评定申请被市文化和旅游局等级评定委员会退回,请根据反馈意见及时处理!";
|
|
|
- njwlSmsService.sendSms(phone, message);
|
|
|
+// njwlSmsService.sendSms(phone, message);
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
|
@@ -218,8 +218,8 @@ public class RateService {
|
|
|
throw new BusinessException("未设置具体审查时间");
|
|
|
}
|
|
|
Map<String, String> body = this.reviewTimeMessage(rate);
|
|
|
- njwlSmsService.sendSms(body.get("phone"), body.get("message"));
|
|
|
- njwlSmsService.sendSms(body.get("phone1"), body.get("message1"));
|
|
|
+// njwlSmsService.sendSms(body.get("phone"), body.get("message"));
|
|
|
+// njwlSmsService.sendSms(body.get("phone1"), body.get("message1"));
|
|
|
return rate;
|
|
|
}
|
|
|
|
|
|
@@ -238,9 +238,6 @@ public class RateService {
|
|
|
.status(status.toString())
|
|
|
.build();
|
|
|
rateAuditRepo.save(rateAudit);
|
|
|
-// if (RateStatus.COMPLETE.equals(status)) {
|
|
|
-// njwlSmsService.sendSms(rate.getOwnerPhone(), "等级评定结果公告已发布,请在南京市文化和旅游局官方网站(http://wlj.nanjing.gov.cn/)上查询。");
|
|
|
-// }
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -563,6 +560,9 @@ public class RateService {
|
|
|
* @throws IOException
|
|
|
*/
|
|
|
public void mergePdf(Rate rate) throws IOException {
|
|
|
+ if (StrUtil.isNotBlank(rate.getPdfUrl())) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
List<InputStream> files = this.upLoad1(rate);
|
|
|
|
|
|
String targetPath = localPath + "/material" + rate.getId() + ".pdf";
|
|
|
@@ -580,6 +580,8 @@ public class RateService {
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
+ rate.setPdfUrl("http://yskj.njlyw.cn:8081/files/pdf/material" + rate.getId() + ".pdf");
|
|
|
+ rateRepo.save(rate);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -740,9 +742,9 @@ public class RateService {
|
|
|
String phones = rates.stream().map(Rate::getOwnerPhone).collect(Collectors.joining(","));
|
|
|
|
|
|
if (announcement) {
|
|
|
- njwlSmsService.sendSms(phones, "等级评定结果公告已发布,请在南京市文化和旅游局官方网站(http://wlj.nanjing.gov.cn/)上查询。");
|
|
|
+// njwlSmsService.sendSms(phones, "等级评定结果公告已发布,请在南京市文化和旅游局官方网站(http://wlj.nanjing.gov.cn/)上查询。");
|
|
|
} else {
|
|
|
- njwlSmsService.sendSms(phones, "【宁艺通】2021年南京考级承办单位等级评定工作已完成,拟评定结果已在南京市文化和旅游局官网公示。请你单位登陆“宁艺通”等级评定系统下载打印等级评定材料,并于11月15日前将纸质申报表及完整佐证材料(各2份)送属地区文化和旅游局履行线下审核程序,逾期不送,作自动放弃处理。");
|
|
|
+// njwlSmsService.sendSms(phones, "【宁艺通】2021年南京考级承办单位等级评定工作已完成,拟评定结果已在南京市文化和旅游局官网公示。请你单位登陆“宁艺通”等级评定系统下载打印等级评定材料,并于11月15日前将纸质申报表及完整佐证材料(各2份)送属地区文化和旅游局履行线下审核程序,逾期不送,作自动放弃处理。");
|
|
|
}
|
|
|
}
|
|
|
|