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

提交代码

dev_xds
姜玉琦 2023-09-23 20:12:41 +08:00
parent 5a83cc3f54
commit 6914d9f362
17 changed files with 92 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@
</template>
</el-table-column>
<el-table-column
label="监理人"
label="监理专员"
align="left"
prop="witnessUser"
width="120"
@ -179,7 +179,7 @@
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>流程日志</el-button
>审批日志</el-button
>
<el-button
v-if="scope.row.approveStatus != '4'"
@ -271,10 +271,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="监理人" prop="witnessUser">
<el-form-item label="监理专员" prop="witnessUser">
<el-select
v-model="form.witnessUser"
placeholder="请选择监理人"
placeholder="请选择监理专员"
filterable
style="width: 100%"
@change="selectWitnessUser"
@ -482,7 +482,7 @@ export default {
{ required: true, message: "请选择是否提供合格证", trigger: "blur" },
],
witnessUser: [
{ required: true, message: "请选择监理单位监理人", trigger: "blur" },
{ required: true, message: "请选择监理单位监理专员", trigger: "blur" },
],
laboratoryName: [
{ required: true, message: "请输入实验室名称", trigger: "blur" },
@ -708,7 +708,7 @@ export default {
})
.catch(() => {});
},
/** 选择监理人*/
/** 选择监理专员*/
selectWitnessUser(val) {
this.deptUserData.forEach((item) => {
item.userinfoList.forEach((u) => {
@ -725,7 +725,7 @@ export default {
this.$download.resource(item);
});
},
/** 流程日志 */
/** 审批日志 */
handleAuditinfo(row) {
row.title="材料取样复试";
row.logType="1";

16
ruoyi-ui/src/views/project/checkDetection/index.vue
View File

@ -89,10 +89,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="监理人" prop="witnessUserName">
<el-form-item label="监理专员" prop="witnessUserName">
<el-input
v-model="queryParams.witnessUserName"
placeholder="请输入监理人名称"
placeholder="请输入监理专员名称"
clearable
@keyup.enter.native="handleQuery"
/>
@ -225,7 +225,7 @@
</template>
</el-table-column>
<el-table-column
label="监理人"
label="监理专员"
align="left"
prop="witnessUser"
width="140"
@ -313,7 +313,7 @@
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>流程日志</el-button
>审批日志</el-button
>
<el-button
v-if="scope.row.checkState == '1'"
@ -399,10 +399,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="监理人" prop="witnessUser">
<el-form-item label="监理专员" prop="witnessUser">
<el-select
v-model="form.witnessUser"
placeholder="请选择监理人"
placeholder="请选择监理专员"
filterable
style="width: 100%"
@change="selectWitnessUser"
@ -624,7 +624,7 @@ export default {
{ required: true, message: "请选择是否提供合格证", trigger: "blur" },
],
witnessUser: [
{ required: true, message: "请选择监理单位监理人", trigger: "blur" },
{ required: true, message: "请选择监理单位监理专员", trigger: "blur" },
],
laboratoryName: [
{ required: true, message: "请输入实验室名称", trigger: "blur" },
@ -845,7 +845,7 @@ export default {
this.$download.resource(item);
});
},
/** 流程日志 */
/** 审批日志 */
handleAuditinfo(row) {
row.title="材料取样复试";
row.logType="1";

16
ruoyi-ui/src/views/project/materialSeal/index.vue
View File

@ -95,10 +95,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="监理人" prop="witnessUser">
<el-form-item label="监理专员" prop="witnessUser">
<el-input
v-model="queryParams.witnessUser"
placeholder="请输入监理人名称/电话"
placeholder="请输入监理专员名称/电话"
clearable
@keyup.enter.native="handleQuery"
/>
@ -235,7 +235,7 @@
</template>
</el-table-column>
<el-table-column
label="监理人"
label="监理专员"
align="center"
prop="witnessUser"
width="120"
@ -298,7 +298,7 @@
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>流程日志</el-button
>审批日志</el-button
>
<el-button
v-if="scope.row.approveStatus!='4'"
@ -382,10 +382,10 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="监理人" prop="witnessUser">
<el-form-item label="监理专员" prop="witnessUser">
<el-select
v-model="form.witnessUser"
placeholder="请选择监理人"
placeholder="请选择监理专员"
filterable
style="width: 100%"
@change="selectWitnessUser"
@ -522,7 +522,7 @@ export default {
],
sealDate: [{ required: true, message: "请选择封样时间", trigger: "blur" }],
witnessUser: [
{ required: true, message: "请选择监理单位监理人", trigger: "blur" },
{ required: true, message: "请选择监理单位监理专员", trigger: "blur" },
],
signFiles: [{ required: true, message: "请上传会签单附件", trigger: "blur" }],
alterationFiles: [
@ -753,7 +753,7 @@ export default {
this.$download.resource(item);
});
},
/** 流程日志 */
/** 审批日志 */
handleAuditinfo(row) {
row.title="材料封样";
row.logType="4";

12
ruoyi-ui/src/views/project/materialSeal/projectMaterialSealDrawer.vue
View File

@ -119,7 +119,7 @@
</template>
</el-table-column>
<el-table-column
label="监理人"
label="监理专员"
align="center"
prop="witnessUser"
width="120"
@ -181,7 +181,7 @@
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>流程日志</el-button
>审批日志</el-button
>
<el-button
v-if="scope.row.approveStatus!='4'"
@ -265,10 +265,10 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="监理人" prop="witnessUser">
<el-form-item label="监理专员" prop="witnessUser">
<el-select
v-model="form.witnessUser"
placeholder="请选择监理人"
placeholder="请选择监理专员"
filterable
style="width: 100%"
@change="selectWitnessUser"
@ -370,7 +370,7 @@ export default {
],
sealDate: [{ required: true, message: "请选择封样时间", trigger: "blur" }],
witnessUser: [
{ required: true, message: "请选择监理单位监理人", trigger: "blur" },
{ required: true, message: "请选择监理单位监理专员", trigger: "blur" },
],
signFiles: [{ required: true, message: "请上传会签单附件", trigger: "blur" }],
alterationFiles: [
@ -681,7 +681,7 @@ export default {
this.$download.resource(item);
});
},
/** 流程日志 */
/** 审批日志 */
handleAuditinfo(row) {
row.title="材料封样";
row.logType="4";

4
ruoyi-ui/src/views/project/projectAuditinfo/index.vue
View File

@ -141,7 +141,7 @@
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>流程日志</el-button
>审批日志</el-button
>
</template>
</el-table-column>
@ -318,7 +318,7 @@
handleDelete(row) {},
/** 导出按钮操作 */
handleExport() {},
/** 流程日志 */
/** 审批日志 */
handleAuditinfo(row) {
row.title=row.typeName;
row.logType=row.type;

2
ruoyi-ui/src/views/project/projectAuditinfo/indexDrawer.vue
View File

@ -8,7 +8,7 @@
size="30%"
>
<template slot="title">
<div>{{ title + '流程日志' }}</div>
<div>{{ title + '审批日志' }}</div>
</template>
<div class="block" style="padding-right: 20px;">
<el-timeline>

4
ruoyi-ui/src/views/project/projectChecking/index.vue
View File

@ -279,7 +279,7 @@
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>流程日志</el-button
>审批日志</el-button
>
<el-button
v-if="scope.row.approveStatus!='4'"
@ -693,7 +693,7 @@ export default {
this.$download.resource(item);
});
},
/** 流程日志 */
/** 审批日志 */
handleAuditinfo(row) {
row.title="举牌验收";
row.logType="3";

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

@ -178,7 +178,7 @@
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>流程日志</el-button
>审批日志</el-button
>
<el-button
v-if="scope.row.approveStatus != '4'"
@ -622,7 +622,7 @@ export default {
this.$download.resource(item);
});
},
/** 流程日志 */
/** 审批日志 */
handleAuditinfo(row) {
row.title="举牌验收";
row.logType="3";

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

@ -309,7 +309,7 @@
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>流程日志</el-button
>审批日志</el-button
>
<el-button
v-if="scope.row.approveStatus != '4'"
@ -776,7 +776,7 @@ export default {
this.$download.resource(item);
});
},
/** 流程日志 */
/** 审批日志 */
handleAuditinfo(row) {
row.title="实测实量";
row.logType="2";

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

@ -187,7 +187,7 @@
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>流程日志</el-button
>审批日志</el-button
>
<el-button
v-if="scope.row.approveStatus != '4'"
@ -673,7 +673,7 @@ export default {
this.$download.resource(item);
});
},
/** 流程日志 */
/** 审批日志 */
handleAuditinfo(row) {
row.title="实测实量";
row.logType="2";

2
ruoyi-ui/src/views/trouble/sspProblemmodify/sspProblemmodifyAuditinfoDrawer.vue
View File

@ -6,7 +6,7 @@
@opened="onOpen"
@close="onClose"
style="padding-left: 40px"
title="隐患整改流程日志"
title="隐患整改审批日志"
>
<template slot="t">
<right-toolbar @queryTable="getAuditinfoList" :search="true"></right-toolbar>

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

@ -4,6 +4,7 @@ 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.domain.SurProjectAuditinfo;
import com.yanzhu.jh.project.service.ISurProjectAuditinfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -41,4 +42,13 @@ public class ProjectAuditinfoController extends BaseController {
{
return success(surProjectAuditinfoService.queryCount(flowTaskEntity));
}
/**
* 查询项目审核信息列表
*/
@GetMapping("/selectProjectAuditinfo")
public AjaxResult selectProjectAuditinfo(SurProjectAuditinfo surProjectAuditinfo)
{
return success(surProjectAuditinfoService.selectProjectAuditinfoList(surProjectAuditinfo));
}
}

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

@ -70,6 +70,17 @@ public class ProjectCheckingController extends BaseController {
return success(surProjectCheckingService.insertSurProjectChecking(surProjectChecking));
}
/**
* 修改举牌验收
* @param surProjectChecking
* @return
*/
@PostMapping("/edit")
@Log(title = "举牌验收", businessType = BusinessType.UPDATE)
public AjaxResult edit(@RequestBody SurProjectChecking surProjectChecking){
return success(surProjectCheckingService.updateSurProjectChecking(surProjectChecking));
}
/**
* 删除举牌验收
*/

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

@ -70,6 +70,17 @@ public class ProjectMaterialSealController extends BaseController {
return success(surProjectMaterialSealService.insertSurProjectMaterialSeal(surProjectMaterialSeal));
}
/**
* 修改材料封样
* @param surProjectMaterialSeal
* @return
*/
@PostMapping("/edit")
@Log(title = "材料封样", businessType = BusinessType.UPDATE)
public AjaxResult edit(@RequestBody SurProjectMaterialSeal surProjectMaterialSeal){
return success(surProjectMaterialSealService.updateSurProjectMaterialSeal(surProjectMaterialSeal));
}
/**
* 删除材料封样
*/

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

@ -76,6 +76,17 @@ public class ProjectMeasureController extends BaseController {
return success(surProjectMeasureService.insertSurProjectMeasure(surProjectMeasure));
}
/**
* 修改实测实量
* @param surProjectMeasure
* @return
*/
@PostMapping("/edit")
@Log(title = "实测实量", businessType = BusinessType.UPDATE)
public AjaxResult edit(@RequestBody SurProjectMeasure surProjectMeasure){
return success(surProjectMeasureService.updateSurProjectMeasure(surProjectMeasure));
}
/**
* 删除实测实量
*/

11
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java
View File

@ -86,9 +86,6 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete
@Transactional
public int updateSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection)
{
if(surProjectCheckDetection.getUpdateBy()==null){
surProjectCheckDetection.setUpdateBy(SecurityUtils.getUsername());
}
//操作日志
if(StringUtils.isNotBlank(surProjectCheckDetection.getApproveStatus())){
@ -102,9 +99,15 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete
surProjectAuditinfo.setCreateBy(surProjectCheckDetection.getUpdateBy());
surProjectAuditinfo.setCreateTime(new Date());
surProjectAuditinfoMapper.insertSurProjectAuditinfo(surProjectAuditinfo);
}else{
// 非提交时保存最后修改人
if(surProjectCheckDetection.getUpdateBy()==null){
surProjectCheckDetection.setUpdateBy(SecurityUtils.getUsername());
}
surProjectCheckDetection.setUpdateTime(DateUtils.getNowDate());
}
surProjectCheckDetection.setUpdateTime(DateUtils.getNowDate());
return surProjectCheckDetectionMapper.updateSurProjectCheckDetection(surProjectCheckDetection);
}

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

@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectMyAwaitFlowTask" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="map">
select a.id,sp.id as projectId,sp.projectName,a.approve_status,a.type,a.typeName,u.nick_name,d.dept_name,a.create_time,a.witness_user
select a.id,sp.id as projectId,sp.projectName,a.approve_status,a.type,a.typeName,u.nick_name,d.dept_name,DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%i') as create_time,a.witness_user
from vw_project_audit_all a
left join sur_project sp on sp.id = a.project_id
left JOIN sys_user u on a.create_by = u.user_name