Commit 94dd588d authored by nie'hong's avatar nie'hong

修改属性

parent 8f729687
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkProject"> <resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkProject">
<id column="id" property="id" /> <id column="id" property="id" />
<result column="oa_project_number" property="oaProjectNumber" /> <result column="oa_project_id" property="oaProjectId" />
<result column="project_name" property="projectName" /> <result column="project_name" property="projectName" />
<result column="type" property="type" /> <result column="type" property="type" />
<result column="manager_id" property="managerId" /> <result column="manager_id" property="managerId" />
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, oa_project_number, project_name, type, manager_id, manager_name, dept_id, work_time, cost_budget, is_conclusion,start_time,end_time, create_time, modify_time id, oa_project_id, project_name, type, manager_id, manager_name, dept_id, work_time, cost_budget, is_conclusion,start_time,end_time, create_time, modify_time
</sql> </sql>
<sql id="table"> <sql id="table">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<!--查询条件--> <!--查询条件-->
<sql id="criteria"> <sql id="criteria">
<if test="id != null">and id = #{id}</if> <if test="id != null">and id = #{id}</if>
<if test="oaProjectNumber != null">and oa_project_number = #{oaProjectNumber}</if> <if test="oaProjectId != null">and oa_project_id = #{oaProjectId}</if>
<if test="projectName != null">and project_name = #{projectName}</if> <if test="projectName != null">and project_name = #{projectName}</if>
<if test="type != null">and type =#{type}</if> <if test="type != null">and type =#{type}</if>
<if test="managerId != null">and manager_id = #{managerId}</if> <if test="managerId != null">and manager_id = #{managerId}</if>
......
...@@ -30,8 +30,8 @@ public class WorkProject implements Serializable { ...@@ -30,8 +30,8 @@ public class WorkProject implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
@ApiModelProperty(name = "oaProjectNumber",value = "项目编号") @ApiModelProperty(name = "oaProjectId",value = "OA中的项目编号")
private String oaProjectNumber; private String oaProjectId;
@ApiModelProperty(name = "projectName",value = "项目名称") @ApiModelProperty(name = "projectName",value = "项目名称")
private String projectName; private String projectName;
......
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