动态渲染

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/MedicalDto.java

@@ -0,0 +1,41 @@
+package org.jeecg.common.system.vo;
+
+import com.aliyuncs.CommonResponse;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: jeecg-boot
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class MedicalDto implements Serializable{
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 *
+	 */
+	private String value;
+	/**
+	 * 字典文本
+	 */
+	private String text;
+	/**
+	 * 组件 a-input \ j-dict-select-tag \a-input-number
+	 */
+	private String component;
+	/**
+	 * 字典
+	 */
+	private String  dictCode;
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MedicalInsRuleInfoController.java

@@ -13,6 +13,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.system.vo.*;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.medical.Constant;
@@ -112,7 +113,6 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
     }
 
 
-
     @ApiOperation(value = "通过医保规则ID获取规则项目分页", notes = "通过医保规则ID获取规则项目分页")
     @GetMapping(value = "/projectPage")
     public Result<?> projectPage(@RequestParam(name = "id") Integer id,
@@ -124,8 +124,8 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         if (medicalInsRuleInfo == null) {
             return Result.error("未找到对应数据");
         }
-        List<DictDto> dictDtos = new ArrayList<>();
-        if(medicalInsRuleInfo.getSelectedRoles()!=null){
+        List<MedicalDto> dictDtos = new ArrayList<>();
+        if (medicalInsRuleInfo.getSelectedRoles() != null) {
             dictDtos = sysDictService.queryDictByKeys(Arrays.asList(medicalInsRuleInfo.getSelectedRoles().split(",")));
         }
 
@@ -138,16 +138,46 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         Page<MedicalInsRuleProject> page = new Page<MedicalInsRuleProject>(pageNo, pageSize);
         IPage<MedicalInsRuleProject> pageList = projectService.page(page, queryWrapper);
         Map<String, Object> map = new HashMap<>();
+        if (dictDtos.size() > 0) {
+            dictDtos.forEach(it -> {
+                switch (it.getValue()) {
+                    case "medicineDataType":
+                        it.setComponent("j-dict-select-tag");
+                        it.setDictCode("medicine_data_type");
+                        break;
+                    case "changeClass":
+                        it.setComponent("j-dict-select-tag");
+                        it.setDictCode("change_class");
+                        break;
+                    case "categoriesItems":
+                        it.setComponent("j-dict-select-tag");
+                        it.setDictCode("categories_items");
+                        break;
+                    case "medicalInsLevel":
+                        it.setComponent("j-dict-select-tag");
+                        it.setDictCode("medical_ins_level");
+                        break;
+                    case "doctorLevel":
+                        it.setComponent("j-dict-select-tag");
+                        it.setDictCode("doctor_level");
+                        break;
+                    case "state":
+                        it.setComponent("j-dict-select-tag");
+                        it.setDictCode("state");
+                        break;
+                    default:
+                        it.setComponent("a-input");
+                        break;
+                }
+            });
+
+        }
         map.put("title", dictDtos);
         map.put("page", pageList);
         return Result.OK(map);
     }
 
 
-
-
-
-
     /**
      * 添加
      *

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MedicalInsRuleProjectController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.entity.MedicalInsRuleProject;
 import org.jeecg.modules.medical.service.IMedicalInsRuleProjectService;
 
@@ -35,7 +36,6 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 
  /**
  * @Description: medical_ins_rule_project
@@ -81,7 +81,6 @@ public class MedicalInsRuleProjectController extends JeecgController<MedicalInsR
 	 */
 	@AutoLog(value = "medical_ins_rule_project-添加")
 	@ApiOperation(value="medical_ins_rule_project-添加", notes="medical_ins_rule_project-添加")
-	@RequiresPermissions("medical:medical_ins_rule_project:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody MedicalInsRuleProject medicalInsRuleProject) {
 		medicalInsRuleProjectService.save(medicalInsRuleProject);
@@ -96,7 +95,6 @@ public class MedicalInsRuleProjectController extends JeecgController<MedicalInsR
 	 */
 	@AutoLog(value = "medical_ins_rule_project-编辑")
 	@ApiOperation(value="medical_ins_rule_project-编辑", notes="medical_ins_rule_project-编辑")
-	@RequiresPermissions("medical:medical_ins_rule_project:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody MedicalInsRuleProject medicalInsRuleProject) {
 		medicalInsRuleProjectService.updateById(medicalInsRuleProject);
@@ -111,7 +109,6 @@ public class MedicalInsRuleProjectController extends JeecgController<MedicalInsR
 	 */
 	@AutoLog(value = "medical_ins_rule_project-通过id删除")
 	@ApiOperation(value="medical_ins_rule_project-通过id删除", notes="medical_ins_rule_project-通过id删除")
-	@RequiresPermissions("medical:medical_ins_rule_project:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		medicalInsRuleProjectService.removeById(id);
@@ -126,7 +123,6 @@ public class MedicalInsRuleProjectController extends JeecgController<MedicalInsR
 	 */
 	@AutoLog(value = "medical_ins_rule_project-批量删除")
 	@ApiOperation(value="medical_ins_rule_project-批量删除", notes="medical_ins_rule_project-批量删除")
-	@RequiresPermissions("medical:medical_ins_rule_project:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.medicalInsRuleProjectService.removeByIds(Arrays.asList(ids.split(",")));
@@ -156,7 +152,6 @@ public class MedicalInsRuleProjectController extends JeecgController<MedicalInsR
     * @param request
     * @param medicalInsRuleProject
     */
-    @RequiresPermissions("medical:medical_ins_rule_project:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, MedicalInsRuleProject medicalInsRuleProject) {
         return super.exportXls(request, medicalInsRuleProject, MedicalInsRuleProject.class, "medical_ins_rule_project");
@@ -169,7 +164,6 @@ public class MedicalInsRuleProjectController extends JeecgController<MedicalInsR
     * @param response
     * @return
     */
-    @RequiresPermissions("medical:medical_ins_rule_project:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, MedicalInsRuleProject.class);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
-import org.jeecg.common.system.vo.DictDto;
-import org.jeecg.common.system.vo.DictModel;
-import org.jeecg.common.system.vo.DictModelMany;
-import org.jeecg.common.system.vo.DictQuery;
+import org.jeecg.common.system.vo.*;
 import org.jeecg.modules.system.entity.SysDict;
 import org.jeecg.modules.system.model.DuplicateCheckVo;
 import org.jeecg.modules.system.model.TreeSelectModel;
@@ -114,7 +111,7 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
 	 * @return
 	 */
 	List<DictModelMany> queryManyDictByKeys(@Param("dictCodeList") List<String> dictCodeList, @Param("keys") List<String> keys);
-	List<DictDto> queryDictByKeys(@Param("keys") List<String> keys);
+	List<MedicalDto> queryDictByKeys(@Param("keys") List<String> keys);
 
     /**
      * 通过查询指定table的 text code key 获取字典值

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -63,7 +63,7 @@
 	</select>
 
 	<!-- 通过字典code获取字典数据，可批量查询 -->
-	<select id="queryDictByKeys" parameterType="String"  resultType="org.jeecg.common.system.vo.DictDto">
+	<select id="queryDictByKeys" parameterType="String"  resultType="org.jeecg.common.system.vo.MedicalDto">
 		SELECT
 		item.item_text AS "text",
 		item.item_value AS "value"

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java

@@ -1,10 +1,7 @@
 package org.jeecg.modules.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.common.system.vo.DictDto;
-import org.jeecg.common.system.vo.DictModel;
-import org.jeecg.common.system.vo.DictModelMany;
-import org.jeecg.common.system.vo.DictQuery;
+import org.jeecg.common.system.vo.*;
 import org.jeecg.modules.system.entity.SysDict;
 import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.model.TreeSelectModel;
@@ -87,7 +84,7 @@ public interface ISysDictService extends IService<SysDict> {
 	 * @return
 	 */
 	Map<String, List<DictModel>> queryManyDictByKeys(List<String> dictCodeList, List<String> keys);
-	List<DictDto> queryDictByKeys(List<String> keys);
+	List<MedicalDto> queryDictByKeys(List<String> keys);
 
     /**
      * 通过查询指定table的 text code key 获取字典值

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java

@@ -15,10 +15,7 @@ import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.util.ResourceUtil;
-import org.jeecg.common.system.vo.DictDto;
-import org.jeecg.common.system.vo.DictModel;
-import org.jeecg.common.system.vo.DictModelMany;
-import org.jeecg.common.system.vo.DictQuery;
+import org.jeecg.common.system.vo.*;
 import org.jeecg.common.util.SqlInjectionUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
@@ -150,8 +147,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 		return dictMap;
 	}
 	@Override
-	public List<DictDto> queryDictByKeys(List<String> keys) {
-		List<DictDto> list = sysDictMapper.queryDictByKeys(keys);
+	public List<MedicalDto> queryDictByKeys(List<String> keys) {
+		List<MedicalDto> list = sysDictMapper.queryDictByKeys(keys);
 		return list;
 	}