diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java index 3f2eb279..a3a13933 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectMaterialSealController.java @@ -69,6 +69,22 @@ public class ProjectMaterialSealController extends BaseController { redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return success(list); } + + /** + * 质量管理-材料封样 + * @param where + * @return + */ + @PostMapping("/groupByApprove") + public AjaxResult groupByApprove(@RequestBody SurProjectMaterialSeal where){ + Long deptId=where.getDeptId(); + if(deptId==null || deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } + return AjaxResult.success(materialSealService.groupByApprove(where)); + } @PostMapping("/selectTop12Month") public TableDataInfo selectTop12Month(@RequestBody SurProjectMaterialSeal where){ PageDomain pageDomain = TableSupport.buildPageRequest(); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java index e9e4c13a..38012724 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectMaterialSealMapper.java @@ -74,4 +74,10 @@ public interface SurProjectMaterialSealMapper public List groupTop12Month(SurProjectMaterialSeal where); public List selectTop12Month(SurProjectMaterialSeal where); + /** + * 质量管理-材料封样 + * @param where + * @return + */ + public List groupByApprove(SurProjectMaterialSeal where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java index 5e9f6297..63a1c820 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectMaterialSealService.java @@ -82,4 +82,10 @@ public interface ISurProjectMaterialSealService public List groupTop12Month(SurProjectMaterialSeal where); public List selectTop12Month(SurProjectMaterialSeal where); + /** + * 质量管理-材料封样 + * @param where + * @return + */ + public List groupByApprove(SurProjectMaterialSeal where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java index 4e9c8ec9..8713b61e 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java @@ -213,4 +213,13 @@ public class SurProjectMaterialSealServiceImpl extends WeChatMessageServiceImpl public List selectTop12Month(SurProjectMaterialSeal where) { return surProjectMaterialSealMapper.selectTop12Month(where); } + /** + * 质量管理-材料封样 + * @param where + * @return + */ + @Override + public List groupByApprove(SurProjectMaterialSeal where) { + return surProjectMaterialSealMapper.groupByApprove(where); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml index c3807c7f..4e40f6cb 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml @@ -220,6 +220,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by year(spms.seal_date),month(spms.seal_date) order by year(spms.seal_date) desc,month(spms.seal_date) desc + +