From cc74c69a0b48dce77cec5674fa42bee768bb28d7 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 07 三月 2025 10:59:28 +0800 Subject: [PATCH] zjh20250307 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java index 404743c..0f5846d 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java @@ -261,7 +261,7 @@ 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.getCompany())tjCustomer1.setCompName(tjReservation.getCompany()); // tjCustomerService.updateById(tjCustomer1); @@ -291,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.setCompId(tjReservation.getCompanyId()); + if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany()); if (null != key && key.equals("Y")) { AjaxResult result = controller.Outpincreateapply(tjCustomer); @@ -483,12 +483,13 @@ b = MatchUtils.isIdCard(cusIdcard); } } - } else { - if(cusIdcard.length()==9){ - b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType()); - } - } +// else { +// if(cusIdcard.length()==9){ +// b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType()); +// } +// +// } } else { return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷"); } @@ -504,20 +505,12 @@ wq.eq(TjCustomer::getCusIdcard, cusIdcard); TjCustomer customer = tjCustomerService.getOne(wq); if (customer != null) { -// BeanUtils.copyBeanProp(tjCustomer, customer); -// String substring = cusIdcard.substring(cusIdcard.length() - 6); -// substring = DigestUtils.md5DigestAsHex(substring.getBytes()); -// customer.setCusPassword(substring); -// customer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd")); -// return AjaxResult.success(tjCustomerService.updateById(customer)); return AjaxResult.error("璇ヤ汉鍛樺凡瀛樺湪"); } String substring = cusIdcard.substring(cusIdcard.length() - 6); substring = DigestUtils.md5DigestAsHex(substring.getBytes()); tjCustomer.setCusPassword(substring); -// if (tjCustomer.getIdType().equals("1")) { - tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd")); -// } + if(cusIdcard.length()==18)tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd")); tjCustomer.setCusNumber(0L); tjCustomer.setPym(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),"")); String config = sysConfigService.selectConfigByKey("sfkqdyhis"); -- Gitblit v1.8.0