团体向lis发送数据调整

zhaowenxuan

3 天以前 72d3216c2f4d40e1b930594eec9c7d77a8077d6b

团体向lis发送数据调整

 ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java

@@ -2,6 +2,7 @@


import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -110,11 +111,24 @@
            List<TjSampling> list = tjSamplingService.list(wrapper);
            for (TjSampling tjSampling : list) {
                TjProject project = projectService.getById(tjSampling.getProId());
                LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto();
                dto.setXh(String.valueOf(xh.getAndIncrement() + 1));
                dto.setJyxm(tjSampling.getJyxmdm());
                dto.setXmmc(tjSampling.getProName());
                dtos.add(dto);
                if (StrUtil.isBlank(tjSampling.getJyxmdm())){
                    LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
                    wrapper1.eq(TjProject::getProParentId,project.getProId());
                    List<TjProject> projects = projectService.list(wrapper1);
                    for (TjProject tjProject : projects) {
                        LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto();
                        dto.setXh(String.valueOf(xh.getAndIncrement() + 1));
                        dto.setJyxm(tjProject.getLisXmbm());
                        dto.setXmmc(tjProject.getProName());
                        dtos.add(dto);
                    }
                }else {
                    LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto();
                    dto.setXh(String.valueOf(xh.getAndIncrement() + 1));
                    dto.setJyxm(tjSampling.getJyxmdm());
                    dto.setXmmc(tjSampling.getProName());
                    dtos.add(dto);
                }

                OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                detailsDto.setMxfyxmbm(project.getHisXmbm());
@@ -129,11 +143,24 @@
            }
        }else {
            TjProject project = projectService.getById(sampling.getProId());
            LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto();
            dto.setXh(String.valueOf(xh.getAndIncrement() + 1));
            dto.setJyxm(sampling.getJyxmdm());
            dto.setXmmc(sampling.getProName());
            dtos.add(dto);
            if (StrUtil.isBlank(sampling.getJyxmdm())){
                LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
                wrapper1.eq(TjProject::getProParentId,project.getProId());
                List<TjProject> projects = projectService.list(wrapper1);
                for (TjProject tjProject : projects) {
                    LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto();
                    dto.setXh(String.valueOf(xh.getAndIncrement() + 1));
                    dto.setJyxm(tjProject.getLisXmbm());
                    dto.setXmmc(tjProject.getProName());
                    dtos.add(dto);
                }
            }else {
                LisSaveSqdxxJyxmlistDto dto = new LisSaveSqdxxJyxmlistDto();
                dto.setXh(String.valueOf(xh.getAndIncrement() + 1));
                dto.setJyxm(sampling.getJyxmdm());
                dto.setXmmc(sampling.getProName());
                dtos.add(dto);
            }

            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
            detailsDto.setMxfyxmbm(project.getHisXmbm());