zjh20250123

zjh

2025-01-23 5e15f28db8bf83cc19697e1ce2bd0078cd9cdfb8

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

@@ -57,6 +57,7 @@
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.setClipRect;
import static org.jeecg.modules.jmreport.dyndb.util.b.a;
import static org.jeecg.modules.jmreport.dyndb.util.b.e;

/**
 * @Author: 西安路泰科技有限公司/赵佳豪
@@ -1583,7 +1584,7 @@
    @PostMapping ("/checkUpdateOrderRemark")
    @ApiOperation (value = "总检修改备注接口")
    public AjaxResult checkUpdateOrderRemark(@RequestBody List<UpdateOrderRemarkVo> updateOrderRemarkVos) {
        if (null != updateOrderRemarkVos && updateOrderRemarkVos.size() > 0) {
        if (null != updateOrderRemarkVos && !updateOrderRemarkVos.isEmpty()) {
            for (UpdateOrderRemarkVo remarkVo : updateOrderRemarkVos) {
                LambdaQueryWrapper<TjOrderRemark> wqm = new LambdaQueryWrapper<>();
                wqm.eq(TjOrderRemark::getTjNumber, remarkVo.getTjNumber());
@@ -1639,6 +1640,12 @@
    @ApiOperation (value = "总检查看异常项目接口")
    public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
        if (StrUtil.isNotBlank(tjNum)) {
            TjOrder one = orderService.getOrderByTjNum(tjNum);

            if (one == null) {
                return AjaxResult.error("暂无数据！！");
            }

        LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
        wq.eq(TjOrderYcxm::getTjh,tjNum);
        List<TjOrderYcxm> list = ycxmService.list(wq);
@@ -1646,13 +1653,9 @@
            Collections.reverse(list);
            Map<String, List<TjOrderYcxm>> map = list.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
            List<Map<String, Object>> maps = new ArrayList<>();

            for (Map.Entry<String, List<TjOrderYcxm>> entry : map.entrySet()) {

                Map<String, Object> parent = new HashMap<>();

                List<TjOrderDetail> dels = new ArrayList<>();

                for (TjOrderYcxm ycxm : entry.getValue()) {
                    TjOrderDetail detail=new TjOrderDetail();
                    detail.setProName(ycxm.getJcxm());
@@ -1680,9 +1683,24 @@
                    parent.put("sone",dels);
                    maps.add(parent);
            }
            return AjaxResult.success(maps);
            List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);

            List<Map<String, Object>> collect = maps.stream()
                    .filter(a -> mapList.stream()
                            .allMatch(b -> a.get("jyjc").equals(b.get("jyjc"))))
                    .collect(Collectors.toList());

            if(!collect.isEmpty()){
                mapList.addAll(collect);
//                return AjaxResult.success(result);
            }
           return AjaxResult.success(maps);
        }else {
            return zongjianyishengchakanyichangxiangmu(tjNum);
            List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
            if(mapList.isEmpty()){
                return AjaxResult.error("暂无数据");
            }
            return AjaxResult.success(mapList);
        }

//            return zongjianyishengchakanyichangxiangmu(tjNum);
@@ -1690,13 +1708,9 @@
        return AjaxResult.error();
    }

    private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
    private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
//        asyncService.updateCheckType(tjNumber);
        TjOrder one = orderService.getOrderByTjNum(tjNumber);

        if (one == null) {
            return AjaxResult.error("暂无数据！！");
        }
        List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
        List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
        List<Map<String, Object>> list = new ArrayList<>();
@@ -1744,13 +1758,11 @@
                        parent.put("sone",dels);
                        list.add(parent);
                    }
                } else {
                    return AjaxResult.success("该人员无异常项目");
                }
            }
            return AjaxResult.success(list);

        }
        return AjaxResult.success("该人员没有体检项目数据！");
        return list;
    }

    @GetMapping ("/chushenyemianchakanxiangmujieguo")
@@ -1779,6 +1791,7 @@
                for (TjOrderYcxm ycxm : ycxms) {
                    ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
                }
//                List<TjOrderYcxm> collect = ycxms.stream().distinct().collect(Collectors.toList());
                ycxmService.saveBatch(ycxms);
                return AjaxResult.success();
            }