zjh202412030

zjh

2024-12-30 1b7ed7edb09aaecf68ddf3396ee007bc6eadf52a

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

@@ -13,12 +13,16 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.alibaba.druid.sql.visitor.functions.Isnull;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner;
import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.excelConfig.ExcelUtils;
import com.ltkj.common.task.TaskService;
import com.ltkj.common.utils.SecurityUtils;
@@ -29,16 +33,20 @@
import com.ltkj.hosp.dto.ExcelImportDto;
import com.ltkj.hosp.service.*;
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDictDataService;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import com.ltkj.web.config.redis.OrderDelayService;
import com.ltkj.web.config.task.TjReservationTask;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
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.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
@@ -55,6 +63,7 @@
@RestController
@RequestMapping("/reservation/reservation")
@Api(tags = "体检预约管理接口")
@Slf4j
public class TjReservationController extends BaseController {
    @Resource
    private ITjReservationService tjReservationService;
@@ -80,12 +89,12 @@
    private ITjGroupingProService groupingProService;
    @Resource
    private TjAsyncService asyncService;
//    @Resource
//    private OrderDelayService delayService;
    @Autowired
    private TaskService taskService;
    @Resource
    private ITjReportTemplateService reportTemplateService;
    @Autowired
    private ISysDictDataService dictDataService;
    @Autowired
    private ISysConfigService configService;

    @Value("${path.filePath}")
    private String value;
@@ -94,10 +103,10 @@
    @ApiOperation(value = "导出excel表模板")
    public void importTemplate(HttpServletResponse response) {
        //原来的下载模板调用接口
        String base64String = PDFBinaryUtil.getPDFBinary("D:\\Tjreport\\西安路泰机电科技有限公司.xls");
        if(null !=base64String){
            PDFBinaryUtil.base64StringToPDF(base64String, FileUtil.mkdir(value).getPath() + "\\" + "团体预约Excel模版.xls");
            String filePath = value + "\\" + "团体预约Excel模版.xls";
        String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_excelTemplate"));
        if (null != base64String) {
            PDFBinaryUtil.base64StringToPDF(base64String, FileUtil.mkdir(value).getPath() + File.separator + "团体预约Excel模版.xls");
            String filePath = value + File.separator + "团体预约Excel模版.xls";
            File f = new File(filePath);
            BufferedInputStream br = null;
            OutputStream out = null;
@@ -148,7 +157,6 @@
    }



    /**
     * 查询体检预约列表
     */
@@ -177,7 +185,7 @@
    public TableDataInfo selectTjReservationByDelete(TjReservation tjReservation) {
        startPage();
        List<TjReservation> list = tjReservationService.selectTjReservationByDelete(tjReservation);
        if(null !=list && list.size()>0){
        if (null != list && !list.isEmpty()) {
//            for (TjReservation reservation : list) {
//                reservation.setName(MatchUtils.hideCusName(reservation.getName()));
//                reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
@@ -218,7 +226,7 @@
        }
        int grouping = dwGroupingService.selectTjDwGroupingByDwDeptId(dwDeptId);

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

@@ -230,12 +238,12 @@
        TjDwGrouping groupingWoMan = null;//女
        TjDwGrouping groupingWz = null;//未知(不分性别)
        try {
            groupingMan = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
                    .eq(TjDwGrouping::getDwDeptId,dwDeptId).eq(TjDwGrouping::getSex, 0));
            groupingWoMan = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
                    .eq(TjDwGrouping::getDwDeptId,dwDeptId).eq(TjDwGrouping::getSex, 1));
            groupingWz = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
                    .eq(TjDwGrouping::getDwDeptId,dwDeptId).eq(TjDwGrouping::getSex, 2));
            groupingMan = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId, dwId)
                    .eq(TjDwGrouping::getDwDeptId, dwDeptId).eq(TjDwGrouping::getSex, 0));
            groupingWoMan = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId, dwId)
                    .eq(TjDwGrouping::getDwDeptId, dwDeptId).eq(TjDwGrouping::getSex, 1));
            groupingWz = dwGroupingService.getOne(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId, dwId)
                    .eq(TjDwGrouping::getDwDeptId, dwDeptId).eq(TjDwGrouping::getSex, 2));
        } catch (Exception e) {
            return AjaxResult.error("分组信息有误请重新分组!");
        }
@@ -245,21 +253,24 @@
        BigDecimal manMoney = new BigDecimal("0.00");
        //女组金额
        BigDecimal woManMoney = new BigDecimal("0.00");
        int count=0;//总计人数
        int manCount=0;//男组人数
        int woManCount=0;//女组人数
        int count = 0;//总计人数
        int manCount = 0;//男组人数
        int woManCount = 0;//女组人数
        for (TjReservation tjReservation : tjReservations) {
            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 {
                    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"));
                    tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));

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

@@ -267,9 +278,11 @@
                        tjReservation.setGroupingName(groupingMan.getGroupingName());
                        tjReservation.setYsPrice(groupingMan.getYsPrice());
                        //合计
                        hjMoney = hjMoney.add(groupingMan.getYsPrice()); count+=1;
                        hjMoney = hjMoney.add(groupingMan.getYsPrice());
                        count += 1;
                        //男组人数
                        manMoney=manMoney.add(groupingMan.getYsPrice()); manCount+=1;
                        manMoney = manMoney.add(groupingMan.getYsPrice());
                        manCount += 1;

                    } else if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex()))) {

@@ -277,8 +290,10 @@
                        tjReservation.setGroupingName(groupingWoMan.getGroupingName());
                        tjReservation.setYsPrice(groupingWoMan.getYsPrice());
                        //合计
                        hjMoney = hjMoney.add(groupingWoMan.getYsPrice()); count+=1;
                        woManMoney=woManMoney.add(groupingWoMan.getYsPrice());woManCount+=1;
                        hjMoney = hjMoney.add(groupingWoMan.getYsPrice());
                        count += 1;
                        woManMoney = woManMoney.add(groupingWoMan.getYsPrice());
                        woManCount += 1;

                    } else if (null != groupingWz && groupingWz.getSex().equals(String.valueOf(tjReservation.getSex()))) {

@@ -286,7 +301,8 @@
                        tjReservation.setGroupingName(groupingWz.getGroupingName());
                        tjReservation.setYsPrice(groupingWz.getYsPrice());
                        //合计
                        hjMoney = hjMoney.add(groupingWz.getYsPrice()); count+=1;
                        hjMoney = hjMoney.add(groupingWz.getYsPrice());
                        count += 1;

                    }

@@ -333,7 +349,7 @@
    @ApiOperation(value = "团体excel表导入 (新版本不传单位部门id)")
    @Transactional
    public AjaxResult newExcelImportNotDwDeptId(@RequestPart(value = "file") @ApiParam(value = "Excel文件") MultipartFile file,
                                     @RequestParam @ApiParam(value = "单位id") String dwId) {
                                                @RequestParam @ApiParam(value = "单位id") String dwId) {
        List<TjReservation> tjReservations = null;
        try {
            tjReservations = ExcelUtils.readMultipartFile(file, TjReservation.class);
@@ -342,7 +358,7 @@
        }
        int grouping = dwGroupingService.selectTjDwGroupingByDwId(dwId);

        if(grouping==0){
        if (grouping == 0) {
            return AjaxResult.error("请检查该单位是否存否存在项目!");
        }

@@ -354,94 +370,202 @@
        List<TjDwGrouping> groupingWoMans = null;//女
        List<TjDwGrouping> groupingWzs = null;//未知(不分性别)
        try {
            groupingMans = dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
            groupingMans = dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId, dwId)
                    .eq(TjDwGrouping::getSex, 0));
            groupingWoMans = dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
            groupingWoMans = dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId, dwId)
                    .eq(TjDwGrouping::getSex, 1));
            groupingWzs = dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId,dwId)
            groupingWzs = dwGroupingService.list(new LambdaQueryWrapper<TjDwGrouping>().eq(TjDwGrouping::getDwId, dwId)
                    .eq(TjDwGrouping::getSex, 2));
        } catch (Exception e) {
            return AjaxResult.error("分组信息有误请重新分组!");
        }

        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;//女组人数
        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();
            if (null != idCard && null != phoe) {
//                if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
                if (idCard.isEmpty() || phoe.isEmpty() || null==tjReservation.getDwxm()) {
                    wrongList.add(tjReservation.getName());
                } else {
                    //年龄
                    tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
                    //出生日期
                    tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()),"yyyy-MM-dd"));
                  idCard= idCard.replaceAll("[',，;.。 ‘“]","");

                    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 (!StringUtils.isBlank(idCard) || !StringUtils.isBlank(phoe) || null != tjReservation.getDwxm()) {
                //将科学计数的手机号转换成文本形式
                phoe = MatchUtils.translateToPlainStr(tjReservation.getPhoe());

                        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.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWz.getDwDeptId().equals(dwDept.getId())) {
                                tjReservation.setGroupingId(groupingWz.getId());
                                tjReservation.setGroupingName(groupingWz.getGroupingName());
                                tjReservation.setYsPrice(groupingWz.getYsPrice());
                                //合计
                                hjMoney = hjMoney.add(groupingWz.getYsPrice()); count+=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());
                    }

                if(!ids.isEmpty() && ids.contains(tjReservation.getIdCard())){
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return AjaxResult.error("此身份证号: "+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 {


                        tjReservation.setPhoe(phoe);

                        //年龄
                        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());
            }
        }
        if (yyList.size() > 0) {
        if (!yyList.isEmpty()) {
            map.put("list", yyList);
            map.put("hjMoney", hjMoney);
            return AjaxResult.error("操作失败,以上人员已经预约无需导入!!!", map);
        }

        if (wrongList.size() > 0) {
        if (!wrongList.isEmpty()) {
            map.put("list", wrongList);
            map.put("hjMoney", hjMoney);
            return AjaxResult.error("操作失败, 请认真核对信息后重新导入!!!", map);
@@ -467,18 +591,18 @@
        if (null == tjReservation) return AjaxResult.error();
        if (null == tjReservation.getName()) return AjaxResult.error("姓名不能为空");
        if (null == tjReservation.getReservationTime()) return AjaxResult.error("请选择预约时间");
        boolean b=true;
        if(null !=tjReservation.getIdType()){
            if(tjReservation.getIdType().equals("1")){
                 b = MatchUtils.isIdCard(tjReservation.getIdCard());
            }else {
                 b = MatchUtils.cardValidate(tjReservation.getIdCard(), tjReservation.getIdType());
        boolean b = true;
        if (null != tjReservation.getIdType()) {
            if (tjReservation.getIdType().equals("1")) {
                b = MatchUtils.isIdCard(tjReservation.getIdCard());
            } else {
                b = MatchUtils.cardValidate(tjReservation.getIdCard(), tjReservation.getIdType());
            }
        }else {
        } else {
            return AjaxResult.error("请选择证件类型");
        }

        if(!b) return AjaxResult.error("证件号有误");
        if (!b) return AjaxResult.error("证件号有误");
        LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
        wq.eq(TjReservation::getIdCard, tjReservation.getIdCard());
        wq.eq(TjReservation::getIsExpire, 2);
@@ -496,12 +620,12 @@
        if (tjReservationService.save(tjReservation)) {
//            delayService.reservation(tjReservation.getId());
            taskService.addTask(new TjReservationTask(tjReservation.getId(),
                    DateUtil.between(new Date(),DateUtil.endOfDay(tjReservation.getReservationTime()), DateUnit.MS)));
                    DateUtil.between(new Date(), DateUtil.endOfDay(tjReservation.getReservationTime()), DateUnit.MS)));
            return AjaxResult.success("预约成功!!!");
        }
        LambdaQueryWrapper<TbTransition> remove=new LambdaQueryWrapper<>();
        remove.between(TbTransition::getCreateTime,DateUtil.offsetMinute(transitionService.getTbTransitionCreateTimeByCusId(tjReservation.getIdCard()),-1),new Date());
        remove.eq(TbTransition::getCusId,tjReservation.getIdCard());
        LambdaQueryWrapper<TbTransition> remove = new LambdaQueryWrapper<>();
        remove.between(TbTransition::getCreateTime, DateUtil.offsetMinute(transitionService.getTbTransitionCreateTimeByCusId(tjReservation.getIdCard()), -1), new Date());
        remove.eq(TbTransition::getCusId, tjReservation.getIdCard());
        transitionService.remove(remove);
        return AjaxResult.error("预约失败");
    }
@@ -517,12 +641,12 @@
        if (null != tjReservation) {
            if (null != tjReservation.getPacId()) {
                TjPackage aPackage = packageService.getById(tjReservation.getPacId());
                if(null !=aPackage){
                if (null != aPackage) {
                    tjReservation.setPacName(aPackage.getPacName());
                }
                TjDwDept dwDept = dwDeptService.getById(tjReservation.getPacId());

                if(null !=dwDept){
                if (null != dwDept) {
                    tjReservation.setPacName(dwDept.getDwName());
                }

@@ -573,7 +697,8 @@
                TjReservation reservation = tjReservationService.getById(id);
                if (null != reservation && reservation.getIsExpire() == 2) {
                    if (tjReservationService.removeById(id)) {
                        transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard()));
                        transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard())
                                .isNull(TbTransition::getTjNum));
                        taskService.removeTask(new TjReservationTask(id));
                    }
                }
@@ -602,7 +727,7 @@
        if (tjReservationService.updateById(tjReservation)) {
            taskService.removeTask(new TjReservationTask(tjReservation.getId()));
            taskService.addTask(new TjReservationTask(tjReservation.getId(),
                    DateUtil.between(new Date(),DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(),reservation.getYxts())), DateUnit.MS)));
                    DateUtil.between(new Date(), DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(), reservation.getYxts())), DateUnit.MS)));
            return AjaxResult.success("操作成功");
        }
        return AjaxResult.error("操作失败");
@@ -616,15 +741,15 @@
    @ApiOperation(value = "根据单位id和团队编号获取预约详情")
    public AjaxResult getSelectRecordByTeamNo(@RequestParam @ApiParam(value = "分组id") String groupingId) {
        LambdaQueryWrapper<TjGroupingPro> wq = new LambdaQueryWrapper<>();
        wq.eq(TjGroupingPro::getGroupingId,groupingId);
        wq.eq(TjGroupingPro::getGroupingId, groupingId);
        List<TjGroupingPro> proList = groupingProService.list(wq);
        if(null !=proList && proList.size()>0){
        if (null != proList && !proList.isEmpty()) {
            for (TjGroupingPro groupingPro : proList) {
                TjProject project = projectService.getById(groupingPro.getProId());
                if(null !=project){
                    if (project.getProType()==null || project.getProType().equals("")) {
                if (null != project) {
                    if (project.getProType() == null || project.getProType().isEmpty()) {
                        groupingPro.setProType("2");
                    }else {
                    } else {
                        groupingPro.setProType(project.getProType());
                    }
                    groupingPro.setProCheckMethod(project.getProCheckMethod());
@@ -657,10 +782,10 @@
        asyncService.saveNewReservationConfirm(rightList);

        //团体人数合计价格
        BigDecimal compPay=new BigDecimal("0.00");
        BigDecimal compPay = new BigDecimal("0.00");

        //团体人数
        int tramNum=0;
        int tramNum = 0;
        if (null != rightList && rightList.size() > 0) {
            String teamNo = PinyinUtil.getFirstLetter(dwDept.getDwName(), "") + DateUtil.format(new Date(), "yyMMddHHmmss");
            for (TjReservation reservation : rightList) {
@@ -690,13 +815,13 @@
//                }else {
//                    reservation.setTjType(String.valueOf(2));
//                }
                compPay=compPay.add(dwGrouping.getYsPrice());
                tramNum+=1;
                compPay = compPay.add(dwGrouping.getYsPrice());
                tramNum += 1;
                reservation.setTjType(String.valueOf(1));
                reservation.setTeamNo(teamNo);
                reservation.setYxts(dto.getYxts());
                tjReservationService.save(reservation);
                taskService.addTask(new TjReservationTask(reservation.getId(),DateUtil.between(new Date(),DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(),dto.getYxts())), DateUnit.MS)));
                taskService.addTask(new TjReservationTask(reservation.getId(), DateUtil.between(new Date(), DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(), dto.getYxts())), DateUnit.MS)));
            }
            LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();
            wq0.eq(TjCompPay::getCompId, dwDept.getDwId());
@@ -731,7 +856,7 @@
                recordServiceOne.setCount(tramNum);
                recordServiceOne.setDifference(compPay);
                selectRecordService.updateById(recordServiceOne);
            }else {
            } else {
                TjTeamSelectRecord selectRecord = new TjTeamSelectRecord();
                selectRecord.setCompId(dwDept.getDwId());
                selectRecord.setPacId(dwDept.getId());
@@ -773,11 +898,23 @@
        String teamNo = PinyinUtil.getFirstLetter(comp.getCnName(), "") + DateUtil.format(date, "yyMMddHHmmss");

        //团体人数合计价格
        BigDecimal compPay=new BigDecimal("0.00");
        BigDecimal compPay = new BigDecimal("0.00");

        String payTypeGlTjType = configService.selectConfigByKey("reservation_pay_type_gl_tj_type");
        JSONObject parseObj = JSONUtil.parseObj(payTypeGlTjType);
        if (null != rightList && !rightList.isEmpty()) {

            List<String> ids=new ArrayList<>();

            for (TjReservation reservation : rightList) {

                if(!ids.isEmpty() && ids.contains(reservation.getIdCard())){
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return AjaxResult.error("此身份证号: "+reservation.getIdCard()+" 重复,请核对后上传!");

                }
                reservation.setName(reservation.getName().replaceAll("　","").replaceAll(" ",""));
                ids.add(reservation.getIdCard());

                TjDwGrouping dwGrouping = dwGroupingService.getById(reservation.getGroupingId());

@@ -798,18 +935,30 @@
                reservation.setCompanyId(dwGrouping.getDwId());
                reservation.setCompany(dwGrouping.getDwName());
                reservation.setPayType(Long.valueOf(dwGrouping.getPayType()));
                LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(SysDictData::getDictType, "reservation_pay_type");
                wrapper.eq(SysDictData::getDictValue, reservation.getPayType());
                SysDictData dictData = dictDataService.getOne(wrapper);
                for (Map.Entry<String, Object> entry : parseObj.entrySet()) {
                    String[] split = entry.getValue().toString().split("-");
                    if (split[0].equals(String.valueOf(dictData.getDictCode()))) {
                        reservation.setTjType(dictDataService.selectDictDataById(Long.valueOf(split[1])).getDictValue());
                    }
                }


                reservation.setPacId(dwDept.getId());
                compPay=compPay.add(dwGrouping.getYsPrice());
                reservation.setTjType(String.valueOf(1));
                compPay = compPay.add(dwGrouping.getYsPrice());
//                reservation.setTjType(String.valueOf(1));
                reservation.setTeamNo(teamNo);
                reservation.setYxts(dto.getYxts());
                tjReservationService.save(reservation);
                taskService.addTask(new TjReservationTask(reservation.getId(),
                        DateUtil.between(date,DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(),dto.getYxts())), DateUnit.MS)));
                        DateUtil.between(date, DateUtil.endOfDay(DateUtil.offsetDay(reservation.getReservationTime(), dto.getYxts())), DateUnit.MS)));
            }

            LambdaQueryWrapper<TjCompPay> wq0 = new LambdaQueryWrapper<>();
            wq0.eq(TjCompPay::getCompId,dto.getDwId());
            wq0.eq(TjCompPay::getCompId, dto.getDwId());
            wq0.eq(TjCompPay::getTeamNo, teamNo);
            TjCompPay one = compPayService.getOne(wq0);
            if (null != one) {
@@ -830,13 +979,15 @@
                compPayService.save(tjCompPay);
            }

//            .filter(a-> null != a.getPacId())

            Map<String, List<TjReservation>> collect = rightList.stream().collect(Collectors.groupingBy(TjReservation::getPacId));

            if(!collect.isEmpty()){
            if (!collect.isEmpty()) {
                for (Map.Entry<String, List<TjReservation>> entry : collect.entrySet()) {
                    LambdaQueryWrapper<TjTeamSelectRecord> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjTeamSelectRecord::getTeamNo, teamNo);
                    wq.eq(TjTeamSelectRecord::getCompId,dto.getDwId());
                    wq.eq(TjTeamSelectRecord::getCompId, dto.getDwId());
                    TjTeamSelectRecord recordServiceOne = selectRecordService.getOne(wq);
                    if (null != recordServiceOne) {
                        recordServiceOne.setPacId(entry.getKey());
@@ -846,7 +997,7 @@
                        recordServiceOne.setCount(entry.getValue().size());
                        recordServiceOne.setDifference(compPay);
                        selectRecordService.updateById(recordServiceOne);
                    }else {
                    } else {
                        TjTeamSelectRecord selectRecord = new TjTeamSelectRecord();
                        selectRecord.setCompId(dto.getDwId());
                        selectRecord.setPacId(entry.getKey());