zjh 2024/07/12-1

zjh

2024-07-12 3779da90aeb2392b85bf721900bfb6f07bee1021

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

@@ -218,7 +218,7 @@
        int grouping = dwGroupingService.selectTjDwGroupingByDwDeptId(dwDeptId);

        if(grouping==0){
            return AjaxResult.error("请检查部门分组或分组中是否存在项目!");
            return AjaxResult.error("请检查部门中是否存在分组或分组中是否存在项目!");
        }

        List<String> wrongList = new ArrayList<>();
@@ -251,9 +251,15 @@
            String idCard = tjReservation.getIdCard();
            String phoe = tjReservation.getPhoe();
            if (null != idCard && null != phoe) {
                if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
//                if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
                if (idCard.isEmpty() || phoe.isEmpty()) {
                    wrongList.add(tjReservation.getName());
                } else {
                    //年龄
                    tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
                    //出生日期
                    tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()),"yyyy-MM-dd"));

                    if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex()))) {

                        tjReservation.setGroupingId(groupingMan.getId());
@@ -539,7 +545,7 @@
                reservation.setProIds(Joiner.on(",").join(proIds));
                reservation.setReservationTime(DateUtil.parse(reservationTime, "yyyy-MM-dd"));
                reservation.setCompanyId(dwGrouping.getDwId());
                reservation.setCompany(dwGrouping.getDwName());
                reservation.setCompany(dwGrouping.getDwDeptName());
                reservation.setPayType(Long.valueOf(dwGrouping.getPayType()));
                reservation.setPacId(dwDept.getId());
//                if(dwGrouping.getPayType().equals("1")){