20241213

zhaowenxuan

2024-12-13 5a6e758cf00bd4117c3d65b0e13e5389db289c36

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

@@ -91,9 +91,11 @@
    @Log(title = "体检单位信息维护", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody DictComp dictComp) {
        String firstLetter = PinyinUtil.getFirstLetter(dictComp.getCnName(), "");
        dictComp.setWbm(MatchUtils.toWubi(dictComp.getCnName()));
        dictComp.setEnName(firstLetter);
        if(null !=dictComp.getCnName()){
            String firstLetter = PinyinUtil.getFirstLetter(dictComp.getCnName(), "");
            dictComp.setWbm(MatchUtils.toWubi(dictComp.getCnName()));
            dictComp.setEnName(firstLetter);
        }
        return toAjax(dictCompService.save(dictComp));
    }

@@ -123,17 +125,15 @@
    public AjaxResult getCusTomterListByCompId(@RequestParam(required = false) @ApiParam(value = "单位id") String compId,
                                               @RequestParam(required = false) @ApiParam(value = "名字") String name,
                                               @RequestParam(required = false) @ApiParam(value = "部门id") String deptId,
                                               @RequestParam(required = false) @ApiParam(value = "预约时间") Date reservationTime,
                                               @RequestParam(defaultValue = "1") @ApiParam(value = "页码数") Integer page,
                                               @RequestParam(defaultValue = "10") @ApiParam(value = "每页显示条数") Integer pageSize) {
        IPage<TjReservation> pages=new Page<>(page,pageSize);
                                               @RequestParam(required = false) @ApiParam(value = "预约时间") Date reservationTime) {

        LambdaQueryWrapper<TjReservation> wq=new LambdaQueryWrapper<>();
        if(null !=compId)wq.eq(TjReservation::getCompanyId,compId);
        if(null !=name)wq.eq(TjReservation::getName,name);
        if(null !=deptId)wq.eq(TjReservation::getDepartment,deptId);
        if(null !=reservationTime)wq.between(TjReservation::getReservationTime, DateUtil.beginOfDay(reservationTime),DateUtil.endOfDay(reservationTime));
        IPage<TjReservation> iPage = reservationService.page(pages, wq);
        return AjaxResult.success(iPage);
        wq.eq(TjReservation::getIsExpire,"2");
        return AjaxResult.success(reservationService.list(wq));
    }