合并数据

zhaowenxuan

2024-12-04 1f7a2b7352d3155e3b716751ccca94ef253fd399

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

@@ -1,23 +1,25 @@
package com.ltkj.web.controller.system;

import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.date.DateUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.TjCustomerBlack;
import com.ltkj.hosp.domain.TjReservation;
import com.ltkj.hosp.service.ITjReservationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
@@ -39,7 +41,8 @@
public class DictCompController extends BaseController {
    @Resource
    private IDictCompService dictCompService;

    @Resource
    private ITjReservationService reservationService;
    /**
     * 获取单位信息集合接口
     */
@@ -88,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));
    }

@@ -113,4 +118,23 @@
    public AjaxResult remove(@PathVariable String[] drugManufacturerIds) {
        return toAjax(dictCompService.deleteDictCompByDrugManufacturerIds(drugManufacturerIds));
    }


    @GetMapping("/getCusTomterListByCompId")
    @ApiOperation(value = "获取单位id体检人信息接口")
    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) {

        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));
        wq.eq(TjReservation::getIsExpire,"2");
        return AjaxResult.success(reservationService.list(wq));
    }


}