Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

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

@@ -41,6 +41,41 @@
    @Resource
    private ITjProjectService tjProjectService;

    @GetMapping("/getZhList")
    @ApiOperation(value = "查询组合集合")
    public AjaxResult getZhList(@ApiParam(value = "体检组合名称或拼音码") @RequestParam(required = false) String zhmc) {
        LambdaQueryWrapper<TjZhxm> wq2=new LambdaQueryWrapper<>();
        if (zhmc != null) wq2.like(TjZhxm::getZhmc,zhmc).or().like(TjZhxm::getPym,zhmc);
        List<TjZhxm> lists = zhxmService.list(wq2);
            if (null != lists && lists.size()>0) {
                for (TjZhxm zhxm : lists) {
                    LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjZhxmglpro::getZhId, zhxm.getId());
                    List<TjZhxmglpro> list = tjZhxmglproService.list(wq);
                    StringBuilder allName = new StringBuilder();
                    if (null != list && list.size() > 0) {
                        List<TjProject> projectList = new ArrayList<>();
                        BigDecimal money = new BigDecimal("0.00");
                        for (TjZhxmglpro zhxmglpro : list) {
                            TjProject project = tjProjectService.getById(zhxmglpro.getProId());
                            if (null != project) {
                                projectList.add(project);
                                allName.append(project.getProName()).append("；");
                                money=money.add(project.getProPrice());
                            }
                        }
                        zhxm.setPrice(money);
                        zhxm.setAllProName(allName.toString());
                        zhxm.setZhxmglpros(list);
                        zhxm.setTjProjectList(projectList);
                    }
                }
                return AjaxResult.success(lists);
        }
        return AjaxResult.success("暂时没有数据");
    }


    @Log(title = "体检组合项目", businessType = BusinessType.INSERT)
    @PostMapping
    @ApiOperation(value = "新增体检组合")
@@ -55,7 +90,7 @@
        zhxm.setPym(PinyinUtil.getFirstLetter(zhxm.getZhmc(), ""));
        if (zhxmService.save(zhxm)) {
            List<TjZhxmglpro> zhxmglpros = zhxm.getZhxmglpros();
            if (null != zhxmglpros && zhxmglpros.size() > 0) {
            if (null != zhxmglpros && !zhxmglpros.isEmpty()) {
                for (TjZhxmglpro zhxmglpro : zhxmglpros) {
                    TjZhxmglpro pro = new TjZhxmglpro();
                    pro.setZhId(zhxm.getId());
@@ -79,7 +114,7 @@
        zhxm.setPym(PinyinUtil.getFirstLetter(zhxm.getZhmc(), ""));
        if (zhxmService.updateById(zhxm)) {
            List<TjZhxmglpro> zhxmglpros = zhxm.getZhxmglpros();
            if (null != zhxmglpros && zhxmglpros.size() > 0) {
            if (null != zhxmglpros && !zhxmglpros.isEmpty()) {
                LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>();
                wq.eq(TjZhxmglpro::getZhId, zhxm.getId());
                tjZhxmglproService.remove(wq);
@@ -108,28 +143,21 @@
                List<TjZhxmglpro> list = tjZhxmglproService.list(wq);
                StringBuilder allName = new StringBuilder();
//                StringBuilder allSonName = new StringBuilder();
                if (null != list && list.size() > 0) {
                if (null != list && !list.isEmpty()) {
                    List<TjProject> projectList = new ArrayList<>();
                    BigDecimal money = new BigDecimal("0.00");
                    for (TjZhxmglpro zhxmglpro : list) {
                        LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
                        wq1.eq(TjProject::getProId, zhxmglpro.getProId());
                        wq1.eq(TjProject::getProParentId, 0);
                        if (null != tjProjectService.getOne(wq1)) {
                            projectList.add(tjProjectService.getOne(wq1));
                            allName.append(tjProjectService.getOne(wq1).getProName()).append("；");
                        TjProject project = tjProjectService.getById(zhxmglpro.getProId());
                        if (null != project) {
                            projectList.add(project);
                            allName.append(project.getProName()).append("；");
                            money=money.add(project.getProPrice());
                        }
                    }
                    zhxm.setAllProName(allName.toString());
//                    for (TjProject tjProject : projectList) {
//                        LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
//                        wq2.eq(TjProject::getProParentId, tjProject.getProId());
//                        tjProject.setTjProjectList(tjProjectService.list(wq2));
//                        for (TjProject project : tjProjectService.list(wq2)) {
//                            allSonName.append(project.getProName()).append("；");
//                        }
//                        tjProject.setAllSonProName(allSonName.toString());
//                    }
                    zhxm.setPrice(money);
                    zhxm.setZhxmglpros(list);
                    zhxm.setTjProjectList(projectList);

                    return AjaxResult.success(zhxm);
                }