zjh 本地 2024/03/8 --2

zjh

2024-03-08 b1e6fbedb5c6384f5c53f6073d17606919c593c1

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

@@ -51,12 +51,12 @@
    @Resource
    private ITjOrderService orderService;

/**
 * 查询体检项目对比列表
 */
@PreAuthorize("@ss.hasPermi('hosp:contrast:list')")
@GetMapping("/list")
@ApiOperation(value = "查询体检项目对比列表(页面展示用)")
    /**
     * 查询体检项目对比列表
     */
    //@PreAuthorize("@ss.hasPermi('hosp:contrast:list')")
    @GetMapping("/list")
    @ApiOperation(value = "查询体检项目对比列表(页面展示用)")
    public TableDataInfo list(TjProContrast tjProContrast) {
        startPage();
        List<TjProContrast> list = tjProContrastService.selectTjProContrastList(tjProContrast);
@@ -67,12 +67,12 @@
    /**
     * 查询体检项目对比列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:contrast:list')")
    //@PreAuthorize("@ss.hasPermi('hosp:contrast:list')")
    @GetMapping("/getList")
    @ApiOperation(value = "查询体检项目对比列表(数据对比展示处用)")
    public AjaxResult getList() {
        LambdaQueryWrapper<TjProContrast> wq=new LambdaQueryWrapper<>();
        wq.eq(TjProContrast::getIsContrast,1);
        LambdaQueryWrapper<TjProContrast> wq = new LambdaQueryWrapper<>();
        wq.eq(TjProContrast::getIsContrast, 1);
        List<TjProContrast> list = tjProContrastService.list(wq);
        return AjaxResult.success(list);
    }
@@ -81,19 +81,19 @@
    /**
     * 导出体检项目对比列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:contrast:export')")
    //@PreAuthorize("@ss.hasPermi('hosp:contrast:export')")
    @Log(title = "体检项目对比", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, TjProContrast tjProContrast) {
        List<TjProContrast> list = tjProContrastService.selectTjProContrastList(tjProContrast);
        ExcelUtil<TjProContrast> util = new ExcelUtil<TjProContrast>(TjProContrast. class);
        ExcelUtil<TjProContrast> util = new ExcelUtil<TjProContrast>(TjProContrast.class);
        util.exportExcel(response, list, "体检项目对比数据");
    }

    /**
     * 获取体检项目对比详细信息
     */
    @PreAuthorize("@ss.hasPermi('hosp:contrast:query')")
    //@PreAuthorize("@ss.hasPermi('hosp:contrast:query')")
    @GetMapping(value = "/{id}")
    @ApiOperation(value = "获取体检项目对比详细信息")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -103,7 +103,7 @@
    /**
     * 新增体检项目对比
     */
    @PreAuthorize("@ss.hasPermi('hosp:contrast:add')")
    //@PreAuthorize("@ss.hasPermi('hosp:contrast:add')")
    @Log(title = "体检项目对比", businessType = BusinessType.INSERT)
    @PostMapping
    @ApiOperation(value = "新增体检项目对比")
@@ -114,7 +114,7 @@
    /**
     * 修改体检项目对比
     */
    @PreAuthorize("@ss.hasPermi('hosp:contrast:edit')")
    //@PreAuthorize("@ss.hasPermi('hosp:contrast:edit')")
    @Log(title = "体检项目对比", businessType = BusinessType.UPDATE)
    @PutMapping
    @ApiOperation(value = "修改体检项目对比")
@@ -125,7 +125,7 @@
    /**
     * 删除体检项目对比
     */
    @PreAuthorize("@ss.hasPermi('hosp:contrast:remove')")
    //@PreAuthorize("@ss.hasPermi('hosp:contrast:remove')")
    @Log(title = "体检项目对比", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @ApiOperation(value = "删除体检项目对比")
@@ -144,15 +144,15 @@
    @PostMapping(value = "/getHistoryContrast")
    @ApiOperation(value = "获取体检项目具体参与比对项目接口")
    public AjaxResult getHistoryContrast(@RequestBody TjProContrastPostVo postVo) {
        if(null !=postVo.getTjNumber() && null !=postVo.getProIds() && postVo.getProIds().size()>0){
        if (null != postVo.getTjNumber() && null != postVo.getProIds() && postVo.getProIds().size() > 0) {
            TjOrder tjOrder = orderService.getOrderByTjNum(postVo.getTjNumber());
            if(null !=tjOrder){
               List<Map<String,Object>> list=new ArrayList<>();
            if (null != tjOrder) {
                List<Map<String, Object>> list = new ArrayList<>();
                for (Long proId : postVo.getProIds()) {
                    List<TjProContrastVo> contrastVo = tjProContrastService.ProContrastVo(String.valueOf(tjOrder.getUserId()),proId);
                    Map<String,Object> map=new HashMap<>();
                    map.put("proName",projectService.getTjProjectById(String.valueOf(proId)).getProName());
                    map.put("contrastVo",contrastVo);
                    List<TjProContrastVo> contrastVo = tjProContrastService.ProContrastVo(String.valueOf(tjOrder.getUserId()), proId);
                    Map<String, Object> map = new HashMap<>();
                    map.put("proName", projectService.getTjProjectById(String.valueOf(proId)).getProName());
                    map.put("contrastVo", contrastVo);
                    list.add(map);
                }
                return AjaxResult.success(list);