ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
@@ -44,6 +44,8 @@ @GetMapping("/list") public TableDataInfo selectSvyLibTemplatelist(SvyLibTemplate svyLibTemplate) { startPage(); SysUser user = getLoginUser().getUser(); svyLibTemplate.setOrgid(user.getOrgid()); List<SvyLibTemplate> sviLibTemplate = svyLibTemplateService.getSviLibTemplate(svyLibTemplate); return getDataTable(sviLibTemplate); } @@ -55,6 +57,9 @@ @PostMapping("/selectSvyLibTemplatelist") public TableDataInfo selectSvyLibTemplatelist(@RequestBody SvyLibTemplateReq svyLibTemplateReq) { PageUtils.startPageByPost(svyLibTemplateReq.getPageNum(), svyLibTemplateReq.getPageSize()); SysUser user = getLoginUser().getUser(); svyLibTemplateReq.setOrgid(user.getOrgid()); List<SvyLibTemplateVO> list = svyLibTemplateService.selectSvyLibTemplateList(svyLibTemplateReq); if (CollectionUtils.isNotEmpty(list)) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -2,6 +2,7 @@ import java.util.List; import com.ruoyi.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.ArrayUtils; @@ -46,6 +47,8 @@ @GetMapping("/list") public AjaxResult list(SysDept dept) { SysUser user = getLoginUser().getUser(); dept.setOrgid(user.getOrgid()); List<SysDept> depts = deptService.selectDeptList(dept); return success(depts); } smartor/src/main/java/com/smartor/domain/SvyLibTemplateReq.java
@@ -51,6 +51,12 @@ private String description; /** * 机构ID */ @ApiModelProperty(value = "机构ID") private String orgid; /** * pageNum */ @ApiModelProperty("pageNum") smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
@@ -55,15 +55,18 @@ svyLibTemplateReq.setCategoryid(svyLibTemplate.getCategoryid()); svyLibTemplateReq.setDescription(svyLibTemplate.getDescription()); svyLibTemplateReq.setSvyname(svyLibTemplate.getSvyname()); svyLibTemplateReq.setOrgid(svyLibTemplate.getOrgid()); List<SvyLibTemplate> svyLibTemplates = svyLibTemplateMapper.selectSvyLibTemplateList(svyLibTemplateReq); for (SvyLibTemplate svyLibTemplate1 : svyLibTemplates) { SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript(); svyLibTemplateScript.setSvyid(svyLibTemplate1.getSvyid()); svyLibTemplateScript.setOrgid(svyLibTemplate1.getOrgid()); List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript); for (SvyLibTemplateScript svyLibTemplateScript1 : svyLibTemplateScripts) { if (svyLibTemplateScript1.getScriptType().equals("1") || svyLibTemplateScript1.getScriptType().equals("2")) { SvyLibTemplateTargetoption svyLibTemplateTargetoption = new SvyLibTemplateTargetoption(); svyLibTemplateTargetoption.setScriptid(svyLibTemplateScript1.getId()); svyLibTemplateTargetoption.setOrgid(svyLibTemplateScript1.getOrgid()); List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption); svyLibTemplateScript1.setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions); } @@ -88,6 +91,7 @@ for (int i = 0; i < svyLibTemplateVOS.size(); i++) { SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript(); svyLibTemplateScript.setSvyid(svyLibTemplateVOS.get(i).getSvyid()); svyLibTemplateScript.setOrgid(svyLibTemplateVOS.get(i).getOrgid()); List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript); //获取题目选项 a: @@ -99,6 +103,7 @@ } else { SvyLibTemplateTargetoption svyLibTopicoption = new SvyLibTemplateTargetoption(); svyLibTopicoption.setScriptid(svyLibTemplateScripts.get(j).getId()); svyLibTopicoption.setOrgid(svyLibTemplateVOS.get(i).getOrgid()); List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTopicoption); //将查询出的选项目放到题目中 svyLibTemplateScripts.get(j).setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions); smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
@@ -128,6 +128,7 @@ <if test="categoryid != null ">and a.categoryid = #{categoryid}</if> <if test="svyid != null ">and a.svyid = #{svyid}</if> <if test="longTemp != null ">and a.long_temp = #{longTemp}</if> <if test="orgid != null ">and a.orgid = #{orgid}</if> <if test="svyname != null and svyname != ''">and a.svyname like concat('%', #{svyname}, '%')</if> <if test="description != null and description != ''">and b.icd10name like concat('%', #{description}, '%') </if>
