zjh202412016

zjh

2024-12-16 8ab195e6260c61e69bb3f5a14d841fd3bd058f51

zjh202412016

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

@@ -207,7 +207,7 @@
                           @ApiParam(value = "建议") @RequestParam(required = false) String nr,
                           @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                           @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize,
    @RequestParam(value = "deptId")String deptId) {
                           @RequestParam(required = false)String deptId) {
//        LambdaQueryWrapper<SysDept> wrapper = new LambdaQueryWrapper<>();
//        wrapper.eq(SysDept::getParentId, 0);
//        SysDept sysDept = sysDeptService.getOne(wrapper);

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

@@ -3349,7 +3349,12 @@
    @GetMapping("/zongjanyemianshjianzhou")
    @ApiOperation(value = "总检获取时间轴接口")
    @Transactional
    public AjaxResult zongjanyemianshjianzhou(@RequestParam String tjNUm) {
    public AjaxResult zongjanyemianshjianzhou(@RequestParam List<String> tjNUms) {

        if(null !=tjNUms && !tjNUms.isEmpty()){
            List<Map<String,Object>> list=new ArrayList<>();
            for (String tjNUm : tjNUms) {
                Map<String,Object> map=new HashMap<>();
        TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
        if (null != order) {
            int czwj = remarkService.panduaniscunzaiweijian(tjNUm);
@@ -3362,26 +3367,37 @@
            if (czwj == 0) {
                //未检
                a=0;
            } else if (czwj > 0) {
                    }
                    if (czwj > 0) {
                //在检
                a=1;
            } else if (sfwc == 0) {
                    }
                    if (sfwc == 0) {
                //已完成
                a=2;
            } else if (null != checkTime) {
                    }
                    if (null != checkTime) {
                //已审核
                a=3;
            } else if (null != reportTime) {
                    }
                    if (null != reportTime) {
                //生成报告
                a=4;
            } else if (null != heshouStatus) {
                    }
                    if (null != heshouStatus) {
                //报告核收
                a=5;
            } else if (null != lastTime) {
                    }
                    if (null != lastTime) {
                //已出报告
                a=6;
            }
            return AjaxResult.success(a);
                    map.put("tjNUm",tjNUm);
                    map.put("sjz",a);
                    list.add(map);
            }
        }
            return AjaxResult.success(list);
        }
        return AjaxResult.error();
    }