From a50c7d1497d7f707b79597553d9db978ba7e9dd5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 08:59:12 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java
index 10d3453..1f27cd9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java
@@ -6,10 +6,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.query.GeneratedQuery;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TGeneratedRecordsService;
import com.ruoyi.system.service.TOrderService;
import com.ruoyi.system.service.impl.SysConfigServiceImpl;
@@ -32,10 +35,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Period;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -62,6 +62,8 @@
private NativePayService nativePayService;
@Resource
private SysConfigMapper sysConfigMapper;
+ @Resource
+ private TAppUserService appUserService;
//列表
@ApiOperation(value = "查询",tags = "后台-用户生成数据")
@PostMapping("/list")
@@ -72,7 +74,14 @@
@ApiOperation(value = "详情",tags = "后台-用户生成数据")
@PostMapping("/detail")
public R<TGeneratedRecords> detail(Long id){
- return R.ok(generatedRecordsService.getById(id));
+ TGeneratedRecords generatedRecords = generatedRecordsService.getById(id);
+ TAppUser appUser = appUserService.getById(generatedRecords.getUserId());
+ if(Objects.nonNull(appUser)){
+ generatedRecords.setAvatar(appUser.getAvatar());
+ generatedRecords.setUserPhone(appUser.getPhone());
+ generatedRecords.setUserName(appUser.getName());
+ }
+ return R.ok(generatedRecords);
}
@ApiOperation(value = "检查当前用户是否付费",tags = {"web-职称工作总结"})
@PostMapping("/pay/check")
@@ -155,7 +164,7 @@
prepayRequest.setMchid(weChatConfig.merchantId);
prepayRequest.setOutTradeNo(byId1.getCode());
prepayRequest.setDescription("生成工作总结");
- prepayRequest.setNotifyUrl("http://www.zhipingwang.com.cn:8081/call-back/buy");
+ prepayRequest.setNotifyUrl("http://vwpmxwbhv59i.guyubao.com/call-back/buy");
com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount();
amount.setTotal(payMoney.multiply(BigDecimal.valueOf(100)).intValue());
prepayRequest.setAmount(amount);
@@ -232,7 +241,7 @@
templateParam.put("workUnit", generatedRecords.getWorkUnit());
templateParam.put("workContent", generatedRecords.getWorkContent());
templateParam.put("generateUniversityComplete", generatedRecords.getGenerateUniversityComplete());
- templateParam.put("level", generatedRecords.getLevel());
+ templateParam.put("level", generatedRecords.getTechnicalName());
templateParam.put("technicalName", generatedRecords.getTechnicalName());
templateParam.put("majorName", generatedRecords.getMajorName());
templateParam.put("certificate", generatedRecords.getCertificate());
@@ -243,10 +252,10 @@
// wordUtil.generate(response, "/templates", "专业技术工作总结.xml", templateParam, "测试动态列表Word");
if (generatedRecords.getType()==1) {
- String url = wordUtil.generate("/templates", "专业技术工作总结.xml", templateParam, "职称工作总结", "F:\\");
+ String url = wordUtil.generate("/templates", "专业技术工作总结.xml", templateParam, "专业技术工作总结", "F:\\");
return R.ok(url);
}else {
- String url = wordUtil.generatePdf("/templates", "专业技术工作总结.xml", templateParam, "职称工作总结", "F:\\");
+ String url = wordUtil.generatePdf("/templates", "专业技术工作总结.xml", templateParam, "专业技术工作总结", "F:\\");
return R.ok(url);
}
@@ -275,10 +284,10 @@
// wordUtil.generate(response, "/templates", "专业技术工作总结.xml", templateParam, "测试动态列表Word");
if (generatedRecords.getType()==1) {
- String url = wordUtil.generate("/templates", "专业技术工作总结.xml", templateParam, "职称工作总结", "F:\\");
+ String url = wordUtil.generate("/templates", "专业技术工作总结.xml", templateParam, "专业技术工作总结", "F:\\");
return R.ok(url);
}else {
- String url = wordUtil.generatePdf("/templates", "专业技术工作总结.xml", templateParam, "职称工作总结", "F:\\");
+ String url = wordUtil.generatePdf("/templates", "专业技术工作总结.xml", templateParam, "专业技术工作总结", "F:\\");
return R.ok(url);
}
--
Gitblit v1.7.1