zjh20250109

zjh

2025-01-09 9017efdeaa64c6d5f0fd0bae4c9f28dcfcf53220

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

@@ -274,11 +274,11 @@
    @Log(title = "体检项目", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody @ApiParam(value = "体检项目对象") TjProject tjProject) {
        if (null != tjProject.getConsumablesList() && tjProject.getConsumablesList().size() > 0) {
        if (null != tjProject.getConsumablesList() && !tjProject.getConsumablesList().isEmpty()) {
            tjProject.setProPrice(BigDecimal.valueOf(0.00));
            tjProject.setProStandard(0);
        }
        if (null != tjProject.getTjStandardList() && tjProject.getTjStandardList().size() > 0) {
        if (null != tjProject.getTjStandardList() && !tjProject.getTjStandardList().isEmpty()) {
            tjProject.setProStandard(1);
        }
        tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
@@ -290,7 +290,7 @@
                dictProSfxmService.save(proSfxm);
            }
            List<TjConsumables> consumablesList = tjProject.getConsumablesList();
            if (null != consumablesList && consumablesList.size() > 0) {
            if (null != consumablesList && !consumablesList.isEmpty()) {
                for (TjConsumables tjConsumables : consumablesList) {
                    TjProConsumables proConsumables = new TjProConsumables();
                    proConsumables.setProId(tjProject.getProId());
@@ -299,7 +299,7 @@
                }
            }
            List<TjStandard> tjStandardList = tjProject.getTjStandardList();
            if (null != tjStandardList && tjStandardList.size() > 0) {
            if (null != tjStandardList && !tjStandardList.isEmpty()) {
                for (TjStandard tjStandard : tjStandardList) {
                    TjStandard tjStandard1 = new TjStandard();
                    BeanUtils.copyBeanProp(tjStandard1, tjStandard);
@@ -312,23 +312,25 @@
                }
                Long proParentId = tjProject.getProParentId();
                if (null != proParentId && proParentId != 0) {
                    LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjProject::getProParentId, proParentId);
                    List<TjProject> projectList = tjProjectService.list(wq);
                    if (null != projectList && projectList.size() > 0) {
//                    LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
//                    wq.eq(TjProject::getProParentId, proParentId);
//                    wq.eq(TjProject::getProStatus,0);
//                    List<TjProject> projectList = tjProjectService.list(wq);
                    List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(proParentId));
                    if (null != projectList && !projectList.isEmpty()) {
                        BigDecimal bigDecimal = new BigDecimal("0.00");
                        for (TjProject project : projectList) {
                            if (project.getProPrice() != null) {
                                bigDecimal = bigDecimal.add(project.getProPrice());
                                bigDecimal = bigDecimal.add(project.getProPrice().multiply(new BigDecimal(project.getSl())));
                            }
                        }
                        if (tjProject.getProPrice() != null) {
                            bigDecimal.add(tjProject.getProPrice());
                        }
//                        if (tjProject.getProPrice() != null) {
//                            bigDecimal.add(tjProject.getProPrice());
//                        }
                        TjProject byId = tjProjectService.getById(proParentId);
                        tjProject.setIsSampling(byId.getIsSampling());
                        tjProjectService.updateById(tjProject);
                        byId.setProPrice(bigDecimal.setScale(2, BigDecimal.ROUND_DOWN));
                        byId.setProPrice(bigDecimal);
                        tjProjectService.updateById(byId);
                    }
                }
@@ -445,19 +447,19 @@
            }
            Long proParentId = tjProject.getProParentId();
            if (null != proParentId) {
                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                wq.eq(TjProject::getProParentId, proParentId);
                wq.eq(TjProject::getProStatus,0);
//                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
//                wq.eq(TjProject::getProParentId, proParentId);
//                wq.eq(TjProject::getProStatus,0);
//                List<TjProject> projectList = tjProjectService.list(wq);
                List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(proParentId));
                if (null != projectList && !projectList.isEmpty()) {
                    BigDecimal bigDecimal = new BigDecimal("0.00");
                    for (TjProject project : projectList) {
                        bigDecimal = bigDecimal.add(project.getProPrice());
                        bigDecimal = bigDecimal.add(project.getProPrice().multiply(new BigDecimal(project.getSl())));
                    }
                    bigDecimal.add(tjProject.getProPrice());
//                    bigDecimal.add(tjProject.getProPrice());
                    TjProject byId = tjProjectService.getById(proParentId);
                    byId.setProPrice(bigDecimal.setScale(2, BigDecimal.ROUND_DOWN));
                    byId.setProPrice(bigDecimal);
                    tjProjectService.updateById(byId);
                }
            }
@@ -609,10 +611,10 @@
            List<Map<String,Object>> projectList =  tjProjectService.zdysqlcx(sql);
            if(null !=projectList && !projectList.isEmpty()){
                for (Map<String, Object> map : projectList) {
                    Object zd1 = map.get("zd");
                    Object zd1 = map.get(zd);
                    if(null !=zd1 && StringUtil.isNotBlank(zd1.toString())){
                        String letter = PinyinUtil.getFirstLetter(zd1.toString(), "");
                        sql="UPDATE "+ tbname +" "+ " set " +pymzd+" = "+ letter;
                        sql="UPDATE "+ tbname +" "+ " set " +pymzd+" = "+ "'" +letter+"'"+" where  "+zd+" = "+"'"+zd1+"'" ;
                        tjProjectService.zdysqlxg(sql);
                    }
                }