zjh20250319

zjh

2025-03-19 a3721222ee4ef79211db6a4c5738205c4a381f7c

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java

@@ -221,6 +221,7 @@
    public AjaxResult getCusList(@RequestParam(defaultValue = "1") @ApiParam(value = "0是1否") Integer isSignFor,
                                 @RequestParam(required = false) @ApiParam(value = "体检号") String tjNum,
                                 @RequestParam(required = false) @ApiParam(value = "客户姓名") String name,
                                 @RequestParam(required = false) @ApiParam(value = "单位") String dw,
                                 @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer pageNum,
                                 @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize,
                                 @ApiParam(value = "开始时间") @RequestParam(required = false) String beginTime,
@@ -234,6 +235,17 @@
            wrapper.like(TjSampling::getCusName, name);
        if (null != beginTime && null != endTime && StrUtil.isNotBlank(beginTime) && StrUtil.isNotBlank(endTime))
            wrapper.between(TjSampling::getApplicationTime, beginTime, endTime);
        if (StrUtil.isNotBlank(dw)){
            LambdaQueryWrapper<TjOrder> wqq=new LambdaQueryWrapper<>();
            wqq.like(TjOrder::getFirmId,dw);
            wqq.select(TjOrder::getTjNumber);
            List<TjOrder> orderList = orderService.list(wqq);
            if(null !=orderList && !orderList.isEmpty()){
                List<String> list = orderList.stream().map(TjOrder::getTjNumber).collect(Collectors.toList());
                wrapper.in(TjSampling::getTjNum, list);
            }
        }

        wrapper.groupBy(TjSampling::getCusId);
        wrapper.orderByDesc(TjSampling::getCreateTime);
//        wrapper.last("LIMIT " + (pageNum - 1) * pageSize + "," + pageSize);
@@ -243,6 +255,8 @@
        for (TjSampling tjSampling : list) {
            TjCustomer customer = customerService.getById(tjSampling.getCusId());
            if(null !=customer){
                TjOrder order = orderService.getOrderByTjNum(tjSampling.getTjNum());
                customer.setCompName(order.getFirmName());
                customer.setCusName(customer.getCusName());
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
@@ -364,7 +378,7 @@
        if (list.size() >= 2) {
            // 进行合并
            List<String> stringList = list.stream().map(TjSampling::getId).collect(Collectors.toList());
            log.info("提取id ->{}",stringList);
//            log.info("提取id ->{}",stringList);
            for (String s : stringList) {
                if (tjSamplingService.isMergeItem(s) != 0) {
                    list.removeIf(item -> Objects.equals(item.getId(), s));