fix

virgo.api/src/main/java/com/bosshand/virgo/api/model/Merchant.java

@@ -102,6 +102,11 @@ public class Merchant {
      */
     private String roomIds;
 
+    /**
+     * 入驻时间
+     */
+    private String entryTime;
+
     public long getId() {
         return id;
     }
@@ -261,4 +266,12 @@ public class Merchant {
     public void setRoomIds(String roomIds) {
         this.roomIds = roomIds;
     }
+
+    public String getEntryTime() {
+        return entryTime;
+    }
+
+    public void setEntryTime(String entryTime) {
+        this.entryTime = entryTime;
+    }
 }

virgo.api/src/main/resources/mapper/MerchantMapper.xml

@@ -27,11 +27,12 @@
         <result column="status" property="status"/>
         <result column="data" property="data"/>
         <result column="roomIds" property="roomIds"/>
+        <result column="entryTime" property="entryTime"/>
     </resultMap>
 
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.Merchant" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO merchant(`address`, `businessScope`, `corporateScale`, `corporatePhilosophy`, `corporateCulture`, `contactInformation`, `fax`, `email`, `organizationId`, `projectId`, `industryType`, `name`, `legalPerson`, `establishDate`, `businessTerm`, `registeredCapital`, `status`, `data`, `roomIds`)
-        VALUES (#{address}, #{businessScope}, #{corporateScale}, #{corporatePhilosophy}, #{corporateCulture}, #{contactInformation}, #{fax}, #{email}, #{organizationId}, #{projectId}, #{industryType}, #{name}, #{legalPerson}, #{establishDate}, #{businessTerm}, #{registeredCapital}, #{status}, #{data}, #{roomIds})
+        INSERT INTO merchant(`address`, `businessScope`, `corporateScale`, `corporatePhilosophy`, `corporateCulture`, `contactInformation`, `fax`, `email`, `organizationId`, `projectId`, `industryType`, `name`, `legalPerson`, `establishDate`, `businessTerm`, `registeredCapital`, `status`, `data`, `roomIds`, `entryTime`)
+        VALUES (#{address}, #{businessScope}, #{corporateScale}, #{corporatePhilosophy}, #{corporateCulture}, #{contactInformation}, #{fax}, #{email}, #{organizationId}, #{projectId}, #{industryType}, #{name}, #{legalPerson}, #{establishDate}, #{businessTerm}, #{registeredCapital}, #{status}, #{data}, #{roomIds}, #{entryTime})
     </insert>
 
     <delete id="delete">
@@ -61,6 +62,7 @@
             <if test="status!=null">status=#{status},</if>
             <if test="data!=null">data=#{data},</if>
             <if test="roomIds!=null">roomIds=#{roomIds},</if>
+            <if test="entryTime!=null">entryTime=#{entryTime},</if>
         </trim>
         WHERE id=#{id}
     </update>
@@ -92,6 +94,7 @@
             <if test="status!=null">and status=#{status}</if>
             <if test="data!=null">and data=#{data}</if>
             <if test="roomIds!=null">and roomIds=#{roomIds}</if>
+            <if test="entryTime!=null">and entryTime=#{entryTime}</if>
         </where>
     </select>
 
@@ -118,6 +121,7 @@
             <if test="status!=null">and status=#{status}</if>
             <if test="data!=null">and data=#{data}</if>
             <if test="roomIds!=null">and roomIds=#{roomIds}</if>
+            <if test="entryTime!=null">and entryTime=#{entryTime}</if>
         </where>
     </select>
 
@@ -144,6 +148,7 @@
             <if test="p.status!=null">and status=#{p.status}</if>
             <if test="p.data!=null">and data=#{p.data}</if>
             <if test="p.roomIds!=null">and roomIds=#{p.roomIds}</if>
+            <if test="p.entryTime!=null">and entryTime=#{p.entryTime}</if>
         </where>
         limit #{currIndex} , #{pageSize}
     </select>