diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java index d219ff0..3d6cf8d 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java @@ -20,6 +20,7 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.demo.disciplinefieid.entity.DisciplineFieid; import org.jeecg.modules.demo.disciplinefieid.service.IDisciplineFieidService; import org.jeecg.modules.demo.expert.entity.ExpCmsVo; +import org.jeecg.modules.demo.expert.entity.ExpdefVo; import org.jeecg.modules.demo.expert.entity.Expert; import org.jeecg.modules.demo.expert.service.IExpertService; @@ -739,4 +740,40 @@ public class ExpertController extends JeecgController { expCmsVo.setRealname(sysUser.getRealname()); return Result.OK(expCmsVo); } + @ApiOperation(value="管理员专家数据---专家总数", notes="管理员专家数据---专家总数") + @GetMapping(value = "/expdatanumber") + public Result expdatanumber() { + List expertList = expertService.list(); + return Result.OK(expertList.size()); + } + + @ApiOperation(value="管理员专家数据---正常专家数", notes="管理员专家数据---正常专家数") + @GetMapping(value = "/expdatanumberzc") + public Result expdatanumberzc() { + List expertList = expertService.query().eq("adminopen","2").eq("compopen","2").eq("expsture","N").list(); + return Result.OK(expertList.size()); + } + + @ApiOperation(value="管理员专家数据---异常专家数", notes="管理员专家数据---异常专家数") + @GetMapping(value = "/expdatanumberyc") + public Result expdatanumberyc() { + List expertList = expertService.query().eq("adminopen","2").eq("compopen","2").eq("expsture","Y").list(); + return Result.OK(expertList.size()); + } + + @ApiOperation(value="管理员专家数据---不同的领域专家数", notes="管理员专家数据---不同的领域专家数") + @GetMapping(value = "/expdatanumberdiffect") + public Result> expdatanumberdiffect() { + List expdefVoList = new ArrayList<>(); + List disciplineFieidList = disciplineFieidService.list(); + for (int i=0;i expertList = expertService.query().eq("compopen","2").eq("adminopen","2").eq("directioncal",disciplineFieidList.get(i).getId()).list(); + expdefVo.setName(disciplineFieidList.get(i).getName()); + expdefVo.setNumber(expertList.size()); + expdefVoList.add(expdefVo); + } + return Result.OK(expdefVoList); + } + } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpdefVo.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpdefVo.java new file mode 100644 index 0000000..f613479 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpdefVo.java @@ -0,0 +1,9 @@ +package org.jeecg.modules.demo.expert.entity; + +import lombok.Data; + +@Data +public class ExpdefVo { + private String name; + private Integer number; +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java index 16b8a8e..0391aa9 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java @@ -120,6 +120,7 @@ public class Expert implements Serializable { private java.lang.String expsture; /**异常备注*/ @Excel(name = "异常备注", width = 15) + @Dict(dicCode = "yczt") @ApiModelProperty(value = "异常备注") private java.lang.String errinfo; diff --git a/jeecgboot-vue3/src/views/dashboard/workbench/components/DynamicInfo.vue b/jeecgboot-vue3/src/views/dashboard/workbench/components/DynamicInfo.vue index 4be8f1f..eb187f2 100644 --- a/jeecgboot-vue3/src/views/dashboard/workbench/components/DynamicInfo.vue +++ b/jeecgboot-vue3/src/views/dashboard/workbench/components/DynamicInfo.vue @@ -1,14 +1,14 @@