zjh
2023-09-14 3194e189b44e22cf293c6cd88d9af854a287077d
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;
    }*/
}