From 2b619e75855b38042b426c4eed9d87d39b349853 Mon Sep 17 00:00:00 2001
From: wangjingsheng <wangjinsheng@wodcloud.com>
Date: Mon, 14 Mar 2022 19:50:04 +0800
Subject: [PATCH] test

---
 .../java/com/pms/ocp/mapper/ModelPropertyMapper.java     | 1 -
 src/main/resources/mapper/ModelMapperPropertyMapper.xml  | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java b/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java
index b171a08..c7d1062 100644
--- a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java
@@ -1,7 +1,6 @@
 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.pms.ocp.model.entity.Model;
 import com.pms.ocp.model.entity.ModelProperty;
 import com.pms.ocp.model.vo.ModelPropertyVO;
 import org.apache.ibatis.annotations.Mapper;
diff --git a/src/main/resources/mapper/ModelMapperPropertyMapper.xml b/src/main/resources/mapper/ModelMapperPropertyMapper.xml
index f76ac9e..7bb0771 100644
--- a/src/main/resources/mapper/ModelMapperPropertyMapper.xml
+++ b/src/main/resources/mapper/ModelMapperPropertyMapper.xml
@@ -21,20 +21,23 @@
 
 
     <resultMap type="com.pms.ocp.model.vo.ModelPropertyVO" id="mpMap">
-        <!--        <result property="id" column="id" jdbcType="VARCHAR"/>-->
+        <result property="objId" column="obj_id" jdbcType="VARCHAR"/>
         <result property="columnName" column="column_name" jdbcType="VARCHAR"/>
         <result property="dataLength" column="data_length" jdbcType="VARCHAR"/>
         <result property="dataScale" column="data_scale" jdbcType="VARCHAR"/>
         <result property="dataType" column="data_type" jdbcType="VARCHAR"/>
         <result property="boolPrimaryKey" column="is_pk" jdbcType="VARCHAR"/>
         <result property="modelCode" column="model_code" jdbcType="INTEGER"/>
-<!--        <result property="modelName" column="model_name" jdbcType="VARCHAR"/>-->
+        <result property="propCode" column="prop_code" jdbcType="VARCHAR"/>
         <result property="modelTableName" column="model_table" jdbcType="VARCHAR"/>
+        <result property="propCtime" column="prop_ctime" jdbcType="VARCHAR"/>
+        <result property="propMtime" column="prop_mtime" jdbcType="VARCHAR"/>
     </resultMap>
 
 
     <select id="listModelPropertyVO" resultMap="mpMap">
-        select omp.column_name, omp.data_length, omp.data_scale, omp.data_type, omp.is_pk,
+        SELECT omp.obj_id, omp.data_length, omp.data_scale, omp.data_type, omp.is_pk, omp.column_name,
+        omp.prop_code, omp.prop_ctime, omp.prop_mtime,
         omb.model_code, omb.model_name, omb.model_table
         FROM ocp_model_prop omp
         JOIN ocp_model_base omb on omp.model_code = omb.model_code
-- 
2.26.0