diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/config/MyDefaultProcessDiagramCanvas.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/config/MyDefaultProcessDiagramCanvas.java index 974cbc4e..0d1a6d1c 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/config/MyDefaultProcessDiagramCanvas.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/config/MyDefaultProcessDiagramCanvas.java @@ -1,6 +1,5 @@ package com.ruoyi.flowable.config; -import com.sun.prism.paint.Color; import org.flowable.bpmn.model.AssociationDirection; import org.flowable.image.impl.DefaultProcessDiagramCanvas; diff --git a/ruoyi-ui/src/views/project/projectPlan/index copy.vue b/ruoyi-ui/src/views/project/projectPlan/index copy.vue new file mode 100644 index 00000000..295eb1ff --- /dev/null +++ b/ruoyi-ui/src/views/project/projectPlan/index copy.vue @@ -0,0 +1,360 @@ + + + diff --git a/ruoyi-ui/src/views/project/projectPlan/index.vue b/ruoyi-ui/src/views/project/projectPlan/index.vue index 2482f43c..6b3d5ceb 100644 --- a/ruoyi-ui/src/views/project/projectPlan/index.vue +++ b/ruoyi-ui/src/views/project/projectPlan/index.vue @@ -37,7 +37,7 @@ - list = surProjectPlanService.selectSurProjectPlanList(where); + redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return AjaxResult.success(list); + } + + @GetMapping("/listAllTop3") + public AjaxResult listAllTop3(){ + String key="bgscreen_projectPlan_listAll_"; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return AjaxResult.success(obj); + } + + List list = surProjectPlanService.selectSurProjectPlanListTop3(); + 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/ProjectQuarterlyAssessController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java index ab8e6268..27a6bf89 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java @@ -49,7 +49,7 @@ public class ProjectQuarterlyAssessController extends BaseController { */ @PostMapping("/queryByProjectType") public AjaxResult queryByProjectType(@RequestBody SmzProjectQuarterlyAssess where){ - String key="bgscreen_asscess_queryByProjectType_"+where.getId()+"_"+where.getYear()+"_"+where.getQuarterly(); + String key="bgscreen_asscess_queryByProjectType_"+where.getId()+"_"+where.getYear()+"_"+where.getQuarterly()+"-"+where.getDeptId(); Object obj=redisCache.getCacheObject(key); if(obj!=null){ return AjaxResult.success(obj); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java index 5a63bbb5..948649fc 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectScheduleController.java @@ -4,6 +4,7 @@ import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisCache; import com.yanzhu.jh.project.domain.SurProjectSchedule; +import com.yanzhu.jh.project.domain.vo.SurProjectScheduleWhere; import com.yanzhu.jh.project.service.ISurProjectScheduleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -33,13 +34,16 @@ public class ProjectScheduleController { * @return */ @GetMapping("/selectByProjectType") - public AjaxResult selectByProjectType(Long type){ - String key="bgscreen_schedule_selectByProjectType_"+type; + public AjaxResult selectByProjectType(Long type,Long deptId){ + String key="bgscreen_schedule_selectByProjectType_"+type+"_"+deptId; Object obj=redisCache.getCacheObject(key); if(obj!=null){ return AjaxResult.success(obj); } - List list=isurProjectScheduleService.selectByProjectType(type); + SurProjectScheduleWhere where =new SurProjectScheduleWhere(); + where.setPrjType(type); + where.setDeptId(deptId); + List list=isurProjectScheduleService.selectByProjectType(where); redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); return AjaxResult.success(list); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/SurProjectScheduleWhere.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/SurProjectScheduleWhere.java new file mode 100644 index 00000000..fa89fe6c --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/SurProjectScheduleWhere.java @@ -0,0 +1,26 @@ +package com.yanzhu.jh.project.domain.vo; + +import com.yanzhu.jh.project.domain.SurProjectSchedule; + +public class SurProjectScheduleWhere extends SurProjectSchedule { + private long deptId; + private long prjType; + + public long getPrjType() { + return prjType; + } + + public void setPrjType(long prjType) { + this.prjType = prjType; + } + + public long getDeptId() { + return deptId; + } + + public void setDeptId(long deptId) { + this.deptId = deptId; + } + + +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java index f23f6d89..f6f1564f 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java @@ -58,4 +58,6 @@ public interface SurProjectPlanMapper * @return 结果 */ public int deleteSurProjectPlanByIds(Long[] ids); + + public List selectSurProjectPlanListTop3(); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java index 98f778cf..8cbe9c70 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectScheduleMapper.java @@ -2,6 +2,7 @@ package com.yanzhu.jh.project.mapper; import java.util.List; import com.yanzhu.jh.project.domain.SurProjectSchedule; +import com.yanzhu.jh.project.domain.vo.SurProjectScheduleWhere; /** * 形象进度Mapper接口 @@ -66,5 +67,5 @@ public interface SurProjectScheduleMapper * @param type * @return */ - public List selectByProjectType(Long type); + public List selectByProjectType(SurProjectScheduleWhere where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectPlanService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectPlanService.java index d35cf8e8..a9f5e4c5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectPlanService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectPlanService.java @@ -64,4 +64,6 @@ public interface ISurProjectPlanService public int importUrbanPlan(List list); public int importMajorPlan(List list); + + public List selectSurProjectPlanListTop3(); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java index e60604f5..7c582c42 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectScheduleService.java @@ -2,6 +2,7 @@ package com.yanzhu.jh.project.service; import java.util.List; import com.yanzhu.jh.project.domain.SurProjectSchedule; +import com.yanzhu.jh.project.domain.vo.SurProjectScheduleWhere; /** * 形象进度Service接口 @@ -65,5 +66,5 @@ public interface ISurProjectScheduleService * @param type * @return */ - public List selectByProjectType(Long type); + public List selectByProjectType(SurProjectScheduleWhere where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectPlanServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectPlanServiceImpl.java index 43d959da..fcff9ce7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectPlanServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectPlanServiceImpl.java @@ -109,14 +109,17 @@ public class SurProjectPlanServiceImpl implements ISurProjectPlanService if(i selectSurProjectPlanListTop3() { + return surProjectPlanMapper.selectSurProjectPlanListTop3(); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java index 3ef90a0f..d6167b4b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.yanzhu.jh.project.domain.SurProject; +import com.yanzhu.jh.project.domain.vo.SurProjectScheduleWhere; import com.yanzhu.jh.project.mapper.SurProjectMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -118,7 +119,7 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService * @return */ @Override - public List selectByProjectType(Long type) { - return surProjectScheduleMapper.selectByProjectType(type); + public List selectByProjectType(SurProjectScheduleWhere where) { + return surProjectScheduleMapper.selectByProjectType(where); } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml index 80a82810..8a72d94e 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml @@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT p.id, p.projectName,p.projectSchedule,a.plan_target FROM sur_project p LEFT JOIN smz_project_quarterly_assess a ON a.project_id=p.id WHERE p.projecttype=#{id} AND a.year=#{year} AND a.quarterly=#{quarterly} AND p.isdel=0 + and p.deptId=#{deptId} order by p.projectSort + SELECT * FROM ( + SELECT * FROM sur_project_plan WHERE IF(is_del,is_del,0)=0 AND plan_type=0 LIMIT 0,3 ) a + UNION + SELECT * FROM ( + SELECT * FROM sur_project_plan WHERE IF(is_del,is_del,0)=0 AND plan_type=1 LIMIT 0,3 ) b + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml index 375556ea..f0a2cabd 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml @@ -174,12 +174,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select * from vw_sur_project_schedule WHERE id IN ( SELECT MAX(id) FROM sur_project_schedule WHERE project_id IN ( - SELECT id FROM sur_project WHERE isdel=0 AND projecttype=#{type} ) AND IF(is_del IS NULL ,0,is_del)=0 + SELECT id FROM sur_project WHERE + isdel=0 AND projecttype=#{prjType} + and deptId=#{deptId} + ) AND IF(is_del IS NULL ,0,is_del)=0 GROUP BY project_id ) order by projectSort