diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue index 5c08be35..381944aa 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue @@ -173,7 +173,7 @@ /> diff --git a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue index 37f6c5e4..662a9b3a 100644 --- a/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue +++ b/ruoyi-ui/src/views/flowable/task/myProcess/initTaskDrawer.vue @@ -167,7 +167,7 @@ /> diff --git a/ruoyi-ui/src/views/project/projectFunVerify/index.vue b/ruoyi-ui/src/views/project/projectFunVerify/index.vue index 73710754..ef300042 100644 --- a/ruoyi-ui/src/views/project/projectFunVerify/index.vue +++ b/ruoyi-ui/src/views/project/projectFunVerify/index.vue @@ -271,7 +271,7 @@ size="mini" type="text" icon="el-icon-paperclip" - @click="handledownload(scope.row)" + @click="handleDownload(scope.row)" v-hasPermi="['project:projectFunVerify:list']" >下载附件 @@ -302,7 +302,6 @@ >修改 { + row.checkFiles.split(",").forEach((item) => { this.$download.resource(item); }); }, diff --git a/ruoyi-ui/src/views/project/projectFunVerify/projectFunVerifyDrawer.vue b/ruoyi-ui/src/views/project/projectFunVerify/projectFunVerifyDrawer.vue index 4ae1483f..58db91f7 100644 --- a/ruoyi-ui/src/views/project/projectFunVerify/projectFunVerifyDrawer.vue +++ b/ruoyi-ui/src/views/project/projectFunVerify/projectFunVerifyDrawer.vue @@ -213,7 +213,6 @@ >修改 > dataList = surProjectCheckingService.findStatisticsByProjectId(projectId); + redisCache.setCacheObject(key, dataList, 30, TimeUnit.SECONDS); + return success(dataList); + } + + /** + * 根据项目统计举牌验收详情 + * @param projectId + * @return + */ + @GetMapping("/findStatisticsInfosByProjectId") + public AjaxResult findStatisticsInfosByProjectId(Long projectId){ + //设置缓存 + String key="wechat_projectchecking_findStatisticsInfosByProjectId_"+projectId; + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + List> dataList = surProjectCheckingService.findStatisticsInfosByProjectId(projectId); + redisCache.setCacheObject(key, dataList, 30, TimeUnit.SECONDS); + return success(dataList); } /** diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java index 0653dd41..7f22335e 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectTrainController.java @@ -1,8 +1,10 @@ package com.ruoyi.web.project.controller; import com.ruoyi.common.annotation.Log; +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.redis.RedisCache; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DictUtils; import com.ruoyi.system.service.ISysDictDataService; @@ -13,6 +15,10 @@ import com.yanzhu.jh.work.service.IWorkTrainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + /** * @version : V1.0 * @ClassName: ProjectTrainController @@ -25,7 +31,7 @@ import org.springframework.web.bind.annotation.*; public class ProjectTrainController extends BaseController { @Autowired - private ISysDictDataService sysDictDataService; + private RedisCache redisCache; @Autowired private IWorkTrainService workTrainService; @@ -117,6 +123,24 @@ public class ProjectTrainController extends BaseController { return success(workTrainService.findGroupCountByProjectId(projectId)); } + /** + * 根据项目分组查询统计 + * @param workTrain + * @return + */ + @GetMapping("/selectGroupCountByProjectIdV2") + public AjaxResult selectGroupCountByProjectIdV2(WorkTrain workTrain){ + //设置缓存 + String key="wechat_projectTrain_selectGroupCountByProjectIdV2_"+workTrain.getProjectId()+"_"+workTrain.getTrainType(); + Object obj=redisCache.getCacheObject(key); + if(obj!=null){ + return success(obj); + } + List> dataList = workTrainService.findGroupCountByProjectIdV2(workTrain); + redisCache.setCacheObject(key, dataList, 30, TimeUnit.SECONDS); + return success(dataList); + } + /** * 查询演训类型 * @return diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java index 6949b317..08e4e672 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCheckingMapper.java @@ -89,6 +89,14 @@ public interface SurProjectCheckingMapper */ public List> findStatisticsByProjectId(Long projectId); + /** + * 根据项目统计项目验收详情 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findStatisticsInfosByProjectId(Long projectId); + public List playVideo(SurProjectChecking where); List selectProjectCheckingGroupFoChart(SurProjectChecking surProjectChecking); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java index ca384ba8..b8667335 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCheckingService.java @@ -101,6 +101,14 @@ public interface ISurProjectCheckingService */ public List> findStatisticsByProjectId(Long projectId); + /** + * 根据项目统计项目验收详情 + * + * @param projectId 项目主键 + * @return 结果 + */ + public List> findStatisticsInfosByProjectId(Long projectId); + /** * 根据验收类型2级分组查询，用于大屏质量管理-举牌验收图表 * @param surProjectChecking diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java index 09be0459..a8d91d77 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java @@ -253,6 +253,17 @@ public class SurProjectCheckingServiceImpl extends WeChatMessageServiceImpl impl return surProjectCheckingMapper.findStatisticsByProjectId(projectId); } + /** + * 根据项目统计项目验收详情 + * + * @param projectId 项目主键 + * @return 结果 + */ + @Override + public List> findStatisticsInfosByProjectId(Long projectId){ + return surProjectCheckingMapper.findStatisticsInfosByProjectId(projectId); + } + @Override public List getProjectCheckingGroupFoChart(SurProjectChecking surProjectChecking) { return surProjectCheckingMapper.selectProjectCheckingGroupFoChart(surProjectChecking); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java index 6378cf1c..8035f10c 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/mapper/WorkTrainMapper.java @@ -119,6 +119,14 @@ public interface WorkTrainMapper */ public List> findGroupCountByProjectId(Long projectId); + /** + * 根据项目统计教育培训 + * + * @param workTrain 教育培训 + * @return 结果 + */ + public List> findGroupCountByProjectIdV2(WorkTrain workTrain); + public List getGroupByDataType(WorkTrain workTrain); public List queryWorkTrainList(WorkTrain where); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java index b8f2397d..a04fa8b0 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/IWorkTrainService.java @@ -101,6 +101,14 @@ public interface IWorkTrainService */ public List> findGroupCountByProjectId(Long projectId); + /** + * 根据项目统计教育培训 + * + * @param workTrain 教育培训 + * @return 结果 + */ + public List> findGroupCountByProjectIdV2(WorkTrain workTrain); + public List getGroupByDataType(WorkTrain workTrain); public List queryWorkTrainList(WorkTrain where); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java index ae7611b4..ac761d4e 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/service/impl/WorkTrainServiceImpl.java @@ -227,6 +227,17 @@ public class WorkTrainServiceImpl implements IWorkTrainService return workTrainMapper.findGroupCountByProjectId(projectId); } + /** + * 根据项目统计教育培训 + * + * @param workTrain 教育培训 + * @return 结果 + */ + @Override + public List> findGroupCountByProjectIdV2(WorkTrain workTrain){ + return workTrainMapper.findGroupCountByProjectIdV2(workTrain); + } + @Override public List getGroupByDataType(WorkTrain workTrain) { return workTrainMapper.getGroupByDataType(workTrain); diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml index 2cec6718..6ea9f115 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml @@ -221,31 +221,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + insert into sur_project_checking diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml index 03020caf..5b89bc61 100644 --- a/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml @@ -163,6 +163,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY wt.train_type + + insert into work_train