cxd 6 hónapja
szülő
commit
da6fb1bd86

+ 12 - 4
gqy-admin/src/main/java/com/gqy/web/controller/document/DcTemplateController.java

@@ -7,9 +7,11 @@ import com.gqy.common.core.domain.AjaxResult;
 import com.gqy.common.core.domain.AjaxResultCQY;
 import com.gqy.common.core.domain.AjaxResultCQY;
 import com.gqy.common.utils.StringUtils;
 import com.gqy.common.utils.StringUtils;
 import com.gqy.document.domain.DcTemplate;
 import com.gqy.document.domain.DcTemplate;
+import com.gqy.document.domain.DcbBlock;
 import com.gqy.document.domain.Document;
 import com.gqy.document.domain.Document;
 import com.gqy.document.domain.vo.PageResult;
 import com.gqy.document.domain.vo.PageResult;
 import com.gqy.document.service.IDcTemplateService;
 import com.gqy.document.service.IDcTemplateService;
+import com.gqy.document.service.IDcbBlockService;
 import com.gqy.document.service.IDocumentService;
 import com.gqy.document.service.IDocumentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -109,8 +111,12 @@ public class DcTemplateController extends BaseController {
 
 
 
 
 
 
+    @Autowired
+    private IDcbBlockService dcbBlockService;
+
+
     /**
     /**
-     * 搜索模板列表
+     * 搜索模板列表 保留
      * 对应Python的@require_http_methods(['POST'])
      * 对应Python的@require_http_methods(['POST'])
      */
      */
     @PostMapping("/search")
     @PostMapping("/search")
@@ -132,11 +138,13 @@ public class DcTemplateController extends BaseController {
         // 分页查询
         // 分页查询
         PageHelper.startPage(pageNum, pageSize);
         PageHelper.startPage(pageNum, pageSize);
 
 
-        List<DcTemplate> list = templateService.selectTemplateList(name, categoryId, statusInt);
+       // List<DcTemplate> list = templateService.selectTemplateList(name, categoryId, statusInt);
 
 
-        // 3. 获取分页信息
-        PageInfo<DcTemplate> pageInfo = new PageInfo<>(list);
+        DcbBlock dcbBlockQuery = new DcbBlock();
+        dcbBlockQuery.setCategory_id(categoryId);
+        List<DcbBlock> list =  dcbBlockService.selectDcbBlockList(dcbBlockQuery);
 
 
+        PageInfo<DcbBlock> pageInfo = new PageInfo<>(list);
         // 4. 封装并返回结果
         // 4. 封装并返回结果
         PageResult PageResult=  new PageResult(
         PageResult PageResult=  new PageResult(
                 pageInfo.getPageNum(),
                 pageInfo.getPageNum(),

+ 11 - 0
gqy-system/src/main/java/com/gqy/document/domain/DcDocument.java

@@ -29,6 +29,17 @@ public class DcDocument {
     private String dcm_data;
     private String dcm_data;
 
 
 
 
+    /**
+     *  所属文档分类ID
+     */
+    private int dcm_category_id;
+
+    public int getDcm_category_id() {
+        return dcm_category_id;
+    }
+    public void setDcm_category_id(int dcm_category_id) {
+        this.dcm_category_id = dcm_category_id;
+    }
 
 
     public Long getDcm_id() {
     public Long getDcm_id() {
         return dcm_id;
         return dcm_id;

+ 11 - 0
gqy-system/src/main/java/com/gqy/document/domain/DcbBlock.java

@@ -40,6 +40,17 @@ public class DcbBlock {
     /** 关联业务ID */
     /** 关联业务ID */
     private Integer dcb_re_id;
     private Integer dcb_re_id;
 
 
+    /**
+     * 分类ID
+     */
+    private Integer category_id;
+
+    public Integer getCategory_id() {
+        return category_id;
+    }
+    public void setCategory_id(Integer category_id) {
+        this.category_id = category_id;
+    }
     public Long getDcb_id() {
     public Long getDcb_id() {
         return dcb_id;
         return dcb_id;
     }
     }

+ 6 - 1
gqy-system/src/main/java/com/gqy/document/service/impl/DcbBlockServiceImpl.java

@@ -4,6 +4,7 @@ package com.gqy.document.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.gqy.common.constant.Constants;
 import com.gqy.common.constant.Constants;
+import com.gqy.common.utils.StringUtils;
 import com.gqy.document.domain.DcbBlock;
 import com.gqy.document.domain.DcbBlock;
 import com.gqy.document.domain.vo.PageResult;
 import com.gqy.document.domain.vo.PageResult;
 import com.gqy.document.mapper.DcbBlockMapper;
 import com.gqy.document.mapper.DcbBlockMapper;
@@ -80,7 +81,11 @@ public class DcbBlockServiceImpl implements IDcbBlockService {
      */
      */
     @Override
     @Override
     public DcbBlock selectDcbBlockById(Long dcbId) {
     public DcbBlock selectDcbBlockById(Long dcbId) {
-        return dcbBlockMapper.selectDcbBlockById(dcbId);
+        DcbBlock dcbBlock =  dcbBlockMapper.selectDcbBlockById(dcbId);
+        if(!StringUtils.isNotEmpty(dcbBlock.getDcb_attrs())){
+            dcbBlock.setDcb_attrs("[]");
+        }
+        return dcbBlock;
     }
     }
 
 
     /**
     /**

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

@@ -12,10 +12,11 @@
         <result property="dcm_type"     column="dcm_type"    />
         <result property="dcm_type"     column="dcm_type"    />
         <result property="dcm_xbj"      column="dcm_xbj"     />
         <result property="dcm_xbj"      column="dcm_xbj"     />
         <result property="dcm_data"     column="dcm_data"    />
         <result property="dcm_data"     column="dcm_data"    />
+        <result property="dcm_category_id"     column="dcm_category_id"    />
     </resultMap>
     </resultMap>
 
 
     <sql id="selectDcDocumentVo">
     <sql id="selectDcDocumentVo">
-        select dcm_id, dcm_status, dcm_title, dcm_owner, dcm_type, dcm_xbj, dcm_data
+        select dcm_id, dcm_status, dcm_title, dcm_owner, dcm_type, dcm_xbj, dcm_data,dcm_category_id
         from dc_document
         from dc_document
     </sql>
     </sql>
 
 
@@ -27,6 +28,8 @@
             <if test="dcm_owner != null "> and dcm_owner = #{dcm_owner}</if>
             <if test="dcm_owner != null "> and dcm_owner = #{dcm_owner}</if>
             <if test="dcm_type != null "> and dcm_type = #{dcm_type}</if>
             <if test="dcm_type != null "> and dcm_type = #{dcm_type}</if>
             <if test="dcm_xbj != null "> and dcm_xbj = #{dcm_xbj}</if>
             <if test="dcm_xbj != null "> and dcm_xbj = #{dcm_xbj}</if>
+            <if test="dcm_category_id != null "> and dcm_category_id = #{dcm_category_id}</if>
+
             and dcm_status in (5,6)
             and dcm_status in (5,6)
         </where>
         </where>
 
 
@@ -47,6 +50,7 @@
             <if test="dcm_type != null">dcm_type,</if>
             <if test="dcm_type != null">dcm_type,</if>
             <if test="dcm_xbj != null">dcm_xbj,</if>
             <if test="dcm_xbj != null">dcm_xbj,</if>
             <if test="dcm_data != null">dcm_data,</if>
             <if test="dcm_data != null">dcm_data,</if>
+            <if test="dcm_category_id != null">dcm_category_id,</if>
          </trim>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="dcm_status != null">#{dcm_status},</if>
             <if test="dcm_status != null">#{dcm_status},</if>
@@ -55,6 +59,7 @@
             <if test="dcm_type != null">#{dcm_type},</if>
             <if test="dcm_type != null">#{dcm_type},</if>
             <if test="dcm_xbj != null">#{dcm_xbj},</if>
             <if test="dcm_xbj != null">#{dcm_xbj},</if>
             <if test="dcm_data != null">#{dcm_data},</if>
             <if test="dcm_data != null">#{dcm_data},</if>
+            <if test="dcm_category_id != null">dcm_category_id,</if>
          </trim>
          </trim>
     </insert>
     </insert>
 
 
@@ -67,6 +72,8 @@
             <if test="dcm_type != null">dcm_type = #{dcm_type},</if>
             <if test="dcm_type != null">dcm_type = #{dcm_type},</if>
             <if test="dcm_xbj != null">dcm_xbj = #{dcm_xbj},</if>
             <if test="dcm_xbj != null">dcm_xbj = #{dcm_xbj},</if>
             <if test="dcm_data != null">dcm_data = #{dcm_data},</if>
             <if test="dcm_data != null">dcm_data = #{dcm_data},</if>
+            <if test="dcm_category_id != null">dcm_data = #{dcm_category_id},</if>
+
         </trim>
         </trim>
         where dcm_id = #{dcm_id}
         where dcm_id = #{dcm_id}
     </update>
     </update>

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

@@ -17,12 +17,15 @@
         <result property="dcb_no"       column="dcb_no"        />
         <result property="dcb_no"       column="dcb_no"        />
         <result property="dcb_status"   column="dcb_status"    />
         <result property="dcb_status"   column="dcb_status"    />
         <result property="dcb_re_id"    column="dcb_re_id"     />
         <result property="dcb_re_id"    column="dcb_re_id"     />
+        <result property="dcb_re_id"    column="dcb_re_id"     />
+        <result property="category_id"    column="category_id"     />
+
     </resultMap>
     </resultMap>
 
 
     <!-- 数据块表字段 -->
     <!-- 数据块表字段 -->
     <sql id="selectDcbBlockVo">
     <sql id="selectDcbBlockVo">
         select dcb_id, dcb_name, dcb_lay_id, dcb_type, dcb_nr, dcb_share, dcb_attrs,
         select dcb_id, dcb_name, dcb_lay_id, dcb_type, dcb_nr, dcb_share, dcb_attrs,
-               dcb_owner, dcb_no, dcb_status, dcb_re_id
+               dcb_owner, dcb_no, dcb_status, dcb_re_id,category_id
         from dcb_block
         from dcb_block
     </sql>
     </sql>
 
 
@@ -54,6 +57,12 @@
             <if test="dcb_re_id != null">
             <if test="dcb_re_id != null">
                 AND dcb_re_id = #{dcb_re_id}
                 AND dcb_re_id = #{dcb_re_id}
             </if>
             </if>
+            <if test="category_id != null">
+                AND category_id = #{category_id}
+            </if>
+
+
+
             and dcb_status in (5,6)
             and dcb_status in (5,6)
         </where>
         </where>
         order by dcb_id desc
         order by dcb_id desc
@@ -79,6 +88,7 @@
             <if test="dcb_no != null">dcb_no,</if>
             <if test="dcb_no != null">dcb_no,</if>
             <if test="dcb_status != null">dcb_status,</if>
             <if test="dcb_status != null">dcb_status,</if>
             <if test="dcb_re_id != null">dcb_re_id,</if>
             <if test="dcb_re_id != null">dcb_re_id,</if>
+            <if test="category_id != null">category_id,</if>
         </trim>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="dcb_name != null">#{dcb_name},</if>
             <if test="dcb_name != null">#{dcb_name},</if>
@@ -91,6 +101,7 @@
             <if test="dcb_no != null">#{dcb_no},</if>
             <if test="dcb_no != null">#{dcb_no},</if>
             <if test="dcb_status != null">#{dcb_status},</if>
             <if test="dcb_status != null">#{dcb_status},</if>
             <if test="dcb_re_id != null">#{dcb_re_id},</if>
             <if test="dcb_re_id != null">#{dcb_re_id},</if>
+            <if test="category_id != null">#{category_id},</if>
         </trim>
         </trim>
     </insert>
     </insert>
 
 
@@ -108,6 +119,8 @@
             <if test="dcb_no != null">dcb_no = #{dcb_no},</if>
             <if test="dcb_no != null">dcb_no = #{dcb_no},</if>
             <if test="dcb_status != null">dcb_status = #{dcb_status},</if>
             <if test="dcb_status != null">dcb_status = #{dcb_status},</if>
             <if test="dcb_re_id != null">dcb_re_id = #{dcb_re_id},</if>
             <if test="dcb_re_id != null">dcb_re_id = #{dcb_re_id},</if>
+            <if test="category_id != null">#{category_id},</if>
+
         </trim>
         </trim>
         where dcb_id = #{dcb_id}
         where dcb_id = #{dcb_id}
     </update>
     </update>