sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2023-09-23 16:18:50 +08:00
parent b70e4662d3
commit 5a83cc3f54
16 changed files with 113 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue
View File

@ -164,7 +164,7 @@
>下载检测报告</el-button
>
<el-button
v-if="scope.row.checkState == '1'"
v-if="scope.row.approveStatus != '4'"
size="mini"
type="text"
icon="el-icon-edit-outline"
@ -182,7 +182,7 @@
>流程日志</el-button
>
<el-button
v-if="scope.row.checkState == '1'"
v-if="scope.row.approveStatus != '4'"
size="mini"
type="text"
icon="el-icon-edit"
@ -660,6 +660,10 @@ export default {
this.$refs["form"].validate((valid) => {
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;

1
ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
View File

@ -444,6 +444,7 @@ export default {
});
this.$api.publics
.selectProjectAllUnitUser({
unitType: "4",
projectId: project.id,
})
.then((d) => {

11
ruoyi-ui/src/views/project/projectMeasure/index.vue
View File

@ -236,6 +236,11 @@
<span>{{ parseTime(scope.row.measureTime, "{y}-{m}-{d} {h}:{i}") }}</span>
</template>
</el-table-column>
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
</el-table-column>
<el-table-column
label="测量点位"
align="center"
@ -251,11 +256,6 @@
/>
</template>
</el-table-column> -->
<el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
</el-table-column>
<el-table-column
label="质量专员"
align="left"
@ -697,6 +697,7 @@ export default {
});
this.$api.publics
.selectProjectAllUnitUser({
unitType: "4",
projectId: row.projectId,
})
.then((d) => {

1
ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
View File

@ -495,6 +495,7 @@ export default {
});
this.$api.publics
.selectProjectAllUnitUser({
unitType: "4",
projectId: project.id,
})
.then((d) => {

10
ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/FlowableController.java
View File

@ -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<Map<String, Object>> list = flowBusinessKeyService.selectMyAwaitFlowTask(flowTaskEntity);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return success(list);
Map<String, Object> dataMap = surProjectAuditinfoService.findMyTask(flowTaskEntity);
redisCache.setCacheObject(key, dataMap, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return success(dataMap);
}
/**

0
ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/domain/init 100644
View File

44
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectAuditinfoController.java 100644
View File

@ -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));
}
}

13
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java
View File

@ -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

6
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectDetectionController.java
View File

@ -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));
}
/**

13
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMaterialSealController.java
View File

@ -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

13
ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectMeasureController.java
View File

@ -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

4
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAuditinfoController.java
View File

@ -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));
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java
View File

@ -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));
}

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml
View File

@ -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}, '%')
<if test='activeName == "await"'> and a.approve_status='1'</if>
<if test='activeName == "finished"'> and a.approve_status in ('3','4')</if>
<if test="businessKey != null and businessKey != ''"> and sp.id = #{businessKey}</if>

1
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
View File

@ -55,7 +55,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
<where>
and spcd.is_del='0'
<if test="id != null "> and spcd.id = #{id}</if>
<if test="projectId != null "> and spcd.project_id = #{projectId}</if>
<if test="deptId != null "> and spcd.dept_id = #{deptId}</if>
<if test="checkType != null and checkType != ''"> and spcd.check_type = #{checkType}</if>

9
yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml
View File

@ -48,11 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dept sd on sd.dept_id = spc.dept_id
<!--监理单位/总包公司/分包单位-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
<!--普通用户查询项目人员-->
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
<where>
and spc.is_del=0
<if test="id != null "> and spc.id = #{id}</if>
<if test="projectId != null "> and spc.project_id = #{projectId}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<if test="deptId != null ">
@ -80,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--监理单位/总包公司/分包单位查询当前关联数据-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and spui.unitId = #{nowDept}</if>
<!--普通用户查询项目人员-->
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.is_del=0 and (spu.user_id = #{nowUser} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName})</if>
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and (spc.create_by = #{nowUserName} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName})</if>
<if test='activeName == "jxz"'> and spc.approve_status != '4'</if>
<if test='activeName == "ywc"'> and spc.approve_status = '4'</if>
</where>
@ -93,8 +90,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dept sd on sd.dept_id = spc.dept_id
<!--监理单位/总包公司/分包单位-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if>
<!--普通用户查询项目人员-->
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> left join sur_project_userinfo spu on spu.project_id = sp.id</if>
<where>
and spc.is_del=0
<if test="projectId != null "> and spc.project_id = #{projectId}</if>
@ -121,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--监理单位/总包公司/分包单位查询当前关联数据-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> and spui.unitId = #{nowDept}</if>
<!--普通用户查询项目人员-->
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.user_id = #{nowUser} and spu.is_del=0</if>
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spc.create_by = #{nowUserName}</if>
</where>
order by checking_date desc
limit 0,10