zjh20250418

zjh

2025-04-18 1630243ed75a92c60d0638e7d14477e4aadcf2b7

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -608,7 +608,7 @@
            }else {
                deptname=dept.getDeptName();
            }

            String xb= tjCustomerService.getSexByTjh(order.getTjNumber());

            for (TjOrderDetail detail : tjOrderDetailList) {
                detail.setTjStatus(1L);
@@ -637,7 +637,7 @@
                        for (String s : split) {
                            s = s.replaceAll("\n", "");
//                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                            Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0");
                            Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0",xb);
                            if(null !=mapss && !mapss.isEmpty()){
                                Object bt = mapss.get("bt");
                                Object nr = mapss.get("nr");
@@ -1742,17 +1742,32 @@
                            if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
                                if (null != project.getHisXmbm()) {
                                    {
                                        mapJinchuan.add(project.getProParentId().toString());
                                        OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                                        detailsDto.setMxfyxmbm(project.getHisXmbm());

                                        if (project.getSfzhfy().equals("Y")) {
                                            detailsDto.setSfzhfy("1");
                                        } else {
                                            detailsDto.setSfzhfy("0");
                                            mapJinchuan.add(project.getProParentId().toString());
                                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                                            detailsDto.setMxfyxmbm(project.getHisXmbm());
                                            if (project.getSfzhfy().equals("Y")) {
                                                detailsDto.setSfzhfy("1");
                                            } else {
                                                detailsDto.setSfzhfy("0");
                                            }
                                            detailsDto.setSl(project.getSl());
                                            detailsDto.setProjg(project.getProPrice());
                                            detailDtos.add(detailsDto);
                                        }
                                        detailsDto.setSl(project.getSl());
                                        detailsDto.setProjg(project.getProPrice());
                                        detailDtos.add(detailsDto);

//                                        mapJinchuan.add(project.getProParentId().toString());
//                                        OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
//                                        detailsDto.setMxfyxmbm(project.getHisXmbm());
//                                        if (project.getSfzhfy().equals("Y")) {
//                                            detailsDto.setSfzhfy("1");
//                                        } else {
//                                            detailsDto.setSfzhfy("0");
//                                        }
//                                        detailsDto.setSl(project.getSl());
//                                        detailsDto.setProjg(project.getProPrice());
//                                        detailDtos.add(detailsDto);
                                    }
                                }
                                List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());