diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 8cdba68b..73a50cfe 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -24,7 +24,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: prod + active: druid # 文件上传 servlet: multipart: diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectFunVerifyController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectFunVerifyController.java index dd280003..ed713ffa 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectFunVerifyController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectFunVerifyController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.service.ISysDeptService; import com.yanzhu.jh.project.domain.SurProjectFunVerify; @@ -148,4 +149,19 @@ public class SurProjectFunVerifyController extends BaseController return toAjax(surProjectFunVerifyService.deleteSurProjectFunVerifyByIds(ids)); } + @GetMapping("/groupByCheckType") + public AjaxResult groupByCheckType(String deptId, String projectId){ + SurProjectFunVerify where=new SurProjectFunVerify(); + if(deptId!=null && !"0".equals(deptId)){ + where.setProjectDeptId(deptId); + }else{ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } + if(projectId!=null && !"0".equals(projectId)){ + where.setProjectId(Convert.toLong(projectId)); + } + return AjaxResult.success(surProjectFunVerifyService.groupByCheckType(where)); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectFunVerifyMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectFunVerifyMapper.java index b9ddc0e7..2a603a99 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectFunVerifyMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectFunVerifyMapper.java @@ -60,4 +60,5 @@ public interface SurProjectFunVerifyMapper */ public int deleteSurProjectFunVerifyByIds(Long[] ids); + List groupByCheckType(SurProjectFunVerify where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectFunVerifyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectFunVerifyService.java index 663611b8..1f74d05a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectFunVerifyService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectFunVerifyService.java @@ -77,4 +77,5 @@ public interface ISurProjectFunVerifyService */ public int deleteSurProjectFunVerifyById(Long id); + public List groupByCheckType(SurProjectFunVerify where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectFunVerifyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectFunVerifyServiceImpl.java index 407fde83..8dc7f091 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectFunVerifyServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectFunVerifyServiceImpl.java @@ -199,4 +199,9 @@ public class SurProjectFunVerifyServiceImpl extends WeChatMessageServiceImpl imp { return surProjectFunVerifyMapper.deleteSurProjectFunVerifyById(id); } + + @Override + public List groupByCheckType(SurProjectFunVerify where) { + return surProjectFunVerifyMapper.groupByCheckType(where); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectFunVerifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectFunVerifyMapper.xml index 128db387..caf58ee2 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectFunVerifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectFunVerifyMapper.xml @@ -186,5 +186,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + \ No newline at end of file