From e9191e6d4485d94c75f76762b4926439503c20c6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 14 九月 2023 14:29:10 +0800
Subject: [PATCH] zjh 2023/09/14---1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 42 ++++++++----------------------------------
1 files changed, 8 insertions(+), 34 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 67959ef..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);
}
@@ -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