From ad1cac873613bd9ac6e8c7c5a902c25474afa2e0 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 28 二月 2025 18:06:09 +0800 Subject: [PATCH] zjh20250228 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 363 ++++++++++++++++++++++++++------------------------- 1 files changed, 185 insertions(+), 178 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java index c4de5ae..5e296a4 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java @@ -45,6 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.transaction.NoTransactionException; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.web.bind.annotation.*; @@ -385,204 +386,210 @@ return AjaxResult.error("鍒嗙粍淇℃伅鏈夎璇烽噸鏂板垎缁�!"); } - String sfjysfzh = configService.selectConfigByKey("sfjysfzh"); - String sfjysjh = configService.selectConfigByKey("sfjysjh"); + try { + String sfjysfzh = configService.selectConfigByKey("sfjysfzh"); + String sfjysjh = configService.selectConfigByKey("sfjysjh"); - //璁$畻鍚堣 - BigDecimal hjMoney = new BigDecimal("0.00"); - //鐢风粍閲戦 - BigDecimal manMoney = new BigDecimal("0.00"); - //濂崇粍閲戦 - BigDecimal woManMoney = new BigDecimal("0.00"); - int count = 0;//鎬昏浜烘暟 - int manCount = 0;//鐢风粍浜烘暟 - int woManCount = 0;//濂崇粍浜烘暟 - List<String> ids=new ArrayList<>(); + //璁$畻鍚堣 + BigDecimal hjMoney = new BigDecimal("0.00"); + //鐢风粍閲戦 + BigDecimal manMoney = new BigDecimal("0.00"); + //濂崇粍閲戦 + BigDecimal woManMoney = new BigDecimal("0.00"); + int count = 0;//鎬昏浜烘暟 + int manCount = 0;//鐢风粍浜烘暟 + int woManCount = 0;//濂崇粍浜烘暟 + List<String> ids=new ArrayList<>(); - for (TjReservation tjReservation : tjReservations) { - String idCard = tjReservation.getIdCard(); - String phoe = tjReservation.getPhoe(); - idCard= idCard.replaceAll("[',锛�;.銆� 鈥樷�淽",""); + for (TjReservation tjReservation : tjReservations) { + String idCard = tjReservation.getIdCard(); + String phoe = tjReservation.getPhoe(); + idCard= idCard.replaceAll("[',锛�;.銆� 鈥樷�淽",""); - if (!StringUtils.isBlank(idCard) || !StringUtils.isBlank(phoe) || null != tjReservation.getDwxm()) { - //灏嗙瀛﹁鏁扮殑鎵嬫満鍙疯浆鎹㈡垚鏂囨湰褰㈠紡 - phoe = MatchUtils.translateToPlainStr(tjReservation.getPhoe()); + if (!StringUtils.isBlank(idCard) || !StringUtils.isBlank(phoe) || null != tjReservation.getDwxm()) { + //灏嗙瀛﹁鏁扮殑鎵嬫満鍙疯浆鎹㈡垚鏂囨湰褰㈠紡 + phoe = MatchUtils.translateToPlainStr(tjReservation.getPhoe()); - if(!ids.isEmpty() && ids.contains(tjReservation.getIdCard())){ - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - return AjaxResult.error("姝よ韩浠借瘉鍙�: "+tjReservation.getIdCard()+" 閲嶅,璇锋牳瀵瑰悗涓婁紶!"); - } + if(!ids.isEmpty() && ids.contains(tjReservation.getIdCard())){ + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error("姝よ韩浠借瘉鍙�: "+tjReservation.getIdCard()+" 閲嶅,璇锋牳瀵瑰悗涓婁紶!"); + } - ids.add(tjReservation.getIdCard()); + ids.add(tjReservation.getIdCard()); -// if (sfjysfzh.equalsIgnoreCase("Y") || sfjysjh.equalsIgnoreCase("Y")) { - if ((sfjysfzh.equalsIgnoreCase("Y") && !MatchUtils.isIdCard(idCard)) || - (sfjysjh.equalsIgnoreCase("Y") && !MatchUtils.isMobileNO(phoe))) { - wrongList.add(tjReservation.getName()); - log.info(tjReservation.getName()+idCard+MatchUtils.isIdCard(idCard)+MatchUtils.isMobileNO(phoe)); - }else { + // if (sfjysfzh.equalsIgnoreCase("Y") || sfjysjh.equalsIgnoreCase("Y")) { + if ((sfjysfzh.equalsIgnoreCase("Y") && !MatchUtils.isIdCard(idCard)) || + (sfjysjh.equalsIgnoreCase("Y") && !MatchUtils.isMobileNO(phoe))) { + wrongList.add(tjReservation.getName()); + log.info(tjReservation.getName()+idCard+MatchUtils.isIdCard(idCard)+MatchUtils.isMobileNO(phoe)); + }else { - tjReservation.setPhoe(phoe); + tjReservation.setPhoe(phoe); - //骞撮緞 - tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard()))); - //鍑虹敓鏃ユ湡 - tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd")); + //骞撮緞 + tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard()))); + //鍑虹敓鏃ユ湡 + tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd")); - TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm())); - if (null != dwDept) { - for (TjDwGrouping groupingMan : groupingMans) { - if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) { - tjReservation.setGroupingId(groupingMan.getId()); - tjReservation.setGroupingName(groupingMan.getGroupingName()); - tjReservation.setYsPrice(groupingMan.getYsPrice()); - //鍚堣 - hjMoney = hjMoney.add(groupingMan.getYsPrice()); - count += 1; - //鐢风粍浜烘暟 - manMoney = manMoney.add(groupingMan.getYsPrice()); - manCount += 1; - } - } - - for (TjDwGrouping groupingWoMan : groupingWoMans) { - if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWoMan.getDwDeptId().equals(dwDept.getId())) { - tjReservation.setGroupingId(groupingWoMan.getId()); - tjReservation.setGroupingName(groupingWoMan.getGroupingName()); - tjReservation.setYsPrice(groupingWoMan.getYsPrice()); - //鍚堣 - hjMoney = hjMoney.add(groupingWoMan.getYsPrice()); - count += 1; - woManMoney = woManMoney.add(groupingWoMan.getYsPrice()); - woManCount += 1; - } - } - for (TjDwGrouping groupingWz : groupingWzs) { - if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) { - tjReservation.setGroupingId(groupingWz.getId()); - tjReservation.setGroupingName(groupingWz.getGroupingName()); - tjReservation.setYsPrice(groupingWz.getYsPrice()); - //鍚堣 - hjMoney = hjMoney.add(groupingWz.getYsPrice()); - count += 1; - if (tjReservation.getSex() == 0) { - manMoney = manMoney.add(groupingWz.getYsPrice()); + TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm())); + if (null != dwDept) { + for (TjDwGrouping groupingMan : groupingMans) { + if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) { + tjReservation.setGroupingId(groupingMan.getId()); + tjReservation.setGroupingName(groupingMan.getGroupingName()); + tjReservation.setYsPrice(groupingMan.getYsPrice()); + //鍚堣 + hjMoney = hjMoney.add(groupingMan.getYsPrice()); + count += 1; + //鐢风粍浜烘暟 + manMoney = manMoney.add(groupingMan.getYsPrice()); manCount += 1; } - if (tjReservation.getSex() == 1) { - woManMoney = woManMoney.add(groupingWz.getYsPrice()); + } + + for (TjDwGrouping groupingWoMan : groupingWoMans) { + if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWoMan.getDwDeptId().equals(dwDept.getId())) { + tjReservation.setGroupingId(groupingWoMan.getId()); + tjReservation.setGroupingName(groupingWoMan.getGroupingName()); + tjReservation.setYsPrice(groupingWoMan.getYsPrice()); + //鍚堣 + hjMoney = hjMoney.add(groupingWoMan.getYsPrice()); + count += 1; + woManMoney = woManMoney.add(groupingWoMan.getYsPrice()); woManCount += 1; } - } + for (TjDwGrouping groupingWz : groupingWzs) { + if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) { + tjReservation.setGroupingId(groupingWz.getId()); + tjReservation.setGroupingName(groupingWz.getGroupingName()); + tjReservation.setYsPrice(groupingWz.getYsPrice()); + //鍚堣 + hjMoney = hjMoney.add(groupingWz.getYsPrice()); + count += 1; + if (tjReservation.getSex() == 0) { + manMoney = manMoney.add(groupingWz.getYsPrice()); + manCount += 1; + } + if (tjReservation.getSex() == 1) { + woManMoney = woManMoney.add(groupingWz.getYsPrice()); + woManCount += 1; + } + + } + } + LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>(); + wq.eq(TjReservation::getIdCard, tjReservation.getIdCard()); + wq.eq(TjReservation::getIsExpire, 2); + TjReservation one = tjReservationService.getOne(wq); + if (null != one) { + yyList.add(one); + } + rightList.add(tjReservation); + } else { + wrongList.add(tjReservation.getName()); } - LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>(); - wq.eq(TjReservation::getIdCard, tjReservation.getIdCard()); - wq.eq(TjReservation::getIsExpire, 2); - TjReservation one = tjReservationService.getOne(wq); - if (null != one) { - yyList.add(one); - } - rightList.add(tjReservation); - } else { - wrongList.add(tjReservation.getName()); } - } -// } -// else { -// //灏嗙瀛﹁鏁扮殑鎵嬫満鍙疯浆鎹㈡垚鏂囨湰褰㈠紡 -// String str = MatchUtils.translateToPlainStr(tjReservation.getPhoe()); -// tjReservation.setPhoe(str); -// -// //骞撮緞 -// tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard()))); -// //鍑虹敓鏃ユ湡 -// tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd")); -// -// TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm())); -// if (null != dwDept) { -// for (TjDwGrouping groupingMan : groupingMans) { -// if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) { -// tjReservation.setGroupingId(groupingMan.getId()); -// tjReservation.setGroupingName(groupingMan.getGroupingName()); -// tjReservation.setYsPrice(groupingMan.getYsPrice()); -// //鍚堣 -// hjMoney = hjMoney.add(groupingMan.getYsPrice()); -// count += 1; -// //鐢风粍浜烘暟 -// manMoney = manMoney.add(groupingMan.getYsPrice()); -// manCount += 1; -// } -// } -// -// for (TjDwGrouping groupingWoMan : groupingWoMans) { -// if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWoMan.getDwDeptId().equals(dwDept.getId())) { -// tjReservation.setGroupingId(groupingWoMan.getId()); -// tjReservation.setGroupingName(groupingWoMan.getGroupingName()); -// tjReservation.setYsPrice(groupingWoMan.getYsPrice()); -// //鍚堣 -// hjMoney = hjMoney.add(groupingWoMan.getYsPrice()); -// count += 1; -// woManMoney = woManMoney.add(groupingWoMan.getYsPrice()); -// woManCount += 1; -// } -// } -// for (TjDwGrouping groupingWz : groupingWzs) { -// if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) { -// tjReservation.setGroupingId(groupingWz.getId()); -// tjReservation.setGroupingName(groupingWz.getGroupingName()); -// tjReservation.setYsPrice(groupingWz.getYsPrice()); -// //鍚堣 -// hjMoney = hjMoney.add(groupingWz.getYsPrice()); -// count += 1; -// if (tjReservation.getSex() == 0) { -// manMoney = manMoney.add(groupingWz.getYsPrice()); -// manCount += 1; -// } -// if (tjReservation.getSex() == 1) { -// woManMoney = woManMoney.add(groupingWz.getYsPrice()); -// woManCount += 1; -// } -// -// } -// } -// LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>(); -// wq.eq(TjReservation::getIdCard, tjReservation.getIdCard()); -// wq.eq(TjReservation::getIsExpire, 2); -// TjReservation one = tjReservationService.getOne(wq); -// if (null != one) { -// yyList.add(one); -// } -// rightList.add(tjReservation); -// } else { -// wrongList.add(tjReservation.getName()); -// } -// } + // } + // else { + // //灏嗙瀛﹁鏁扮殑鎵嬫満鍙疯浆鎹㈡垚鏂囨湰褰㈠紡 + // String str = MatchUtils.translateToPlainStr(tjReservation.getPhoe()); + // tjReservation.setPhoe(str); + // + // //骞撮緞 + // tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard()))); + // //鍑虹敓鏃ユ湡 + // tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd")); + // + // TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm())); + // if (null != dwDept) { + // for (TjDwGrouping groupingMan : groupingMans) { + // if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) { + // tjReservation.setGroupingId(groupingMan.getId()); + // tjReservation.setGroupingName(groupingMan.getGroupingName()); + // tjReservation.setYsPrice(groupingMan.getYsPrice()); + // //鍚堣 + // hjMoney = hjMoney.add(groupingMan.getYsPrice()); + // count += 1; + // //鐢风粍浜烘暟 + // manMoney = manMoney.add(groupingMan.getYsPrice()); + // manCount += 1; + // } + // } + // + // for (TjDwGrouping groupingWoMan : groupingWoMans) { + // if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWoMan.getDwDeptId().equals(dwDept.getId())) { + // tjReservation.setGroupingId(groupingWoMan.getId()); + // tjReservation.setGroupingName(groupingWoMan.getGroupingName()); + // tjReservation.setYsPrice(groupingWoMan.getYsPrice()); + // //鍚堣 + // hjMoney = hjMoney.add(groupingWoMan.getYsPrice()); + // count += 1; + // woManMoney = woManMoney.add(groupingWoMan.getYsPrice()); + // woManCount += 1; + // } + // } + // for (TjDwGrouping groupingWz : groupingWzs) { + // if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) { + // tjReservation.setGroupingId(groupingWz.getId()); + // tjReservation.setGroupingName(groupingWz.getGroupingName()); + // tjReservation.setYsPrice(groupingWz.getYsPrice()); + // //鍚堣 + // hjMoney = hjMoney.add(groupingWz.getYsPrice()); + // count += 1; + // if (tjReservation.getSex() == 0) { + // manMoney = manMoney.add(groupingWz.getYsPrice()); + // manCount += 1; + // } + // if (tjReservation.getSex() == 1) { + // woManMoney = woManMoney.add(groupingWz.getYsPrice()); + // woManCount += 1; + // } + // + // } + // } + // LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>(); + // wq.eq(TjReservation::getIdCard, tjReservation.getIdCard()); + // wq.eq(TjReservation::getIsExpire, 2); + // TjReservation one = tjReservationService.getOne(wq); + // if (null != one) { + // yyList.add(one); + // } + // rightList.add(tjReservation); + // } else { + // wrongList.add(tjReservation.getName()); + // } + // } - } else { - wrongList.add(tjReservation.getName()); + } else { + wrongList.add(tjReservation.getName()); + } } - } - if (!yyList.isEmpty()) { - map.put("list", yyList); - map.put("hjMoney", hjMoney); - return AjaxResult.error("鎿嶄綔澶辫触,浠ヤ笂浜哄憳宸茬粡棰勭害鏃犻渶瀵煎叆!!!", map); - } + if (!yyList.isEmpty()) { + map.put("list", yyList); + map.put("hjMoney", hjMoney); + return AjaxResult.error("鎿嶄綔澶辫触,浠ヤ笂浜哄憳宸茬粡棰勭害鏃犻渶瀵煎叆!!!", map); + } - if (!wrongList.isEmpty()) { - map.put("list", wrongList); - map.put("hjMoney", hjMoney); - return AjaxResult.error("鎿嶄綔澶辫触, 璇疯鐪熸牳瀵逛俊鎭悗閲嶆柊瀵煎叆!!!", map); - } else { - map.put("list", rightList); - map.put("count", count); - map.put("hjMoney", hjMoney); - map.put("manCount", manCount); - map.put("manMoney", manMoney); - map.put("woManCount", woManCount); - map.put("woManMoney", woManMoney); - return AjaxResult.success("鎿嶄綔鎴愬姛", map); + if (!wrongList.isEmpty()) { + map.put("list", wrongList); + map.put("hjMoney", hjMoney); + return AjaxResult.error("鎿嶄綔澶辫触, 璇疯鐪熸牳瀵逛俊鎭悗閲嶆柊瀵煎叆!!!", map); + } else { + map.put("list", rightList); + map.put("count", count); + map.put("hjMoney", hjMoney); + map.put("manCount", manCount); + map.put("manMoney", manMoney); + map.put("woManCount", woManCount); + map.put("woManMoney", woManMoney); + return AjaxResult.success("鎿嶄綔鎴愬姛", map); + } + } catch (NoTransactionException e) { +// throw new RuntimeException(e); + log.error(String.valueOf(e),e.getMessage()); + return AjaxResult.error(); } } -- Gitblit v1.8.0