Browse Source

提交代码

cxd 7 months ago
parent
commit
565e4c0120

+ 2 - 0
gqy-admin/src/main/java/com/gqy/web/controller/document/DcDocumentController.java

@@ -53,6 +53,8 @@ public class DcDocumentController extends BaseController
     }
 
 
+
+
     /**
      * 分页查询文档列表
      *

+ 2 - 2
gqy-admin/src/main/java/com/gqy/web/controller/document/DocumentCategoryController.java

@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 
 
 @RestController
-@RequestMapping("/document")
+@RequestMapping("/document/category")
 public class DocumentCategoryController extends BaseController {
 
     private static final Logger log = LoggerFactory.getLogger(DocumentCategoryController.class);
@@ -44,7 +44,7 @@ public class DocumentCategoryController extends BaseController {
      *         message: 提示信息
      *         data: 分页数据对象
      */
-    @PostMapping("/category/search")
+    @PostMapping("/search")
     @ResponseBody
     public AjaxResultCQY search(HttpServletRequest request) {
         try {

+ 4 - 0
gqy-system/src/main/java/com/gqy/document/mapper/ProductDocumentMapper.java

@@ -0,0 +1,4 @@
+package com.gqy.document.mapper;
+
+public interface ProductDocumentMapper {
+}

+ 11 - 0
gqy-system/src/main/java/com/gqy/document/mapper/ProjectDocumentMapper.java

@@ -12,4 +12,15 @@ public interface ProjectDocumentMapper {
      * @return 结果
      */
     public int batchInsertProjectDocument(List<ProjectDocument> list);
+
+
+    /**
+     * 删除文档关联的项目信息
+     *
+     * @param docId 文档ID
+     * @return 结果
+     */
+    public int deleteProjectDocumentByDocId(Long docId);
+
+
 }

+ 5 - 5
gqy-system/src/main/java/com/gqy/document/service/impl/DcDocumentServiceImpl.java

@@ -59,11 +59,11 @@ public class DcDocumentServiceImpl implements IDocumentService
             }
 
             Integer templateFlag = Convert.toInt(isTemplate, 0);
-            if (templateFlag == 0 && StringUtils.isEmpty(request.get("category_id").toString())) {
-                return AjaxResult.error("保存文档时,分类不能为空");
-            }
+//            if (templateFlag == 0 && StringUtils.isEmpty(request.get("category_id").toString())) {
+//                return AjaxResult.error("保存文档时,分类不能为空");
+//            }
 
-            Integer categoryId = Integer.valueOf(request.get("category_id").toString());
+          //  Integer categoryId = Integer.valueOf(request.get("category_id").toString());
 
 
             // 3. 检查标题是否重复
@@ -92,7 +92,7 @@ public class DcDocumentServiceImpl implements IDocumentService
 //            document.setData(StringUtils.isNotEmpty(data) ? data : fileUrl);
             document.setData(StringUtils.isNotEmpty(data) ? data : "");
             document.setUser_id(SecurityUtils.getUserId());
-            document.setCategory_id( Long.valueOf(categoryId));
+            //document.setCategory_id( Long.valueOf(categoryId));
             document.setIs_template(templateFlag);
             document.setStatus(Convert.toInt(status, 5));
             document.setCreateTime(DateUtils.getNowDate());

+ 1 - 1
gqy-system/src/main/resources/mapper/document/DcDocumentMapper.xml

@@ -94,7 +94,7 @@
 
 
     <!-- 分页查询文档列表 -->
-    <select id="pageDocument" resultType="map">
+    <select id="pageDocument" resultType="map" parameterType="Document">
         SELECT
         d.id,
         d.title,

+ 27 - 0
gqy-system/src/main/resources/mapper/document/ProductDocumentMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gqy.document.mapper.ProductDocumentMapper">
+
+    <!-- 文档产品关联结果映射 -->
+    <resultMap type="ProductDocument" id="ProductDocumentResult">
+        <id     property="id"           column="id"/>
+        <result property="document_id"  column="document_id"/>
+        <result property="product_id"   column="product_id"/>
+        <result property="create_time"  column="create_time"/>
+        <result property="status"       column="status"/>
+    </resultMap>
+
+    <!-- 删除文档产品关联 -->
+    <delete id="deleteProductDocumentByDocId" parameterType="Long">
+        delete from dc_product_document where document_id = #{documentId}
+    </delete>
+
+    <!-- 批量新增文档产品关联 -->
+    <insert id="batchInsertProductDocument">
+        insert into dc_product_document(document_id, product_id, status, create_time) values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.document_id}, #{item.product_id}, #{item.status}, sysdate())
+        </foreach>
+    </insert>
+
+</mapper>

+ 14 - 7
gqy-system/src/main/resources/mapper/document/DcProductCategoryMapper.xml → gqy-system/src/main/resources/mapper/document/ProjectDocumentMapper.xml

@@ -13,6 +13,13 @@
         <result property="create_by"    column="create_by"     />
     </resultMap>
 
+
+    <!-- 删除文档项目关联 -->
+    <delete id="deleteProjectDocumentByDocId" parameterType="Long">
+        delete from dc_project_document where doc_id = #{docId}
+    </delete>
+
+
     <insert id="batchInsertProjectDocument" parameterType="java.util.List">
         insert into dc_project_document(
         project_id,
@@ -32,12 +39,12 @@
         </foreach>
     </insert>
 
-    <delete id="deleteProjectDocumentByDocId" parameterType="Long">
-        update dc_project_document
-        set status = 4,
-            update_time = sysdate()
-        where doc_id = #{doc_id}
-    </delete>
+<!--    <delete id="deleteProjectDocumentByDocId" parameterType="Long">-->
+<!--        update dc_project_document-->
+<!--        set status = 4,-->
+<!--            update_time = sysdate()-->
+<!--        where doc_id = #{doc_id}-->
+<!--    </delete>-->
 
     <select id="selectProjectDocumentByDocId" parameterType="Long" resultMap="ProjectDocumentResult">
         select id, project_id, doc_id, status, create_time, create_by
@@ -46,4 +53,4 @@
           and status != 4
     </select>
 
-</mapper>
+</mapper>