From 3194e189b44e22cf293c6cd88d9af854a287077d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 14 九月 2023 16:29:12 +0800
Subject: [PATCH] zjh 2023/09/14---3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 52 +++++++++++++---------------------------------------
1 files changed, 13 insertions(+), 39 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 1004756..ee7de4a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -134,7 +134,7 @@
customer.setTjNumber(tjOrder.getTjNumber());
customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
customer.setOrderId(tjOrder.getOrderId());
- customer.setTjTime(tjOrder.getFinishTime());
+ customer.setTjTime(tjOrder.getCreateTime());
customer.setFinishTime(tjOrder.getFinishTime());
customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
@@ -211,6 +211,13 @@
vo.setZhupdateTime(remark.getUpdateTime());
list.add(vo);
}
+
+ Collections.sort(list, new Comparator<CsProVo>() {
+ @Override
+ public int compare(CsProVo o1, CsProVo o2) {
+ return o1.getType()-o2.getType();
+ }
+ });
}
return AjaxResult.success(list);
}
@@ -221,7 +228,7 @@
*/
@GetMapping("/confirmOrder")
@ApiOperation(value = "鍒濆(骞朵慨鏀圭姸鎬�)鎺ュ彛")
- @PreAuthorize("@ss.hasPermi('check:check:confirmOrder')")
+// @PreAuthorize("@ss.hasPermi('check:check:confirmOrder')")
@Transactional
public AjaxResult confirmOrder(@ApiParam(value = "tjNumber") @RequestParam String tjNumber,
@ApiParam(value = "鐘舵�� 0鍚屾剰1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status,
@@ -273,7 +280,7 @@
*/
@GetMapping("/getList")
@ApiOperation(value = "鏌ヨ浣撴璁板綍瀹㈡埛鍒楄〃")//0寰�1宸�
- @PreAuthorize("@ss.hasPermi('check:check:getList')")
+// @PreAuthorize("@ss.hasPermi('check:check:getList')")
public AjaxResult getList(@ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam(required = false) Integer checkStatus,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
@@ -382,7 +389,7 @@
*/
@PutMapping("/getTjdetailList")
@ApiOperation(value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
- @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
+// @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
public AjaxResult getTjdetailList(@ApiParam(value = "浣撴tjNumber") @RequestParam String tjNumber,
@ApiParam(value = "鎬绘寤鸿") @RequestParam(required = false) String advice,
@ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus) {
@@ -431,7 +438,7 @@
*/
@GetMapping("/updateCheckType")
@ApiOperation(value = "鎬绘鐐瑰嚮浣撴淇℃伅璇︽儏")
- @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
+// @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
public AjaxResult updateCheckType(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
List<Map<String, Object>> list = new ArrayList<>();
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
@@ -524,7 +531,7 @@
@GetMapping("/getTm")
@ApiOperation(value = "鑾峰彇鏉＄爜")
- @PreAuthorize("@ss.hasPermi('check:check:getTm')")
+// @PreAuthorize("@ss.hasPermi('check:check:getTm')")
public AjaxResult getTm(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
return AjaxResult.success(tjNumber);
}
@@ -585,37 +592,4 @@
return AjaxResult.success(map);
}
- /*private boolean getAjaxResult(@RequestParam(defaultValue = "1") @ApiParam("椤电爜鏁�(榛樿1)") Integer page,
- @RequestParam(defaultValue = "10") @ApiParam("鏄剧ず鏉℃暟(榛樿10)") Integer pageSize,
- List<TjOrder> orderList,
- List<TjCustomer> customerList,
- Map<String, Object> map) {
- if (null != orderList && orderList.size() > 0) {
- for (TjOrder tjOrder : orderList) {
- TjCustomer customer = customerService.selectTjCustomerByCusId(tjOrder.getUserId());
- if (null == customer) {
- continue;
- }
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(tjOrder.getTjNumber());
- customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
- customer.setOrderId(tjOrder.getOrderId());
- customer.setTjTime(tjOrder.getCreateTime());
- customer.setFinishTime(tjOrder.getFinishTime());
- if (tjOrder.getFirmId() == null || tjOrder.getFirmId().equals("0")) {
- customer.setTjCompName("鏃�");
- } else {
- customer.setTjCompName(compService.getById(tjOrder.getFirmId()).getCnName());
- }
- customerList.add(customer);
- }
- List<TjCustomer> customers = customerList.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- map.put("customers", customers);
- map.put("total", customerList.size());
- return true;
- }
- return false;
- }*/
}
--
Gitblit v1.8.0