Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

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

@@ -22,6 +22,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -56,16 +57,8 @@
    private ITjConsumablesService tjConsumablesService;
    @Resource
    private ISysConfigService configService;

    @Resource
    private TjAsyncService asyncService;

    @Resource
    private RedisCache redisCache;

    @Autowired
    private IMallKeywordService mallKeywordService;

    @Autowired
    private IMallCategoryService mallCategoryService;

@@ -75,7 +68,7 @@
    public TableDataInfo getPacList(@ApiParam(value = "体检套餐对象") TjPackage tjPackage) {
        startPage();
        List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage);
        if (null != list && list.size() > 0) {
        if (null != list && !list.isEmpty()) {
            for (TjPackage aPackage : list) {
                aPackage.setAllProName(tjPackageService.getTjPacProNames(String.valueOf(aPackage.getPacId())));
                final String keywords = aPackage.getKeywords();
@@ -101,32 +94,19 @@
    public AjaxResult getPacInFo(@ApiParam(value = "体检套餐对象id") String pacId) {
        TjPackage aPackage = tjPackageService.getById(pacId);
        if (null != aPackage) {
                List<TjProject> tjProjectList = new ArrayList<>();
                List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
                if (null != pplist) {
                    for (TjPackageProject packageProject : pplist) {
//                        StringBuilder allSonProName = new StringBuilder();   //2023.2.7 套餐内每一父项目的子项目字符串
                        TjProject tjProject = tjProjectService.getById(packageProject.getProId());
                        if (null != tjProject) {
//                            List<TjProject> listBySoneId = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
//                            for (TjProject project : listBySoneId) {
//                                allSonProName.append(project.getProName()).append(";");  //2023.2.7 套餐内每一父项目的子项目字符串
//                            }
                            tjProject.setAllSonProName(tjProjectService.getAllSonNames(String.valueOf(packageProject.getProId())));   //2023.2.7 套餐内每一父项目的子项目字符串
                            tjProjectList.add(tjProject);
                            //现价赋值判断null赋原价  2023.2.8
                            if (packageProject.getPriceNow() != null) {
                                tjProject.setPriceNow(packageProject.getPriceNow());
                            } else {
                                tjProject.setPriceNow(tjProject.getProPrice());
                            }

                            packageProject.setProName(tjProject.getProName());
                        }
                    }
                }
                aPackage.setTjProjectList(tjProjectList);
                aPackage.setPackageProjects(pplist);
            return AjaxResult.success(aPackage);
        }
        return AjaxResult.success(aPackage);
        return AjaxResult.error();
    }


@@ -139,7 +119,7 @@
    public TableDataInfo list(@ApiParam(value = "体检套餐对象") TjPackage tjPackage) {
        startPage();
        List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage);
        if (null != list && list.size() > 0) {
        if (null != list && !list.isEmpty()) {
            for (TjPackage aPackage : list) {
                StringBuilder allProName = new StringBuilder();
                StringBuilder allSonName = new StringBuilder();
@@ -296,7 +276,7 @@
    }

    private void getTjPackageList(List<TjPackage> tjPackageList) {
        if (null != tjPackageList && tjPackageList.size() > 0) {
        if (null != tjPackageList && !tjPackageList.isEmpty()) {
            for (TjPackage aPackage : tjPackageList) {
                List<TjProject> tjProjectList = new ArrayList<>();
                List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
@@ -395,9 +375,10 @@
            BigDecimal money = new BigDecimal("0.00");
            tjPackage.setPrice(money);
        }
        tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
        if (tjPackageService.save(tjPackage)) {
            List<TjProject> tjProjectList = tjPackage.getTjProjectList();
            if (null != tjProjectList && tjProjectList.size() > 0) {
            if (null != tjProjectList && !tjProjectList.isEmpty()) {
                BigDecimal money = new BigDecimal("0.00");
                for (TjProject tjProject : tjProjectList) {
                    TjPackageProject tjpp = new TjPackageProject();
@@ -418,8 +399,8 @@
                        continue;
                    }
                    ppservice.save(tjpp);
                    if (null != tjProject.getPriceNow()) {
                        money = money.add(tjProject.getPriceNow());
                    if (null != tjProject.getProPrice()) {
                        money = money.add(tjProject.getProPrice());
                    }
                }
                tjPackage.setPrice(money.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
@@ -438,9 +419,10 @@
    @ApiOperation(value = "修改体检套餐")
    //@PreAuthorize("@ss.hasPermi('system:package:edit')")
    public AjaxResult edit(@RequestBody @ApiParam(value = "体检套餐对象") TjPackage tjPackage) {
        tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
        if (tjPackageService.updateById(tjPackage)) {
            List<TjProject> tjProjectList = tjPackage.getTjProjectList();
            if (null != tjProjectList && tjProjectList.size() > 0) {
            if (null != tjProjectList && !tjProjectList.isEmpty()) {
                LambdaQueryWrapper<TjPackageProject> wq = new LambdaQueryWrapper<>();
                wq.eq(TjPackageProject::getPacId, tjPackage.getPacId());
                ppservice.remove(wq);
@@ -465,8 +447,8 @@
                    tjpp.setProId(tjProject.getProId());
                    tjpp.setPacId(tjPackage.getPacId());
                    ppservice.save(tjpp);
                    if (null != tjProject.getPriceNow()) {
                        money = money.add(tjProject.getPriceNow());
                    if (null != tjProject.getProPrice()) {
                        money = money.add(tjProject.getProPrice());
                    }
                }
                tjPackage.setPrice(money.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
@@ -567,7 +549,7 @@
            LambdaQueryWrapper<TjPackage> wq0 = new LambdaQueryWrapper<>();
            wq0.like(TjPackage::getPacName, name);
            List<TjPackage> packageList = tjPackageService.list(wq0);
            if (null != packageList && packageList.size() > 0) {
            if (null != packageList && !packageList.isEmpty()) {
                for (TjPackage aPackage : packageList) {
                    List<TjProject> tjProjectList = new ArrayList<>();
                    LambdaQueryWrapper<TjPackageProject> wq = new LambdaQueryWrapper<>();
@@ -608,7 +590,7 @@
            }

            List<TjPackage> tjPackageList = tjPackageService.list();
            if (null != tjPackageList && tjPackageList.size() > 0) {
            if (null != tjPackageList && !tjPackageList.isEmpty()) {
                List<TjPackage> lisi = new ArrayList<>();
                for (TjPackage aPackage : tjPackageList) {
                    String pinyin = PinyinUtil.getFirstLetter(aPackage.getPacName(), "");
@@ -656,4 +638,25 @@
        }
        return AjaxResult.error("请输入你要查询的内容");
    }


    @PostMapping("/saveOreditTjPacNew")
    @ApiOperation(value = "体检套餐新增修改接口")
    public AjaxResult saveOreditTjPacNew(@RequestBody @ApiParam(value = "体检套餐对象") TjPackage tjPackage) {
        tjPackage.setPym(PinyinUtil.getFirstLetter(tjPackage.getPacName(),""));
        if (tjPackageService.saveOrUpdate(tjPackage)) {
            List<TjPackageProject> projectList = tjPackage.getPackageProjects();
            if (null != projectList && !projectList.isEmpty()) {
                if(StringUtil.isNotBlank(tjPackage.getPacId())){
                    ppservice.deleteTjPackageProjectByPacId(tjPackage.getPacId());
                    for (TjPackageProject project : projectList) {
                        project.setPacId(tjPackage.getPacId());
                        ppservice.save(project);
                    }
                }
            }
            return AjaxResult.success();
        }
        return AjaxResult.error();
    }
}