fix

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

@@ -169,6 +169,11 @@ public class Contract {
      */
     private String document;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
     /**
      * 自定义字段
      */
@@ -443,6 +448,14 @@ public class Contract {
         this.document = document;
     }
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     public String getData() {
         return data;
     }

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

@@ -36,6 +36,7 @@
         <result column="projectItemTargetRoomIds" property="projectItemTargetRoomIds"/>
         <result column="attachment" property="attachment"/>
         <result column="document" property="document"/>
+        <result column="status" property="status"/>
         <result column="data" property="data"/>
     </resultMap>
 
@@ -71,6 +72,7 @@
         <result column="projectItemTargetRoomIds" property="projectItemTargetRoomIds"/>
         <result column="attachment" property="attachment"/>
         <result column="document" property="document"/>
+        <result column="status" property="status"/>
         <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>
@@ -80,10 +82,10 @@
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.Contract" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO contract(`code`, `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`, `document`, `data`)
+                             `lateFeesStartingDays`, `lateFeesProportion`, `lateFeesCeiling`, `tagIds`, `projectItemTargetRoomIds`, `attachment`, `document`, `status`, `data`)
         VALUES (#{code}, 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}, #{document}, #{data})
+                #{lateFeesProportion}, #{lateFeesCeiling}, #{tagIds}, #{projectItemTargetRoomIds}, #{attachment}, #{document}, #{status}, #{data})
     </insert>
 
     <delete id="delete">
@@ -120,6 +122,7 @@
             <if test="projectItemTargetRoomIds!=null">projectItemTargetRoomIds=#{projectItemTargetRoomIds},</if>
             <if test="attachment!=null">attachment=#{attachment},</if>
             <if test="document!=null">document=#{document},</if>
+            <if test="status!=null">status=#{status},</if>
             <if test="data!=null">data=#{data},</if>
         </trim>
         WHERE id=#{id}
@@ -193,6 +196,7 @@
             <if test="projectItemTargetRoomIds!=null">and projectItemTargetRoomIds=#{projectItemTargetRoomIds}</if>
             <if test="attachment!=null">and attachment=#{attachment}</if>
             <if test="document!=null">and document=#{document}</if>
+            <if test="status!=null">and status=#{status}</if>
             <if test="data!=null">and data=#{data}</if>
         </where>
     </select>
@@ -232,6 +236,7 @@
             <if test="projectItemTargetRoomIds!=null">and projectItemTargetRoomIds=#{projectItemTargetRoomIds}</if>
             <if test="attachment!=null">and attachment=#{attachment}</if>
             <if test="document!=null">and document=#{document}</if>
+            <if test="status!=null">and status=#{status}</if>
             <if test="data!=null">and data=#{data}</if>
         </where>
     </select>
@@ -270,7 +275,8 @@
             </if>
             <if test="p.projectItemTargetRoomIds!=null">and projectItemTargetRoomIds=#{p.projectItemTargetRoomIds}</if>
             <if test="p.attachment!=null">and attachment=#{p.attachment}</if>
-            <if test="p.document!=null">and document=#{document}</if>
+            <if test="p.document!=null">and document=#{p.document}</if>
+            <if test="p.status!=null">and status=#{p.status}</if>
             <if test="p.data!=null">and data=#{p.data}</if>
         </where>
         limit #{currIndex} , #{pageSize}

virgo.file/src/main/java/com/bosshand/virgo/file/controller/DocumentTemplateController.java

@@ -7,6 +7,7 @@ import com.bosshand.virgo.file.document.DocumentService;
 import com.bosshand.virgo.file.document.exception.DocumentProcessException;
 import com.bosshand.virgo.file.document.model.DocumentInputData;
 import com.bosshand.virgo.file.document.model.DocumentTemplate;
+import com.bosshand.virgo.file.document.model.DocumentTemplateData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -136,32 +137,56 @@ public class DocumentTemplateController {
         return Response.ok();
     }
 
-    @ApiOperation("保存录入数据")
+    @ApiOperation("保存模板字段")
     @RequestMapping(value = "/data", method = RequestMethod.POST)
     public Response insertDocumentInputData(@RequestBody DocumentInputData documentInputData) {
         documentService.insertDocumentInputData(documentInputData);
         return Response.ok();
     }
 
-    @ApiOperation("获取录入数据")
+    @ApiOperation("获取模板字段")
     @RequestMapping(value = "/data/list", method = RequestMethod.POST)
     public Response getDocumentInputDataList(@RequestBody DocumentInputData documentInputData) {
         return Response.ok(documentService.getDocumentInputDataList(documentInputData));
     }
 
-    @ApiOperation("更新录入数据")
+    @ApiOperation("更新模板字段")
     @RequestMapping(value = "/data/update", method = RequestMethod.PUT)
     public Response updateDocumentInputData(@RequestBody DocumentInputData documentInputData) {
         documentService.updateDocumentInputData(documentInputData);
         return Response.ok();
     }
 
-    @ApiOperation("删除录入数据")
+    @ApiOperation("删除模板字段")
     @RequestMapping(value = "/data/delete/{id}", method = RequestMethod.DELETE)
     public Response deleteDocumentInputData(@PathVariable long id) {
         documentService.deleteDocumentInputData(id);
         return Response.ok();
     }
 
+    @ApiOperation("保存文档渲染数据")
+    @RequestMapping(value = "/documentTemplateData", method = RequestMethod.POST)
+    public Response insertDocumentTemplateData(@RequestBody DocumentTemplateData documentTemplateData) {
+        DocumentTemplateData data = documentService.getDocumentTemplateData(documentTemplateData.getDocumentId(), documentTemplateData.getTemplateId());
+        if (data != null) {
+            return Response.fail(200001, "已存在！");
+        }
+        documentService.insertDocumentTemplateData(documentTemplateData);
+        return Response.ok();
+    }
+
+    @ApiOperation("获取文档渲染数据")
+    @RequestMapping(value = "/documentTemplateData/{documentId}/{templateId}", method = RequestMethod.GET)
+    public Response getDocumentTemplateData(@PathVariable long documentId, @PathVariable long templateId) {
+        return Response.ok(documentService.getDocumentTemplateData(documentId, templateId));
+    }
+
+    @ApiOperation("更新文档渲染数据")
+    @RequestMapping(value = "/documentTemplateData/update", method = RequestMethod.PUT)
+    public Response updateDocumentTemplateData(@RequestBody DocumentTemplateData documentTemplateData) {
+        documentService.updateDocumentTemplateData(documentTemplateData);
+        return Response.ok();
+    }
+
 
 }

virgo.file/src/main/java/com/bosshand/virgo/file/document/DocumentService.java

@@ -46,6 +46,9 @@ public class DocumentService {
     @Autowired
     DocumentInputDataDao documentInputDataDao;
 
+    @Autowired
+    DocumentTemplateDataDao documentTemplateDataDao;
+
     @Autowired
     FileNodeDao fileNodeDao;
 
@@ -180,6 +183,20 @@ public class DocumentService {
         return documentInputDataDao.getList(documentInputData);
     }
 
+    /**
+     * 文档模板渲染数据
+     */
+    public int insertDocumentTemplateData(DocumentTemplateData documentTemplateData) {
+        return documentTemplateDataDao.insert(documentTemplateData);
+    }
+
+    public DocumentTemplateData getDocumentTemplateData(long documentId, long templateId) {
+        return documentTemplateDataDao.get(documentId, templateId);
+    }
+
+    public int updateDocumentTemplateData(DocumentTemplateData documentTemplateData) {
+        return documentTemplateDataDao.update(documentTemplateData);
+    }
 
     /**
      * 名称模糊查询模板
@@ -614,4 +631,5 @@ public class DocumentService {
     }
 
 
+
 }

virgo.file/src/main/java/com/bosshand/virgo/file/document/dao/DocumentTemplateDataDao.java

@@ -0,0 +1,15 @@
+package com.bosshand.virgo.file.document.dao;
+
+import com.bosshand.virgo.file.document.model.DocumentTemplateData;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DocumentTemplateDataDao {
+
+    int insert(DocumentTemplateData documentTemplateData);
+
+    int update(DocumentTemplateData documentTemplateData);
+
+    DocumentTemplateData get(long documentId, long templateId);
+
+}

virgo.file/src/main/java/com/bosshand/virgo/file/document/model/DocumentInputData.java

@@ -1,7 +1,7 @@
 package com.bosshand.virgo.file.document.model;
 
 /**
- * 模板录入数据
+ * 模板字段
  */
 public class DocumentInputData {
 

virgo.file/src/main/java/com/bosshand/virgo/file/document/model/DocumentTemplateData.java

@@ -0,0 +1,47 @@
+package com.bosshand.virgo.file.document.model;
+
+/**
+ * 文档模板渲染数据
+ */
+public class DocumentTemplateData {
+
+    private long id;
+
+    private long documentId;
+
+    private long templateId;
+
+    private String data;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getDocumentId() {
+        return documentId;
+    }
+
+    public void setDocumentId(long documentId) {
+        this.documentId = documentId;
+    }
+
+    public long getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(long templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+}

virgo.file/src/main/resources/mapper/DocumentTemplateDataMapper.xml

@@ -0,0 +1,32 @@
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.bosshand.virgo.file.document.dao.DocumentTemplateDataDao">
+
+    <resultMap type="com.bosshand.virgo.file.document.model.DocumentTemplateData" id="documentTemplateDataResult">
+        <id column="id" property="id"/>
+        <result column="documentId" property="documentId"/>
+        <result column="templateId" property="templateId"/>
+        <result column="data" property="data"/>
+    </resultMap>
+
+    <insert id="insert" parameterType="com.bosshand.virgo.file.document.model.DocumentTemplateData" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO document_template_data(`documentId`, `templateId`, `data`) VALUES (#{documentId}, #{templateId}, #{data})
+    </insert>
+
+    <update id="update" parameterType="com.bosshand.virgo.file.document.model.DocumentTemplateData">
+        UPDATE document_template_data
+        <trim prefix="set" suffixOverrides=",">
+            <if test="documentId!=0">documentId=#{documentId},</if>
+            <if test="templateId!=0">templateId=#{templateId},</if>
+            <if test="data!=null">data=#{data},</if>
+        </trim>
+        WHERE id=#{id}
+    </update>
+
+    <select id="get" resultMap="documentTemplateDataResult">
+        SELECT * FROM document_template_data WHERE templateId = #{templateId} and documentId = #{documentId}
+    </select>
+
+</mapper>