Skip to content

P
precision-effect
Commit 2d864fe7 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

项目维护字段修改

parent 97bb27f5
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 44 deletions
precision-effect-system/src/main/java/com/zehong/system/domain/TTransactionProject.java
View file @ 2d864fe7
package com.zehong.system.domain; package com.zehong.system.domain;
import java.math.BigDecimal;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel; import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity; import com.zehong.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
/** /**
* 交易项目对象 t_transaction_project * 交易项目对象 t_transaction_project
...@@ -23,13 +23,25 @@ public class TTransactionProject extends BaseEntity ...@@ -23,13 +23,25 @@ public class TTransactionProject extends BaseEntity
@Excel(name = "交易项目名称") @Excel(name = "交易项目名称")
private String transactionProjectName; private String transactionProjectName;
/** 交易细项名称 */ /** 职责项明细说明 */
@Excel(name = "交易细项名称") @Excel(name = "职责项明细说明")
private String transactionItemName; private String dutyDetailDescribe;
/** 内容 */ /** 工作结果的形式 */
@Excel(name = "内容") @Excel(name = "工作结果的形式")
private String context; private String workResultStyle;
/** 工作结果的时量/数量标准与交付方式/地址 */
@Excel(name = "工作结果的时量/数量标准与交付方式/地址")
private String workResultDetail;
/** 工作结果的质量验收标准与方式 */
@Excel(name = "工作结果的质量验收标准与方式")
private String workResultMethod;
/** 职责定价与支付时间和方式 */
@Excel(name = "职责定价与支付时间和方式")
private String dutyMethod;
/** 定价类型：1.单价 2.议价 */ /** 定价类型：1.单价 2.议价 */
@Excel(name = "定价类型：1定价 2议价") @Excel(name = "定价类型：1定价 2议价")
...@@ -67,23 +79,50 @@ public class TTransactionProject extends BaseEntity ...@@ -67,23 +79,50 @@ public class TTransactionProject extends BaseEntity
{ {
return transactionProjectName; return transactionProjectName;
} }
public void setTransactionItemName(String transactionItemName) public void setDutyDetailDescribe(String dutyDetailDescribe)
{
this.dutyDetailDescribe = dutyDetailDescribe;
}
public String getDutyDetailDescribe()
{
return dutyDetailDescribe;
}
public void setWorkResultStyle(String workResultStyle)
{
this.workResultStyle = workResultStyle;
}
public String getWorkResultStyle()
{
return workResultStyle;
}
public void setWorkResultDetail(String workResultDetail)
{
this.workResultDetail = workResultDetail;
}
public String getWorkResultDetail()
{
return workResultDetail;
}
public void setWorkResultMethod(String workResultMethod)
{ {
this.transactionItemName = transactionItemName; this.workResultMethod = workResultMethod;
} }
public String getTransactionItemName() public String getWorkResultMethod()
{ {
return transactionItemName; return workResultMethod;
} }
public void setContext(String context) public void setDutyMethod(String dutyMethod)
{ {
this.context = context; this.dutyMethod = dutyMethod;
} }
public String getContext() public String getDutyMethod()
{ {
return context; return dutyMethod;
} }
public void setPriceType(String priceType) public void setPriceType(String priceType)
{ {
...@@ -135,8 +174,11 @@ public class TTransactionProject extends BaseEntity ...@@ -135,8 +174,11 @@ public class TTransactionProject extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("transactionProjectId", getTransactionProjectId()) .append("transactionProjectId", getTransactionProjectId())
.append("transactionProjectName", getTransactionProjectName()) .append("transactionProjectName", getTransactionProjectName())
.append("transactionItemName", getTransactionItemName()) .append("dutyDetailDescribe", getDutyDetailDescribe())
.append("context", getContext()) .append("workResultStyle", getWorkResultStyle())
.append("workResultDetail", getWorkResultDetail())
.append("workResultMethod", getWorkResultMethod())
.append("dutyMethod", getDutyMethod())
.append("priceType", getPriceType()) .append("priceType", getPriceType())
.append("price", getPrice()) .append("price", getPrice())
.append("deptId", getDeptId()) .append("deptId", getDeptId())
......
precision-effect-system/src/main/resources/mapper/business/TTransactionProjectMapper.xml
View file @ 2d864fe7
...@@ -7,8 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -7,8 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TTransactionProject" id="TTransactionProjectResult"> <resultMap type="TTransactionProject" id="TTransactionProjectResult">
<result property="transactionProjectId" column="transaction_project_id" /> <result property="transactionProjectId" column="transaction_project_id" />
<result property="transactionProjectName" column="transaction_project_name" /> <result property="transactionProjectName" column="transaction_project_name" />
<result property="transactionItemName" column="transaction_item_name" /> <result property="dutyDetailDescribe" column="duty_detail_describe" />
<result property="context" column="context" /> <result property="workResultStyle" column="work_result_style" />
<result property="workResultDetail" column="work_result_detail" />
<result property="workResultMethod" column="work_result_method" />
<result property="dutyMethod" column="duty_method" />
<result property="priceType" column="price_type" /> <result property="priceType" column="price_type" />
<result property="price" column="price" /> <result property="price" column="price" />
<result property="deptId" column="deptId" /> <result property="deptId" column="deptId" />
...@@ -20,15 +23,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -20,15 +23,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTTransactionProjectVo"> <sql id="selectTTransactionProjectVo">
select transaction_project_id, transaction_project_name, transaction_item_name, context, price_type, price, dept_id AS deptId, create_time, update_time, is_del, remark,(SELECT dept.dept_name FROM sys_dept dept WHERE dept.dept_id = deptId)AS dept_name from t_transaction_project select transaction_project_id, transaction_project_name, duty_detail_describe, work_result_style, work_result_detail, work_result_method, duty_method, price_type, price, dept_id AS deptId, create_time, update_time, is_del, remark,(SELECT dept.dept_name FROM sys_dept dept WHERE dept.dept_id = deptId)AS dept_name from t_transaction_project
</sql> </sql>
<select id="selectTTransactionProjectList" parameterType="TTransactionProject" resultMap="TTransactionProjectResult"> <select id="selectTTransactionProjectList" parameterType="TTransactionProject" resultMap="TTransactionProjectResult">
<include refid="selectTTransactionProjectVo"/> <include refid="selectTTransactionProjectVo"/>
<where> <where>
<if test="transactionProjectName != null and transactionProjectName != ''"> and transaction_project_name like concat('%', #{transactionProjectName}, '%')</if> <if test="transactionProjectName != null and transactionProjectName != ''"> and transaction_project_name like concat('%', #{transactionProjectName}, '%')</if>
<if test="transactionItemName != null and transactionItemName != ''"> and transaction_item_name like concat('%', #{transactionItemName}, '%')</if> <if test="dutyDetailDescribe != null and dutyDetailDescribe != ''"> and duty_detail_describe = #{dutyDetailDescribe}</if>
<if test="context != null and context != ''"> and context = #{context}</if> <if test="workResultStyle != null and workResultStyle != ''"> and work_result_style = #{workResultStyle}</if>
<if test="workResultDetail != null and workResultDetail != ''"> and work_result_detail = #{workResultDetail}</if>
<if test="workResultMethod != null and workResultMethod != ''"> and work_result_method = #{workResultMethod}</if>
<if test="dutyMethod != null and dutyMethod != ''"> and duty_method = #{dutyMethod}</if>
<if test="priceType != null and priceType != ''"> and price_type = #{priceType}</if> <if test="priceType != null and priceType != ''"> and price_type = #{priceType}</if>
<if test="price != null "> and price = #{price}</if> <if test="price != null "> and price = #{price}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if> <if test="deptId != null "> and dept_id = #{deptId}</if>
...@@ -51,8 +57,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -51,8 +57,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into t_transaction_project insert into t_transaction_project
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="transactionProjectName != null">transaction_project_name,</if> <if test="transactionProjectName != null">transaction_project_name,</if>
<if test="transactionItemName != null">transaction_item_name,</if> <if test="dutyDetailDescribe != null">duty_detail_describe,</if>
<if test="context != null">context,</if> <if test="workResultStyle != null">work_result_style,</if>
<if test="workResultDetail != null">work_result_detail,</if>
<if test="workResultMethod != null">work_result_method,</if>
<if test="dutyMethod != null">duty_method,</if>
<if test="priceType != null">price_type,</if> <if test="priceType != null">price_type,</if>
<if test="price != null">price,</if> <if test="price != null">price,</if>
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
...@@ -63,8 +72,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -63,8 +72,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="transactionProjectName != null">#{transactionProjectName},</if> <if test="transactionProjectName != null">#{transactionProjectName},</if>
<if test="transactionItemName != null">#{transactionItemName},</if> <if test="dutyDetailDescribe != null">#{dutyDetailDescribe},</if>
<if test="context != null">#{context},</if> <if test="workResultStyle != null">#{workResultStyle},</if>
<if test="workResultDetail != null">#{workResultDetail},</if>
<if test="workResultMethod != null">#{workResultMethod},</if>
<if test="dutyMethod != null">#{dutyMethod},</if>
<if test="priceType != null">#{priceType},</if> <if test="priceType != null">#{priceType},</if>
<if test="price != null">#{price},</if> <if test="price != null">#{price},</if>
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
...@@ -79,10 +91,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -79,10 +91,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_transaction_project update t_transaction_project
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="transactionProjectName != null">transaction_project_name = #{transactionProjectName},</if> <if test="transactionProjectName != null">transaction_project_name = #{transactionProjectName},</if>
<if test="transactionItemName != null">transaction_item_name = #{transactionItemName},</if> <if test="dutyDetailDescribe != null">duty_detail_describe = #{dutyDetailDescribe},</if>
<if test="context != null">context = #{context},</if> <if test="workResultStyle != null">work_result_style = #{workResultStyle},</if>
<if test="workResultDetail != null">work_result_detail = #{workResultDetail},</if>
<if test="workResultMethod != null">work_result_method = #{workResultMethod},</if>
<if test="dutyMethod != null">duty_method = #{dutyMethod},</if>
<if test="priceType != null">price_type = #{priceType},</if> <if test="priceType != null">price_type = #{priceType},</if>
price = #{price}, <if test="price != null">price = #{price},</if>
<if test="deptId != null">dept_id = #{deptId},</if> <if test="deptId != null">dept_id = #{deptId},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
......
precision-effect-web/src/views/transaction/index.vue
View file @ 2d864fe7
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="交易项目名称" align="center" prop="transactionProjectName" :show-overflow-tooltip="true"/> <el-table-column label="交易项目名称" align="center" prop="transactionProjectName" :show-overflow-tooltip="true"/>
<el-table-column label="交易细项名称" align="center" prop="transactionItemName" :show-overflow-tooltip="true"/> <el-table-column label="职责项明细说明" align="center" prop="dutyDetailDescribe" :show-overflow-tooltip="true"/>
<el-table-column label="交易类型" align="center" prop="priceType"> <el-table-column label="交易类型" align="center" prop="priceType">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.priceType == '1'">定价</span> <span v-if="scope.row.priceType == '1'">定价</span>
...@@ -134,14 +134,27 @@ ...@@ -134,14 +134,27 @@
<el-input v-model="form.transactionProjectName" placeholder="请输入交易项目名称" /> <el-input v-model="form.transactionProjectName" placeholder="请输入交易项目名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!--<el-col :span="12">
<el-form-item label="交易细项名称" prop="transactionItemName"> <el-form-item label="交易细项名称" prop="transactionItemName">
<el-input v-model="form.transactionItemName" placeholder="请输入交易细项名称" /> <el-input v-model="form.transactionItemName" placeholder="请输入交易细项名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>-->
</el-row> </el-row>
<el-form-item label="内容" prop="context">
<el-input v-model="form.context" type="textarea" placeholder="请输入内容" /> <el-form-item label="职责项明细说明" prop="dutyDetailDescribe">
<el-input v-model="form.dutyDetailDescribe" type="textarea" placeholder="请输入职责项明细说明" />
</el-form-item>
<el-form-item label="工作结果的形式" prop="workResultStyle">
<el-input v-model="form.workResultStyle" type="textarea" placeholder="请输入工作结果的形式" />
</el-form-item>
<el-form-item label="工作结果的时量/数量标准与交付方式/地址" prop="workResultDetail">
<el-input v-model="form.workResultDetail" type="textarea" placeholder="请输入工作结果的时量/数量标准与交付方式/地址" />
</el-form-item>
<el-form-item label="工作结果的质量验收标准与方式" prop="workResultMethod">
<el-input v-model="form.workResultMethod" type="textarea" placeholder="请输入工作结果的质量验收标准与方式" />
</el-form-item>
<el-form-item label="职责定价与支付时间和方式" prop="dutyMethod">
<el-input v-model="form.dutyMethod" type="textarea" placeholder="请输入职责定价与支付时间和方式" />
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -251,8 +264,11 @@ export default { ...@@ -251,8 +264,11 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
transactionProjectName: null, transactionProjectName: null,
transactionItemName: null, dutyDetailDescribe: null,
context: null, workResultStyle: null,
workResultDetail: null,
workResultMethod: null,
dutyMethod: null,
priceType: null, priceType: null,
price: null, price: null,
count: null, count: null,
...@@ -268,11 +284,20 @@ export default { ...@@ -268,11 +284,20 @@ export default {
transactionProjectName: [ transactionProjectName: [
{ required: true, message: "交易项目名称不能为空", trigger: "blur" } { required: true, message: "交易项目名称不能为空", trigger: "blur" }
], ],
transactionItemName: [ dutyDetailDescribe: [
{ required: true, message: "交易细项名称不能为空", trigger: "blur" } { required: true, message: "职责项明细说明不能为空", trigger: "blur" }
],
workResultStyle: [
{ required: true, message: "工作结果的形式不能为空", trigger: "blur" }
],
workResultDetail: [
{ required: true, message: "工作结果的时量/数量标准与交付方式/地址不能为空", trigger: "blur" }
],
workResultMethod: [
{ required: true, message: "工作结果的质量验收标准与方式不能为空", trigger: "blur" }
], ],
context: [ dutyMethod: [
{ required: true, message: "内容不能为空", trigger: "blur" } { required: true, message: "职责定价与支付时间和方式不能为空", trigger: "blur" }
], ],
priceType: [ priceType: [
{ required: true, message: "请选择交易类型", trigger: "change" } { required: true, message: "请选择交易类型", trigger: "change" }
...@@ -322,8 +347,11 @@ export default { ...@@ -322,8 +347,11 @@ export default {
this.form = { this.form = {
transactionProjectId: null, transactionProjectId: null,
transactionProjectName: null, transactionProjectName: null,
transactionItemName: null, dutyDetailDescribe: null,
context: null, workResultStyle: null,
workResultDetail: null,
workResultMethod: null,
dutyMethod: null,
priceType: null, priceType: null,
price: null, price: null,
count: null, count: null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment