diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectPhotographyController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectPhotographyController.java index 3acc817b..9ccc8012 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectPhotographyController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectPhotographyController.java @@ -36,4 +36,19 @@ public class ProjectPhotographyController extends BaseController { redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } + + @GetMapping("/selectLastPhotography") + public AjaxResult getLast(long projectId){ + SurProjectPhotography where =new SurProjectPhotography(); + where.setProjectId(projectId); + where.setIsDel(0l); + String key="bgscreen_selectLastPhotography_listPhotography_"+where.getProjectId(); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + List list=photographyService.selectLastPhotography(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); + } } diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectStandardController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectStandardController.java index 327194e2..3ca6342d 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectStandardController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectStandardController.java @@ -4,6 +4,7 @@ import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.SecurityUtils; import com.yanzhu.jh.project.domain.SurProjectStandard; @@ -38,6 +39,20 @@ public class ProjectStandardController extends BaseController { return AjaxResult.success(list); } + @PostMapping("/selectList") + public TableDataInfo selectList(@RequestBody SurProjectStandard where){ + startPage(); + Long deptId= where.getDeptId(); + if(deptId==null || deptId<=0){ + if (SecurityUtils.isUserB()) { + where.setPrjIds(getProjectIds()); + } + } + List list=standardService.selectList(where); + return getDataTable(list); + } + + @PostMapping("/groupByType") public AjaxResult groupByType(@RequestBody SurProjectStandard where){ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java index 9087bb46..c230a4b5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java @@ -63,5 +63,7 @@ public interface SurProjectStandardMapper public List groupByType(SurProjectStandard where); - List groupByProject(); + public List groupByProject(); + + public List selectList(SurProjectStandard where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java index bfccec8d..6121fce3 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java @@ -66,4 +66,6 @@ public interface ISurProjectStandardService public List groupByType(SurProjectStandard where); public List groupByProject(); + + public List selectList(SurProjectStandard where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java index fc521ba1..01a74b41 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java @@ -123,4 +123,9 @@ public class SurProjectStandardServiceImpl implements ISurProjectStandardService public List groupByProject() { return surProjectStandardMapper.groupByProject(); } + + @Override + public List selectList(SurProjectStandard where) { + return surProjectStandardMapper.selectList(where); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/mapper/SurProjectPhotographyMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/mapper/SurProjectPhotographyMapper.java index 971ab7aa..5ad1505a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/mapper/SurProjectPhotographyMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/mapper/SurProjectPhotographyMapper.java @@ -58,4 +58,6 @@ public interface SurProjectPhotographyMapper * @return 结果 */ public int deleteSurProjectPhotographyByIds(Long[] ids); + + public List selectLastPhotography(SurProjectPhotography where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectPhotographyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectPhotographyService.java index d1b7728d..1be0421d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectPhotographyService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectPhotographyService.java @@ -58,4 +58,6 @@ public interface ISurProjectPhotographyService * @return 结果 */ public int deleteSurProjectPhotographyById(Long id); + + public List selectLastPhotography(SurProjectPhotography where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectPhotographyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectPhotographyServiceImpl.java index d37b1bc9..ee55c920 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectPhotographyServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectPhotographyServiceImpl.java @@ -92,4 +92,9 @@ public class SurProjectPhotographyServiceImpl implements ISurProjectPhotographyS { return surProjectPhotographyMapper.deleteSurProjectPhotographyById(id); } + + @Override + public List selectLastPhotography(SurProjectPhotography where) { + return surProjectPhotographyMapper.selectLastPhotography(where); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml index 47206cfb..324d79bb 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml @@ -128,4 +128,19 @@ order by a.cnt desc + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml b/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml index 25f78c1a..ef07f08b 100644 --- a/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/video/SurProjectPhotographyMapper.xml @@ -42,6 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + insert into sur_project_photography