ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjPackageController.java
@@ -69,6 +69,108 @@ @Autowired private IMallCategoryService mallCategoryService; @GetMapping("/getPacList") @ApiOperation(value = "查询体检套餐列表(自带有分页)(新)") //@PreAuthorize("@ss.hasPermi('hosp:package:list')") public TableDataInfo getPacList(@ApiParam(value = "体检套餐对象") TjPackage tjPackage) { startPage(); List<TjPackage> list = tjPackageService.selectTjPackageList(tjPackage); if (null != list && list.size() > 0) { for (TjPackage aPackage : list) { // StringBuilder allProName = new StringBuilder(); // StringBuilder allSonName = new StringBuilder(); // // 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) { // allProName.append(tjProject.getProName()).append("；"); // List<TjProject> listBySoneId = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId())); //// for (TjProject project : listBySoneId) { //// allSonProName.append(project.getProName()).append(";"); //2023.2.7 套餐内每一父项目的子项目字符串 //// allSonName.append(project.getProName()).append(";"); //// } // tjProject.setAllSonProName(allSonProName.toString()); //2023.2.7 套餐内每一父项目的子项目字符串 // tjProjectList.add(tjProject); // //现价赋值判断null赋原价 2023.2.8 // if (packageProject.getPriceNow() != null) { // tjProject.setPriceNow(packageProject.getPriceNow()); // } else { // tjProject.setPriceNow(tjProject.getProPrice()); // } // // } // } // } // aPackage.setTjProjectList(tjProjectList); aPackage.setAllProName(tjPackageService.getTjPacProNames(String.valueOf(aPackage.getPacId()))); // aPackage.setAllSonName(allSonName.toString()); // StringBuffer a = new StringBuffer(); // List<String> b = new ArrayList<>(); final String keywords = aPackage.getKeywords(); if (keywords != null) { final String[] strings = keywords.split(","); // for (String string : strings) { // final MallKeyword byId = mallKeywordService.getById(string); // if (byId != null) { // a.append(byId.getKeyword()); // a.append(";"); // b.add((byId.getId()).toString()); // } // } aPackage.setKeyNames(mallKeywordService.getKeyNames(strings)); aPackage.setKeyIds(mallKeywordService.getKeyIds(strings)); } final MallCategory byId = mallCategoryService.getById(aPackage.getCategoryId()); if (byId != null) { aPackage.setCategoryNames(byId.getName()); } } } return getDataTable(list); } @GetMapping("/getPacInFo") @ApiOperation(value = "查询体检套餐列表(详细)(自带有分页)(新)") //@PreAuthorize("@ss.hasPermi('hosp:package:list')") 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()); } } } } aPackage.setTjProjectList(tjProjectList); } return AjaxResult.success(aPackage); } /** * 查询体检套餐列表 */ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -83,10 +83,10 @@ @GetMapping("/getDxList") @ApiOperation(value = "选择体检项目选单项时调用的接口") public AjaxResult getDxList() { LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>(); wq0.eq(TjProject::getProParentId, 0); // LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>(); // wq0.eq(TjProject::getProParentId, 0); List<TjProject> tjProjects = tjProjectService.list(wq0); List<TjProject> tjProjects = tjProjectService.getDxTjProjectList(); //上面的换sql // final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId); @@ -187,15 +187,13 @@ @GetMapping("/list") @ApiOperation(value = "查询体检项目列表") public AjaxResult list() { LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); wq.eq(TjProject::getProParentId, 0); wq.eq(TjProject::getProStatus, 0); List<TjProject> tjProjects = tjProjectService.list(wq); // LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); // wq.eq(TjProject::getProParentId, 0); // wq.eq(TjProject::getProStatus, 0); List<TjProject> tjProjects = tjProjectService.getTjProjectList(); if (tjProjects != null) { for (TjProject project : tjProjects) { LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>(); wq1.eq(TjProject::getProParentId, project.getProId()); List<TjProject> projectList = tjProjectService.list(wq1); List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId())); project.setTjProjectList(projectList); } return AjaxResult.success(tjProjects); ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -134,4 +134,11 @@ @Select("SELECT * FROM `tj_project` where pro_parent_id=#{proId}") List<TjProject> getAllChildListById(String proId); @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0") List<TjProject> getTjProjectList(); @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '体检',pro_name) ") List<TjProject> getDxTjProjectList(); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
@@ -107,4 +107,7 @@ List<TjProject> getAllChildListById(String proId); List<TjProject> getTjProjectList(); List<TjProject> getDxTjProjectList(); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -201,6 +201,16 @@ return tjProjectMapper.getAllChildListById(proId); } @Override public List<TjProject> getTjProjectList() { return tjProjectMapper.getTjProjectList(); } @Override public List<TjProject> getDxTjProjectList() { return tjProjectMapper.getDxTjProjectList(); } /** * 递归列表 */ ltkj-hosp/src/main/java/com/ltkj/mall/mapper/MallKeywordMapper.java
@@ -6,6 +6,8 @@ import com.ltkj.mall.domain.MallKeyword; import com.ltkj.mall.domain.MallOrder; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** * 关键字Mapper接口 @@ -62,4 +64,19 @@ * @return 结果 */ public int deleteMallKeywordByIds(Long[] ids); @Select({"<script>"," SELECT * FROM mall_keyword a WHERE a.id IN", "<foreach collection='ids' item='id' open='(' separator=',' close=')'>", "#{id}", "</foreach>", "</script>" }) String getKeyNames(@Param("ids")String[] ids); @Select({"<script>"," SELECT GROUP_CONCAT(a.keyword ORDER BY a.keyword) AS names FROM mall_keyword a WHERE a.id IN ", "<foreach collection='ids'" + " item='id' open='(' separator=',' close=')'>", "#{id}", "</foreach>", "</script>" }) List<String> getKeyIds(@Param("ids")String[] ids); } ltkj-hosp/src/main/java/com/ltkj/mall/service/IMallKeywordService.java
@@ -60,4 +60,9 @@ * @return 结果 */ public int deleteMallKeywordById(Long id); String getKeyNames(String[] ids); List<String> getKeyIds(String[] ids); } ltkj-hosp/src/main/java/com/ltkj/mall/service/impl/MallKeywordServiceImpl.java
@@ -90,4 +90,14 @@ public int deleteMallKeywordById(Long id) { return mallKeywordMapper.deleteMallKeywordById(id); } @Override public String getKeyNames(String[] ids) { return mallKeywordMapper.getKeyNames(ids); } @Override public List<String> getKeyIds(String[] ids) { return mallKeywordMapper.getKeyIds(ids); } }
