zjh20250320

zjh

2025-03-20 4f873f73c5b7a5af020cd71a0062c438771f98e7

zjh20250320

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

@@ -389,8 +389,8 @@
//        tjFlowingWater.setPayStasus(1L);
        TjOrder order = orderService.getById(tjFlowingWater.getOrderId());

        if (order.getFinishTime() != null) {
            return AjaxResult.error("该人员已签离,不可补录项目!");
        if (order.getPrintLastTime() != null) {
            return AjaxResult.error("该人员报告已打印,不可补录项目!");
        }

        TjCustomer customer = customerService.getById(order.getUserId());

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

@@ -81,14 +81,17 @@
            for (Map.Entry<String, List<TjXdPicture>> entry : stringListMap.entrySet()) {
                Map<String,Object>map=new HashMap<>();
                TjCustomer customer = customerService.getById(entry.getKey());
                customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                customer.setTjNumber(entry.getValue().get(0).getTjNum());
                map.put("list",entry.getValue());
                map.put("customer",customer);
                map.put("picturePath",configService.selectConfigByKey("TjXdPicture"));
                arrayList.add(map);
                if(null !=customer){
                    customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
                    customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                    customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                    customer.setTjNumber(entry.getValue().get(0).getTjNum());
                    map.put("list",entry.getValue());
                    map.put("customer",customer);
                    map.put("picturePath",configService.selectConfigByKey("TjXdPicture"));
                    arrayList.add(map);
                }

            }
        }
        List<Map<String, Object>> collect =null;