zjh20250104

zjh

2025-01-04 06059e134de6817418335516f56bbf4280ff351b

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

@@ -121,13 +121,23 @@
//            }
//        }
        List<String> strings = tjOrderService.selectTjOrderByCardId1();
        if (null != strings && strings.size() > 0) {
        if (null != strings && !strings.isEmpty()) {
            List<Map<String, Object>> collect = maps.stream()
                    .filter(item -> !strings.contains(item.get("pacCode").toString())).collect(Collectors.toList());
            return AjaxResult.success(collect);
        }
        return AjaxResult.success(maps);
//        return AjaxResult.success(maps);
    }


    @GetMapping("/vcustomerlist")
    @ApiOperation(value = "签到登记页面姓名栏弹框接口")
    public AjaxResult vcustomerlist(@RequestParam(required = false) String name,
                                  @RequestParam(required = false) String sjh,
                                  @RequestParam(required = false) String sfzh) {
        List<Map<String, Object>> maps = tjCustomerService.vcustomerlist(name, sjh, sfzh);
        return AjaxResult.success(maps);
    }


@@ -225,9 +235,9 @@
                qw.eq(TjCustomer::getCusIdcard, cusIdcard);
                TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
                if (tjCustomer1 != null) {
                    if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
                    if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
                    tjCustomerService.updateById(tjCustomer1);
//                    if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
//                    if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
//                    tjCustomerService.updateById(tjCustomer1);
                    tjCustomer1.setTjType(tjReservation.getTjType());
                    tjCustomer1.setCusName(tjReservation.getName());
                    tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
@@ -250,8 +260,8 @@
                    tjCustomer1.setDiscount(tjReservation.getDiscount());
                    tjCustomer1.setGroupingId(tjReservation.getGroupingId());

                    if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
                    if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());
//                    if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
//                    if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());

//                    tjCustomerService.updateById(tjCustomer1);

@@ -281,8 +291,8 @@
                    tjCustomer.setCusPassword(substring);
                    tjCustomer.setTjType(tjReservation.getTjType());
                    tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
                    if(null !=tjReservation.getCompanyId())tjCustomer.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
                    if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
//                    if(null !=tjReservation.getCompanyId())tjCustomer.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
//                    if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
                    if (null != key && key.equals("Y"))
                    {
                        AjaxResult result = controller.Outpincreateapply(tjCustomer);
@@ -372,6 +382,27 @@
    }


    @GetMapping("/getcusList")
    @ApiOperation(value = "档案管理接口")
    public TableDataInfo getcusList(TjCustomer tjCustomer) {
        startPage();
        List<TjCustomer> list = tjCustomerService.getcusList(tjCustomer);
        if (null != list && !list.isEmpty()) {
            for (TjCustomer customer : list) {
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                TjCustomerBlack tjCustomerBlack = blackService.isTjCustomerBlack(String.valueOf(customer.getCusId()));
                if (null != tjCustomerBlack) {
                    customer.setIsBlack("Y");
                } else {
                    customer.setIsBlack("N");
                }
            }
        }
        return getDataTable(list);
    }


    /**
     * 查询客户信息列表
     */
@@ -381,9 +412,8 @@
    public TableDataInfo list(TjCustomer tjCustomer) {
        startPage();
        List<TjCustomer> list = tjCustomerService.selectTjCustomerList(tjCustomer);
        if (null != list && list.size() > 0) {
        if (null != list && !list.isEmpty()) {
            for (TjCustomer customer : list) {
//                customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
                customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                TjCustomerBlack tjCustomerBlack = blackService.isTjCustomerBlack(String.valueOf(customer.getCusId()));