dcs пре 1 година
родитељ
комит
89236bc407

+ 6 - 6
virgo.api/src/main/java/com/bosshand/virgo/api/model/Contract.java

@@ -160,9 +160,9 @@ public class Contract {
     private String attachment;
 
     /**
-     * 文档id
+     * 文档
      */
-    private long documentId;
+    private String document;
 
     /**
      * 自定义字段
@@ -414,12 +414,12 @@ public class Contract {
         this.attachment = attachment;
     }
 
-    public long getDocumentId() {
-        return documentId;
+    public String getDocument() {
+        return document;
     }
 
-    public void setDocumentId(long documentId) {
-        this.documentId = documentId;
+    public void setDocument(String document) {
+        this.document = document;
     }
 
     public String getData() {

+ 9 - 9
virgo.api/src/main/resources/mapper/ContractMapper.xml

@@ -34,7 +34,7 @@
         <result column="tagIds" property="tagIds"/>
         <result column="projectItemTargetRoomIds" property="projectItemTargetRoomIds"/>
         <result column="attachment" property="attachment"/>
-        <result column="documentId" property="documentId"/>
+        <result column="document" property="document"/>
         <result column="data" property="data"/>
     </resultMap>
 
@@ -68,7 +68,7 @@
         <result column="tagIds" property="tagIds"/>
         <result column="projectItemTargetRoomIds" property="projectItemTargetRoomIds"/>
         <result column="attachment" property="attachment"/>
-        <result column="documentId" property="documentId"/>
+        <result column="document" property="document"/>
         <result column="data" property="data"/>
         <collection property="clauseList" ofType="com.bosshand.virgo.api.model.Clause" resultMap="com.bosshand.virgo.api.dao.ClauseDao.clauseResult" columnPrefix="clause_"/>
     </resultMap>
@@ -76,12 +76,12 @@
 
 
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.Contract" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO contract(`createDate`, `organizationId`, `organizationName`, `roleId`, `roleName`, `investmentPromotion`, `operator`, `investmentPromotionName`, `operatorName`,`tenantType`, `merchantId`, `merchantName`, `clientId`, `clientName`
+        INSERT INTO contract(`createDate`, `organizationId`, `organizationName`, `roleId`, `roleName`, `investmentPromotion`, `operator`, `investmentPromotionName`, `operatorName`,`tenantType`, `merchantId`, `merchantName`, `clientId`, `clientName`,
                              `tenant`, `industry`, `corporation`, `signatory`, `tenantContactPerson`, `signingDate`, `startDate`, `endDate`,
-                             `lateFeesStartingDays`, `lateFeesProportion`, `lateFeesCeiling`, `tagIds`, `projectItemTargetRoomIds`, `attachment`, `documentId`, `data`)
+                             `lateFeesStartingDays`, `lateFeesProportion`, `lateFeesCeiling`, `tagIds`, `projectItemTargetRoomIds`, `attachment`, `document`, `data`)
         VALUES (now(), #{organizationId}, #{organizationName}, #{roleId}, #{roleName}, #{investmentPromotion}, #{operator}, #{investmentPromotionName}, #{operatorName}, #{tenantType}, #{merchantId}, #{merchantName}, #{clientId}, #{clientName}, #{tenant},
                 #{industry}, #{corporation}, #{signatory}, #{tenantContactPerson}, #{signingDate}, #{startDate}, #{endDate}, #{lateFeesStartingDays},
-                #{lateFeesProportion}, #{lateFeesCeiling}, #{tagIds}, #{projectItemTargetRoomIds}, #{attachment}, #{documentId}, #{data})
+                #{lateFeesProportion}, #{lateFeesCeiling}, #{tagIds}, #{projectItemTargetRoomIds}, #{attachment}, #{document}, #{data})
     </insert>
 
     <delete id="delete">
@@ -117,7 +117,7 @@
             <if test="tagIds!=null">tagIds=#{tagIds},</if>
             <if test="projectItemTargetRoomIds!=null">projectItemTargetRoomIds=#{projectItemTargetRoomIds},</if>
             <if test="attachment!=null">attachment=#{attachment},</if>
-            <if test="documentId!=0">documentId=#{documentId},</if>
+            <if test="document!=null">document=#{document},</if>
             <if test="data!=null">data=#{data},</if>
         </trim>
         WHERE id=#{id}
@@ -189,7 +189,7 @@
             </if>
             <if test="projectItemTargetRoomIds!=null">and projectItemTargetRoomIds=#{projectItemTargetRoomIds}</if>
             <if test="attachment!=null">and attachment=#{attachment}</if>
-            <if test="documentId!=0">and documentId=#{documentId}</if>
+            <if test="document!=null">and document=#{document}</if>
             <if test="data!=null">and data=#{data}</if>
         </where>
     </select>
@@ -227,7 +227,7 @@
             </if>
             <if test="projectItemTargetRoomIds!=null">and projectItemTargetRoomIds=#{projectItemTargetRoomIds}</if>
             <if test="attachment!=null">and attachment=#{attachment}</if>
-            <if test="documentId!=0">and documentId=#{documentId}</if>
+            <if test="document!=null">and document=#{document}</if>
             <if test="data!=null">and data=#{data}</if>
         </where>
     </select>
@@ -265,7 +265,7 @@
             </if>
             <if test="p.projectItemTargetRoomIds!=null">and projectItemTargetRoomIds=#{p.projectItemTargetRoomIds}</if>
             <if test="p.attachment!=null">and attachment=#{p.attachment}</if>
-            <if test="p.documentId!=0">and documentId=#{p.documentId}</if>
+            <if test="p.document!=null">and document=#{document}</if>
             <if test="p.data!=null">and data=#{p.data}</if>
         </where>
         limit #{currIndex} , #{pageSize}