zjh202412019

zjh

2024-12-19 e14e4217b3f53a5cad511b4331cd7c0a40a40db2

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

@@ -216,24 +216,27 @@
        LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(TjSampling::getIsSignFor, isSignFor);
        if (null != tjNum && StrUtil.isNotBlank(tjNum))
            wrapper.eq(TjSampling::getTjNum, tjNum);
            wrapper.like(TjSampling::getTjNum, tjNum);
        if (null != name && StrUtil.isNotBlank(name))
            wrapper.eq(TjSampling::getCusName, name);
            wrapper.like(TjSampling::getCusName, name);
        if (null != beginTime && null != endTime && StrUtil.isNotBlank(beginTime) && StrUtil.isNotBlank(endTime))
            wrapper.between(TjSampling::getApplicationTime, beginTime, endTime);
        wrapper.groupBy(TjSampling::getCusId);
        wrapper.orderByDesc(TjSampling::getCreateTime);
//        wrapper.last("LIMIT " + (pageNum - 1) * pageSize + "," + pageSize);
        Page<TjSampling> page = tjSamplingService.page(samplingPage, wrapper);
        List<TjSampling> list = page.getRecords();
        ArrayList<TjCustomer> tjCustomers = new ArrayList<>();
        for (TjSampling tjSampling : list) {
            TjCustomer customer = customerService.getById(tjSampling.getCusId());
            customer.setCusName(customer.getCusName());
            customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
            customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
            customer.setTjNumber(tjSampling.getTjNum());
            customer.setApplicationTime(tjSampling.getApplicationTime());
            tjCustomers.add(customer);
            if(null !=customer){
                customer.setCusName(customer.getCusName());
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                customer.setTjNumber(tjSampling.getTjNum());
                customer.setApplicationTime(tjSampling.getApplicationTime());
                tjCustomers.add(customer);
            }
        }
        HashMap<String, Object> hashMap = new HashMap<>();
        hashMap.put("list", tjCustomers);
@@ -244,31 +247,31 @@
    /**
     * 根据客户获取采样列表
     *
     * @param cusId
     * @param tjNumber
     * @return
     */
    @GetMapping("/getCusCyList")
    @ApiOperation(value = "根据客户获取采样列表")
    public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "客户id") String cusId,
    public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "客户id") String tjNumber,
                                   @RequestParam(defaultValue = "1") @ApiParam(value = "0是1否") Integer isSignFor) {
        if (cusId == null || StrUtil.isBlank(cusId))
        if (tjNumber == null || StrUtil.isBlank(tjNumber))
            return AjaxResult.error("参数错误,未传参数");
        LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(TjSampling::getCusId, cusId);
        wrapper.eq(TjSampling::getTjNum, tjNumber);
        wrapper.eq(TjSampling::getIsSignFor,isSignFor);
        wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
        wrapper.orderByDesc(TjSampling::getIsMerge);
        List<TjSampling> list = tjSamplingService.list(wrapper);
        if (list.isEmpty()){
            logger.info("cusId参数传的是:"+cusId);
            logger.info("jtNum ->{}",tjNumber);
            return AjaxResult.error("参数错误,未查询到数据");
        }
        for (TjSampling sampling : list) {
            TjCustomer customer = customerService.getById(sampling.getCusId());
            TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
            if(null !=order)sampling.setCardId(order.getCardId());
            sampling.setCustomer(customer);
        }
//        for (TjSampling sampling : list) {
//            TjCustomer customer = customerService.getById(sampling.getCusId());
//            TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
//            if(null !=order)sampling.setCardId(order.getCardId());
//            sampling.setCustomer(customer);
//        }

        if (list.size() >= 2) {
            // 进行合并
@@ -279,19 +282,25 @@
                    list.removeIf(item -> Objects.equals(item.getId(), s));
                }
            }
            Map<String, List<TjSampling>> map = list.stream().collect(Collectors.groupingBy(item -> item.getSpecimenTypeCode()));
            Map<String, List<TjSampling>> map = list.stream().filter(i->StrUtil.isNotBlank(i.getSpecimenTypeCode())).collect(Collectors.groupingBy(item -> item.getSpecimenTypeCode()));
            for (Map.Entry<String, List<TjSampling>> entry : map.entrySet()) {
                List<TjSampling> entryValue = entry.getValue();
                tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()));
            }
        }
        wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(TjSampling::getCusId, cusId);
        wrapper.eq(TjSampling::getTjNum, tjNumber);
        wrapper.eq(TjSampling::getIsSignFor,isSignFor);
        wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
//        wrapper.orderByDesc(TjSampling::getIsMerge);
        wrapper.orderByAsc(TjSampling::getSpecimenTypeCode,TjSampling::getIsMerge);
        list = tjSamplingService.list(wrapper);
        for (TjSampling sampling : list) {
            TjCustomer customer = customerService.getById(sampling.getCusId());
            TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
            if(null !=order)sampling.setCardId(order.getCardId());
            sampling.setCustomer(customer);
        }
        return AjaxResult.success(list);
    }