From 8720970864b887e34adc94e5bf5b19e709a1c042 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 04 一月 2024 18:05:10 +0800
Subject: [PATCH] zjh 2024/01/04--2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java
index 81a47fd..46c1eda 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPureToneTestController.java
@@ -12,10 +12,9 @@
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjXdPicture;
-import com.ltkj.hosp.service.ITjCustomerService;
-import com.ltkj.hosp.service.ITjProjectService;
-import com.ltkj.hosp.service.TjAsyncService;
+import com.ltkj.hosp.service.*;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,7 +27,6 @@
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.enums.BusinessType;
import com.ltkj.hosp.domain.TjPureToneTest;
-import com.ltkj.hosp.service.ITjPureToneTestService;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
@@ -48,12 +46,14 @@
private ITjCustomerService customerService;
@Autowired
private ISysConfigService configService;
+ @Resource
+ private ITjOrderService orderService;
/**
* 鏌ヨ绾煶鍚槇娴嬭瘯鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:list')")
+ //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:list')")
@GetMapping("/list")
@ApiOperation(value = "绾煶鍚槇鏌ヨ(榛樿鑷甫)")
public TableDataInfo list(TjPureToneTest tjPureToneTest) {
@@ -81,10 +81,16 @@
for (Map.Entry<String, List<TjPureToneTest>> entry : stringListMap.entrySet()) {
Map<String,Object>map=new HashMap<>();
TjCustomer customer = customerService.getById(entry.getKey());
+ if(customer==null) continue;
customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
customer.setTjNumber(entry.getValue().get(0).getTjNum());
+ TjOrder order = orderService.getOrderByTjNum(entry.getValue().get(0).getTjNum());
+ if(null !=order){
+ customer.setTjTime(order.getCreateTime());
+ customer.setTjType(order.getTjCategory());
+ }
map.put("list",entry.getValue());
map.put("customer",customer);
map.put("picturePath",configService.selectConfigByKey("TjPureToneTest"));
@@ -105,7 +111,7 @@
/**
* 瀵煎嚭绾煶鍚槇娴嬭瘯鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:export')")
+ //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:export')")
@Log(title = "绾煶鍚槇娴嬭瘯", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation(value = "瀵煎嚭绾煶鍚槇娴嬭瘯鍒楄〃")
@@ -118,7 +124,7 @@
/**
* 鑾峰彇绾煶鍚槇娴嬭瘯璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:query')")
+ //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:query')")
@GetMapping(value = "/{id}")
@ApiOperation(value = "鑾峰彇绾煶鍚槇娴嬭瘯璇︾粏淇℃伅")
public AjaxResult getInfo(@PathVariable("id") String id) {
@@ -128,7 +134,7 @@
/**
* 鏂板绾煶鍚槇娴嬭瘯
*/
- @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:add')")
+ //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:add')")
@Log(title = "绾煶鍚槇娴嬭瘯", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation(value = "鏂板绾煶鍚槇娴嬭瘯")
@@ -139,7 +145,7 @@
/**
* 淇敼绾煶鍚槇娴嬭瘯
*/
- @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:edit')")
+ //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:edit')")
@Log(title = "绾煶鍚槇娴嬭瘯", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation(value = "淇敼绾煶鍚槇娴嬭瘯")
@@ -150,7 +156,7 @@
/**
* 鍒犻櫎绾煶鍚槇娴嬭瘯
*/
- @PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:remove')")
+ //@PreAuthorize("@ss.hasPermi('pureToneTest:pureToneTest:remove')")
@Log(title = "绾煶鍚槇娴嬭瘯", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@ApiOperation(value = "鍒犻櫎绾煶鍚槇娴嬭瘯")
--
Gitblit v1.8.0