diff --git a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue index f5afd602..86b7404a 100644 --- a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue +++ b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue @@ -164,7 +164,7 @@ >下载检测报告 流程日志 { if (valid) { if (this.form.id != null) { + //已经上传过检测结果时，修改重新发起提交申请 + if(this.form.checkState=="2"){ + this.resultform.approveStatus = "1"; + } updateCheckDetection(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); this.open = false; diff --git a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue index 211a5390..0bacaa5e 100644 --- a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue +++ b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue @@ -444,6 +444,7 @@ export default { }); this.$api.publics .selectProjectAllUnitUser({ + unitType: "4", projectId: project.id, }) .then((d) => { diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue index 59d1faa2..8bb80981 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/index.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue @@ -236,6 +236,11 @@ {{ parseTime(scope.row.measureTime, "{y}-{m}-{d} {h}:{i}") }} + + + --> - - - { diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue index 79f29dda..f145959b 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue @@ -495,6 +495,7 @@ export default { }); this.$api.publics .selectProjectAllUnitUser({ + unitType: "4", projectId: project.id, }) .then((d) => { diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java index 1821726e..1feca2b9 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java @@ -18,6 +18,7 @@ import com.ruoyi.flowable.service.IFlowInstanceService; import com.ruoyi.flowable.service.IFlowTaskService; import com.ruoyi.system.domain.FlowTaskEntity; import com.ruoyi.system.service.ISysUserService; +import com.yanzhu.jh.project.service.ISurProjectAuditinfoService; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; @@ -53,6 +54,9 @@ public class FlowableController extends BaseController { @Autowired IFlowInstanceService flowInstanceService; + @Autowired + ISurProjectAuditinfoService surProjectAuditinfoService; + @Autowired private IFlowBusinessKeyService flowBusinessKeyService; @@ -218,9 +222,9 @@ public class FlowableController extends BaseController { } //这里不分页，这里实时查询用户角色 flowTaskEntity.setRoleIds(sysUserService.selectUserRoles(flowTaskEntity.getNowUserName())); - List> list = flowBusinessKeyService.selectMyAwaitFlowTask(flowTaskEntity); - redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); - return success(list); + Map dataMap = surProjectAuditinfoService.findMyTask(flowTaskEntity); + redisCache.setCacheObject(key, dataMap, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES); + return success(dataMap); } /** diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/domain/init b/ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/domain/init new file mode 100644 index 00000000..e69de29b diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectAuditinfoController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectAuditinfoController.java new file mode 100644 index 00000000..be81bce3 --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectAuditinfoController.java @@ -0,0 +1,44 @@ +package com.ruoyi.web.project.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.system.domain.FlowTaskEntity; +import com.yanzhu.jh.project.service.ISurProjectAuditinfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @version : V1.0 + * @ClassName: ProjectAuditinfoController + * @Description: 项目审批管理 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/projectAuditinfo") +public class ProjectAuditinfoController extends BaseController { + + @Autowired + private ISurProjectAuditinfoService surProjectAuditinfoService; + + /** + * 查询项目审核信息列表 + */ + @GetMapping("/findList") + public AjaxResult findList(FlowTaskEntity flowTaskEntity) + { + return success(surProjectAuditinfoService.selectMyAwaitFlowTask(flowTaskEntity)); + } + + /** + * 统计审核信息 + */ + @GetMapping("/findAuditCount") + public AjaxResult findAuditCount(FlowTaskEntity flowTaskEntity) + { + return success(surProjectAuditinfoService.queryCount(flowTaskEntity)); + } +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java index 3c42a398..74db0197 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java @@ -36,6 +36,19 @@ public class ProjectCheckingController extends BaseController { return success(surProjectCheckingService.selectSurProjectCheckingList(surProjectChecking)); } + /** + * 统计举牌验收 + * @param surProjectChecking + * @return + */ + @GetMapping("/findGroupCountByApprove") + public AjaxResult findGroupCountByApprove(SurProjectChecking surProjectChecking){ + if(surProjectChecking.getDeptId()==0){ + surProjectChecking.setDeptId(null); + } + return success(surProjectCheckingService.findGroupCountByApprove(surProjectChecking)); + } + /** * 查询举牌验收详情 * @param id diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java index 8c911189..5eb3e8e5 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java @@ -47,12 +47,12 @@ public class ProjectDetectionController extends BaseController { * @param surProjectCheckDetection * @return */ - @GetMapping("/queryCount") - public AjaxResult queryCount(SurProjectCheckDetection surProjectCheckDetection){ + @GetMapping("/findGroupCountByApprove") + public AjaxResult findGroupCountByApprove(SurProjectCheckDetection surProjectCheckDetection){ if(surProjectCheckDetection.getDeptId()==0){ surProjectCheckDetection.setDeptId(null); } - return success(surProjectCheckDetectionService.queryGroupCount(surProjectCheckDetection)); + return success(surProjectCheckDetectionService.findGroupCountByApprove(surProjectCheckDetection)); } /** diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java index 89f79cbd..f1188747 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java @@ -36,6 +36,19 @@ public class ProjectMaterialSealController extends BaseController { return success(surProjectMaterialSealService.selectSurProjectMaterialSealList(surProjectMaterialSeal)); } + /** + * 统计材料封样 + * @param surProjectMaterialSeal + * @return + */ + @GetMapping("/findGroupCountByApprove") + public AjaxResult findGroupCountByApprove(SurProjectMaterialSeal surProjectMaterialSeal){ + if(surProjectMaterialSeal.getDeptId()==0){ + surProjectMaterialSeal.setDeptId(null); + } + return success(surProjectMaterialSealService.findGroupCountByApprove(surProjectMaterialSeal)); + } + /** * 查询材料封样详情 * @param id diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java index af7d90c0..b8229a3c 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java @@ -42,6 +42,19 @@ public class ProjectMeasureController extends BaseController { return success(surProjectMeasureService.selectSurProjectMeasureList(surProjectMeasure)); } + /** + * 统计实测实量 + * @param surProjectMeasure + * @return + */ + @GetMapping("/findGroupCountByApprove") + public AjaxResult findGroupCountByApprove(SurProjectMeasure surProjectMeasure){ + if(surProjectMeasure.getDeptId()==0){ + surProjectMeasure.setDeptId(null); + } + return success(surProjectMeasureService.findGroupCountByApprove(surProjectMeasure)); + } + /** * 查询实测实量详情 * @param id diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAuditinfoController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAuditinfoController.java index 0b8b6e56..2f376587 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAuditinfoController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAuditinfoController.java @@ -56,7 +56,7 @@ public class SurProjectAuditinfoController extends BaseController public TableDataInfo findList(FlowTaskEntity flowTaskEntity) { startPage(); - flowTaskEntity.setAssigneeName(getUsername()); + flowTaskEntity.setNowUserName(getUsername()); return getDataTable(surProjectAuditinfoService.selectMyAwaitFlowTask(flowTaskEntity)); } @@ -67,7 +67,7 @@ public class SurProjectAuditinfoController extends BaseController @GetMapping("/findAuditCount") public AjaxResult findAuditCount(FlowTaskEntity flowTaskEntity) { - flowTaskEntity.setAssigneeName(getUsername()); + flowTaskEntity.setNowUserName(getUsername()); return success(surProjectAuditinfoService.queryCount(flowTaskEntity)); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java index bb61be34..b10c43c0 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java @@ -185,7 +185,7 @@ PublicsController extends BaseController { } flowTaskEntity.setNowUser(Convert.toStr(SecurityUtils.getUserId())); flowTaskEntity.setRoleIds(SecurityUtils.getLoginUser().getUser().getRoles().stream().map(role -> role.getRoleId()).collect(Collectors.toList())); - flowTaskEntity.setAssigneeName(getUsername()); + flowTaskEntity.setNowUserName(getUsername()); flowTaskEntity.setActiveName("await"); return success(surProjectAuditinfoService.findMyTask(flowTaskEntity)); } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml index e046191a..de8491d2 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml @@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sur_project sp on sp.id = a.project_id left JOIN sys_user u on a.create_by = u.user_name left JOIN sys_dept d on d.dept_id = u.dept_id - where a.witness_user like concat('%', #{assigneeName}, '%') + where a.witness_user like concat('%', #{nowUserName}, '%') and a.approve_status='1' and a.approve_status in ('3','4') and sp.id = #{businessKey} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml index ae6ac833..1888fa8f 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml @@ -55,7 +55,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sur_project_userinfo spu on spu.project_id = sp.id and spcd.is_del='0' - and spcd.id = #{id} and spcd.project_id = #{projectId} and spcd.dept_id = #{deptId} and spcd.check_type = #{checkType} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml index b6887c72..ec65ae89 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml @@ -48,11 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept sd on sd.dept_id = spc.dept_id left join sur_project_unit_info spui on spui.projectId = sp.id - - left join sur_project_userinfo spu on spu.project_id = sp.id and spc.is_del=0 - and spc.id = #{id} and spc.project_id = #{projectId} and sp.projectName like concat('%', #{projectName}, '%') @@ -80,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spui.unitId = #{nowDept} - and spu.is_del=0 and (spu.user_id = #{nowUser} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName}) + and (spc.create_by = #{nowUserName} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName}) and spc.approve_status != '4' and spc.approve_status = '4' @@ -93,8 +90,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept sd on sd.dept_id = spc.dept_id left join sur_project_unit_info spui on spui.projectId = sp.id - - left join sur_project_userinfo spu on spu.project_id = sp.id and spc.is_del=0 and spc.project_id = #{projectId} @@ -121,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spui.unitId = #{nowDept} - and spu.user_id = #{nowUser} and spu.is_del=0 + and spc.create_by = #{nowUserName} order by checking_date desc limit 0,10