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

update code

dev_xds
haha 2024-07-04 23:54:11 +08:00
parent 1957fcde25
commit 0915a8d283
7 changed files with 136 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/api/project/projectCommittee.js
View File

@ -35,6 +35,8 @@ export function updateProjectCommittee(data) {
})
}
// 删除工委会管理
export function delProjectCommittee(id) {
return request({

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

@ -1,92 +1,39 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="单位名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入单位名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.deptName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="验收类型" prop="dataTypeLvl1">
<el-select
v-model="queryParams.dataTypeLvl1"
placeholder="请选择验收类型"
clearable
>
<el-option
v-for="dict in dict.type.project_checking_data_type_lvl1"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="queryParams.dataTypeLvl1" placeholder="请选择验收类型" clearable>
<el-option v-for="dict in dict.type.project_checking_data_type_lvl1" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="类型分类" prop="dataTypeLvl2" v-if="queryParams.dataTypeLvl1">
<el-select
v-model="queryParams.dataTypeLvl2"
placeholder="请选择验收类型分类"
clearable
>
<el-option
v-for="dict in dict.type.project_checking_data_type_lvl2"
v-if="queryParams.dataTypeLvl1 == dict.raw.remark"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="queryParams.dataTypeLvl2" placeholder="请选择验收类型分类" clearable>
<el-option v-for="dict in dict.type.project_checking_data_type_lvl2"
v-if="queryParams.dataTypeLvl1 == dict.raw.remark" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="质量专员" prop="qualityUser">
<el-input
v-model="queryParams.qualityUser"
placeholder="请输入质量专员"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.qualityUser" placeholder="请输入质量专员" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="监理专员" prop="superviseUser">
<el-input
v-model="queryParams.superviseUser"
placeholder="请输入监理专员"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.superviseUser" placeholder="请输入监理专员" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="验收时间">
<el-date-picker
v-model="daterangeCheckingDate"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
<el-date-picker v-model="daterangeCheckingDate" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="工序部位" prop="checkWorkingPosition">
<el-input
v-model="queryParams.checkWorkingPosition"
placeholder="请输入工序部位"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.checkWorkingPosition" placeholder="请输入工序部位" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="验收结果" prop="checkResult">
<el-select
@ -103,24 +50,16 @@
</el-select>
</el-form-item> -->
<el-form-item label="审批状态" prop="approveStatus" v-if="false">
<el-select
v-model="queryParams.approveStatus"
placeholder="请选择审批状态"
clearable
>
<el-option
v-for="dict in dict.type.project_check_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable>
<el-option v-for="dict in dict.type.project_check_status" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
>搜索</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
>导出</el-button>
</el-form-item>
</el-form>
@ -176,38 +115,15 @@
<el-tabs type="card" v-model="queryParams.activeName" @tab-click="getList">
<el-tab-pane :label="tabs.all" name="all"></el-tab-pane>
<el-tab-pane :label="tabs.jxz" name="jxz"></el-tab-pane>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane
></el-tabs>
<el-table
v-loading="loading"
:data="projectCheckingList"
@selection-change="handleSelectionChange"
stripe
>
<el-tab-pane :label="tabs.ywc" name="ywc"></el-tab-pane></el-tabs>
<el-table v-loading="loading" :data="projectCheckingList" @selection-change="handleSelectionChange" stripe>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="项目名称"
align="center"
prop="projectName"
width="200"
fixed="left"
show-overflow-tooltip
/>
<el-table-column
label="单位名称"
align="center"
prop="deptName"
width="180"
show-overflow-tooltip
/>
<el-table-column label="项目名称" align="center" prop="projectName" width="200" fixed="left" show-overflow-tooltip />
<el-table-column label="单位名称" align="center" prop="deptName" width="180" show-overflow-tooltip />
<el-table-column label="验收主图" align="center" prop="mainImage" width="220">
<template slot-scope="scope">
<el-image
ref="preview"
style="width: 200px; height: 100px"
:src="getImageUrl(scope.row.mainImage)"
@click="onPreview(scope.row.imageUrls)"
></el-image>
<el-image ref="preview" style="width: 200px; height: 100px" :src="getImageUrl(scope.row.mainImage)"
@click="onPreview(scope.row.imageUrls)"></el-image>
</template>
</el-table-column>
<!-- <el-table-column
@ -228,89 +144,37 @@
/>
</template>
</el-table-column> -->
<el-table-column
label="验收类型"
align="center"
width="180"
prop="dataTypeLvl1"
>
<el-table-column label="验收类型" align="center" width="180" prop="dataTypeLvl1">
<template slot-scope="scope">
<el-select
v-model="scope.row.dataTypeLvl1"
placeholder="请选择验收类型"
style="width: 100%"
@change="setDataTypeLvl1(scope.row, $event)"
>
<el-option
v-for="dict in dict.type.project_checking_data_type_lvl1"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-select v-model="scope.row.dataTypeLvl1" placeholder="请选择验收类型" style="width: 100%"
@change="setDataTypeLvl1(scope.row, $event)">
<el-option v-for="dict in dict.type.project_checking_data_type_lvl1" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
<el-select v-model="scope.row.dataTypeLvl2" v-show="scope.row.dataTypeLvl1" placeholder="请选择类型分类"
style="width: 100%" @change="setDataTypeLvl2(scope.row, $event)">
<el-option v-for="dict in dict.type.project_checking_data_type_lvl2"
v-if="scope.row.dataTypeLvl1 == dict.raw.remark" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
<el-select
v-model="scope.row.dataTypeLvl2"
v-show="scope.row.dataTypeLvl1"
placeholder="请选择类型分类"
style="width: 100%"
@change="setDataTypeLvl2(scope.row, $event)"
>
<el-option
v-for="dict in dict.type.project_checking_data_type_lvl2"
v-if="scope.row.dataTypeLvl1 == dict.raw.remark"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
label="验收工序部位"
align="center"
prop="checkWorkingPosition"
width="180"
show-overflow-tooltip
/>
<el-table-column label="验收工序部位" align="center" prop="checkWorkingPosition" width="180" show-overflow-tooltip />
<el-table-column
label="验收描述"
align="center"
prop="intro"
width="180"
show-overflow-tooltip
/>
<el-table-column
label="质量专员"
align="left"
prop="qualityUser"
width="130"
show-overflow-tooltip
>
<el-table-column label="验收描述" align="center" prop="intro" width="180" show-overflow-tooltip />
<el-table-column label="质量专员" align="left" prop="qualityUser" width="130" show-overflow-tooltip>
<template slot-scope="scope">
<div>{{ scope.row.qualityUserName }}</div>
<div>{{ scope.row.qualityUser }}</div>
</template>
</el-table-column>
<el-table-column
label="监理专员"
align="left"
prop="superviseUser"
width="130"
show-overflow-tooltip
>
<el-table-column label="监理专员" align="left" prop="superviseUser" width="130" show-overflow-tooltip>
<template slot-scope="scope">
<div>{{ scope.row.superviseUserName }}</div>
<div>{{ scope.row.superviseUser }}</div>
</template>
</el-table-column>
<el-table-column
label="验收时间"
align="center"
prop="checkingDate"
width="100"
show-overflow-tooltip
>
<el-table-column label="验收时间" align="center" prop="checkingDate" width="100" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkingDate, "{y}-{m}-{d}") }}</span>
</template>
@ -325,10 +189,7 @@
</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"
/>
<dict-tag :options="dict.type.project_check_status" :value="scope.row.approveStatus" />
</template>
</el-table-column>
<el-table-column label="数据状态" align="center" prop="isDel">
@ -341,189 +202,81 @@
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200"
fixed="right"
>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
<template slot-scope="scope">
<el-button
v-if="scope.row.checkingFiles != null"
size="mini"
type="text"
icon="el-icon-paperclip"
@click="handledownload(scope.row)"
v-hasPermi="['project:projectChecking:list']"
>下载附件</el-button
>
<el-button
v-if="scope.row.approveStatus != null"
size="mini"
type="text"
icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)"
>审批日志</el-button
>
<el-button
v-if="scope.row.approveStatus == '1'"
size="mini"
type="text"
icon="el-icon-finished"
v-hasPermi="['project:projectChecking:approve']"
@click="handleAudit(scope.row)"
>处理审批</el-button
>
<el-button
v-if="scope.row.approveStatus != '4'"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['project:projectChecking:edit']"
>修改</el-button
>
<el-button
v-if="scope.row.approveStatus != '4'"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['project:projectChecking:remove']"
>删除</el-button
>
<el-button v-if="scope.row.checkingFiles != null" size="mini" type="text" icon="el-icon-paperclip"
@click="handledownload(scope.row)" v-hasPermi="['project:projectChecking:list']">下载附件</el-button>
<el-button v-if="scope.row.approveStatus != null" size="mini" type="text" icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)">审批日志</el-button>
<el-button v-if="scope.row.approveStatus == '1'" size="mini" type="text" icon="el-icon-finished"
v-hasPermi="['project:projectChecking:approve']" @click="handleAudit(scope.row)">处理审批</el-button>
<el-button v-if="scope.row.approveStatus != '4'" size="mini" type="text" icon="el-icon-edit"
@click="handleUpdate(scope.row)" v-hasPermi="['project:projectChecking:edit']">修改</el-button>
<el-button v-if="scope.row.approveStatus != '4'" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)" v-hasPermi="['project:projectChecking:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改项目验收对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="780px"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body :close-on-click-modal="false"
:close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="验收图片" prop="imageUrls">
<image-upload v-model="form.dataTypeLvl1" :limit="9" />
</el-form-item>
<el-form-item label="验收类型" prop="dataTypeLvl1">
<el-select
v-model="form.dataTypeLvl1"
placeholder="请选择验收类型"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.project_checking_data_type_lvl1"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-select v-model="form.dataTypeLvl1" placeholder="请选择验收类型" style="width: 100%">
<el-option v-for="dict in dict.type.project_checking_data_type_lvl1" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="类型分类" prop="dataTypeLvl2" v-if="form.dataTypeLvl1">
<el-select
v-model="form.dataTypeLvl2"
placeholder="请选择类型分类"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.project_checking_data_type_lvl2"
v-if="form.dataTypeLvl1 == dict.raw.remark"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-select v-model="form.dataTypeLvl2" placeholder="请选择类型分类" style="width: 100%">
<el-option v-for="dict in dict.type.project_checking_data_type_lvl2"
v-if="form.dataTypeLvl1 == dict.raw.remark" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="质量专员" prop="qualityUser">
<el-select
v-model="form.qualityUser"
placeholder="请选择质量专员"
filterable
style="width: 100%"
@change="selectQualityUser"
>
<el-option-group
v-for="group in deptUserData2"
:key="group.unitId + ''"
:label="group.unitName + ' [' + group.unitTypeName + '] '"
>
<el-option
v-for="item in group.userinfoList"
:key="item.phonenumber"
:label="item.nickName + ' [' + item.jobTypeName + '] '"
:value="item.phonenumber"
>
<el-select v-model="form.qualityUser" placeholder="请选择质量专员" filterable style="width: 100%"
@change="selectQualityUser">
<el-option-group v-for="group in deptUserData2" :key="group.unitId + ''"
:label="group.unitName + ' [' + group.unitTypeName + '] '">
<el-option v-for="item in group.userinfoList" :key="item.phonenumber"
:label="item.nickName + ' [' + item.jobTypeName + '] '" :value="item.phonenumber">
</el-option>
</el-option-group>
</el-select>
</el-form-item>
<el-form-item label="监理专员" prop="superviseUser">
<el-select
v-model="form.superviseUser"
placeholder="请选择监理专员"
filterable
style="width: 100%"
@change="selectSuperviseUser"
>
<el-option-group
v-for="group in deptUserData"
:key="group.unitId + ''"
:label="group.unitName + ' [' + group.unitTypeName + '] '"
>
<el-option
v-for="item in group.userinfoList"
:key="item.phonenumber"
:label="item.nickName + ' [' + item.jobTypeName + '] '"
:value="item.phonenumber"
>
<el-select v-model="form.superviseUser" placeholder="请选择监理专员" filterable style="width: 100%"
@change="selectSuperviseUser">
<el-option-group v-for="group in deptUserData" :key="group.unitId + ''"
:label="group.unitName + ' [' + group.unitTypeName + '] '">
<el-option v-for="item in group.userinfoList" :key="item.phonenumber"
:label="item.nickName + ' [' + item.jobTypeName + '] '" :value="item.phonenumber">
</el-option>
</el-option-group>
</el-select>
</el-form-item>
<el-form-item label="工序部位" prop="checkWorkingPosition">
<el-input
type="textarea"
v-model="form.checkWorkingPosition"
placeholder="请输入验收工序部位"
/>
<el-input type="textarea" v-model="form.checkWorkingPosition" placeholder="请输入验收工序部位" />
</el-form-item>
<el-form-item label="验收描述" prop="intro">
<el-input v-model="form.intro" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="验收时间" prop="checkingDate">
<el-date-picker
style="width: 100%"
v-model="form.checkingDate"
type="datetime"
placeholder="选择日期时间"
default-time="10:00:00"
value-format="yyyy-MM-dd HH:mm:ss"
>
<el-date-picker style="width: 100%" v-model="form.checkingDate" type="datetime" placeholder="选择日期时间"
default-time="10:00:00" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
<el-form-item label="验收结果" prop="checkResult" v-if="false">
<el-radio
v-model="form.checkResult"
v-for="dict in dict.type.project_checking_result"
:label="dict.value"
:key="dict.value"
border
size="small"
>{{ dict.label }}</el-radio
>
<el-radio v-model="form.checkResult" v-for="dict in dict.type.project_checking_result" :label="dict.value"
:key="dict.value" border size="small">{{ dict.label }}</el-radio>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
@ -651,12 +404,12 @@ export default {
this.getList();
},
methods: {
setDataTypeLvl1(row, val){
row.dataTypeLvl2=null;
updateProjectChecking({id:row.id,dataTypeLvl1:val,dataTypeLvl2:null});
setDataTypeLvl1(row, val) {
row.dataTypeLvl2 = null;
updateProjectChecking({ id: row.id, dataTypeLvl1: val, dataTypeLvl2: null });
},
setDataTypeLvl2(row, val){
updateProjectChecking({id:row.id,dataTypeLvl2:val});
setDataTypeLvl2(row, val) {
updateProjectChecking({ id: row.id, dataTypeLvl2: val });
},
getImageUrl(url) {
return process.env.VUE_APP_BASE_API + url + ".min.jpg";
@ -814,7 +567,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
.catch(() => { });
},
/** 导出按钮操作 */
handleExport() {

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

@ -46,6 +46,15 @@
<el-table v-loading="loading" :data="projectCommitteeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" v-if="1 == 2" />
<el-table-column label="期名" align="center" prop="committeeName" />
<el-table-column label="申请时间" align="center" prop="applicationDate">
<template slot-scope="scope">
<el-date-picker style="width:140px;"
v-model="scope.row.applicationDate" @change="doUpdateApplicationDate(scope.row)"
type="date"
placeholder="申请时间">
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="项目" align="center" prop="projectName" />
<el-table-column label="分类" align="center" prop="typeName" />
<el-table-column label="成本名称" align="center" prop="costName" />
@ -143,6 +152,13 @@ export default {
this.loading = false;
});
},
doUpdateApplicationDate(row){
updateProjectCommittee(row).then(d=>{
if(d.code==200){
this.$modal.msgSuccess("修改成功");
}
});
},
// 取消按钮
cancel() {
this.open = false;

8
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckingController.java
View File

@ -97,6 +97,14 @@ public class SurProjectCheckingController extends BaseController
surProjectChecking.setNowUser(Convert.toStr(getUserId()));
surProjectChecking.setNowUserName(getUsername());
List<SurProjectChecking> list = surProjectCheckingService.selectSurProjectCheckingList(surProjectChecking);
for(SurProjectChecking checking:list){
if("2".equals(checking.getCheckResult())){
checking.setCheckResult("不合格");
}
if("1".equals(checking.getCheckResult())){
checking.setCheckResult("合格");
}
}
ExcelUtil<SurProjectChecking> util = new ExcelUtil<SurProjectChecking>(SurProjectChecking.class);
util.exportExcel(response, list, "举牌验收数据");
}

5
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java
View File

@ -34,11 +34,9 @@ public class SurProjectChecking extends BaseEntity
private Long deptId;
/** 分包单位主键 */
@Excel(name = "分包单位主键")
private Long groupDeptId;
/** 验收类型 */
@Excel(name = "验收类型")
private String checkType;
@Excel(name = "验收大类")
@ -48,15 +46,12 @@ public class SurProjectChecking extends BaseEntity
private String dataTypeLvl2Name;
/** 验收主图 */
@Excel(name = "验收主图")
private String mainImage;
/** 图片列表 */
@Excel(name = "图片列表")
private String imageUrls;
/** 验收工序部位类型 */
@Excel(name = "验收工序部位类型")
private String workingPositionType;
/** 验收工序部位 */

13
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectWorkingCommittee.java
View File

@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
/**
* 工委会管理对象 sur_project_working_committee
*
@ -53,6 +55,17 @@ public class SurProjectWorkingCommittee extends BaseEntity
this.typeName = typeName;
}
/** 申请日期 **/
private Date applicationDate;
public Date getApplicationDate() {
return applicationDate;
}
public void setApplicationDate(Date applicationDate) {
this.applicationDate = applicationDate;
}
/** */
private Long id;

8
yanzhu-jh/src/main/resources/mapper/project/SurProjectWorkingCommitteeMapper.xml
View File

@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="committeeName" column="committeeName" />
<result property="projectName" column="projectName" />
<result property="typeName" column="typeName" />
<result property="applicationDate" column="applicationDate"/>
</resultMap>
<sql id="selectSurProjectWorkingCommitteeVo">
select id, committeeId, projectId, workingType, costName, money, remark, create_by, create_time, update_by, update_time
select id, committeeId, projectId, workingType, costName, money, remark, create_by, create_time, update_by, update_time,applicationDate
from sur_project_working_committee
</sql>
@ -62,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="applicationDate != null">applicationDate,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="committeeId != null">#{committeeId},</if>
@ -74,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="applicationDate != null">#{applicationDate},</if>
</trim>
</insert>
@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="applicationDate != null">applicationDate = #{applicationDate},</if>
</trim>
where id = #{id}
</update>
@ -135,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectByWorkingType" parameterType="SurProjectWorkingCommittee" resultMap="SurProjectWorkingCommitteeResult">
select a.id,a.costName,a.money,b.projectName remark,a.committeeid,a.workingType,a.projectId,a.create_by,a.create_time,a.update_time,c.name update_by
select a.id,a.costName,a.money,b.projectName remark,a.committeeid,a.workingType,a.projectId,a.create_by,a.create_time,a.update_time,c.name update_by,a.applicationDate
from sur_project_working_committee a,sur_project b ,base_working_committee c
where a.projectId=b.id and a.committeeid=c.id
<if test="committeeId!=null and committeeId!='0' and committeeId &gt; 0">