Browse Source

代码提交

cxd 6 months ago
parent
commit
e600780e7f

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

@@ -58,7 +58,8 @@ public class DcDocumentController extends BaseController
         Integer pageSize =(Integer) maps.get("pageSize");
         Integer pageSize =(Integer) maps.get("pageSize");
         DcDocument dcDocument = new DcDocument();
         DcDocument dcDocument = new DcDocument();
         BeanUtils.mapToBean(maps, dcDocument);
         BeanUtils.mapToBean(maps, dcDocument);
-        PageResult pageResult =  documentService.selectDcDocumentList(page,pageSize,dcDocument);
+        PageResult pageResult =  documentService.selectDcDocumentList(page,pageSize,dcDocument,maps);
+
         return AjaxResultCQY.success("查询成功", pageResult);
         return AjaxResultCQY.success("查询成功", pageResult);
     }
     }
 
 
@@ -97,7 +98,7 @@ public class DcDocumentController extends BaseController
      * 删除文档
      * 删除文档
      * @return
      * @return
      */
      */
-    @GetMapping("/delete/{dcbId}")
+    @GetMapping("/dele/{dcbId}")
     public @ResponseBody AjaxResultCQY delete(@PathVariable("dcbId") Long dcbId) {
     public @ResponseBody AjaxResultCQY delete(@PathVariable("dcbId") Long dcbId) {
         try{
         try{
             documentService.deleteDcDocumentById(dcbId);
             documentService.deleteDcDocumentById(dcbId);
@@ -107,6 +108,18 @@ public class DcDocumentController extends BaseController
         }
         }
     }
     }
 
 
+
+    /**
+     * 获取数据块详细信息
+     * 更具id查询信息
+     */
+    @GetMapping(value = "/info/{dcm_id}")
+    public AjaxResultCQY getInfo(@PathVariable("dcm_id") Long dcbId) {
+        return AjaxResultCQY.success(documentService.selectDcDocumentByDcmId(dcbId));
+    }
+
+
+
 //
 //
 //    @Autowired
 //    @Autowired
 //    private IExportService exportService;
 //    private IExportService exportService;

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

@@ -29,7 +29,7 @@ public class DcbBlockController extends BaseController {
         Integer pageSize =(Integer) maps.get("pageSize");
         Integer pageSize =(Integer) maps.get("pageSize");
         DcbBlock dcbBlock = new DcbBlock();
         DcbBlock dcbBlock = new DcbBlock();
         BeanUtils.mapToBean(maps, dcbBlock);
         BeanUtils.mapToBean(maps, dcbBlock);
-        PageResult pageResult =  dcbBlockService.searchlistDoc(page,pageSize,dcbBlock);
+        PageResult pageResult =  dcbBlockService.searchlistDoc(page,pageSize,dcbBlock,maps);
 
 
         return AjaxResultCQY.success("查询成功", pageResult);
         return AjaxResultCQY.success("查询成功", pageResult);
     }
     }
@@ -37,9 +37,9 @@ public class DcbBlockController extends BaseController {
     /**
     /**
      * 获取数据块详细信息
      * 获取数据块详细信息
      */
      */
-    @GetMapping(value = "/{dcbId}")
-    public AjaxResult getInfo(@PathVariable("dcbId") Long dcbId) {
-        return success(dcbBlockService.selectDcbBlockById(dcbId));
+    @GetMapping(value = "/info/{dcbId}")
+    public AjaxResultCQY getInfo(@PathVariable("dcbId") Long dcbId) {
+        return AjaxResultCQY.success(dcbBlockService.selectDcbBlockById(dcbId));
     }
     }
 
 
     /**
     /**

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

@@ -28,6 +28,8 @@ public class DcDocument {
     /** 文档内容 */
     /** 文档内容 */
     private String dcm_data;
     private String dcm_data;
 
 
+
+
     public Long getDcm_id() {
     public Long getDcm_id() {
         return dcm_id;
         return dcm_id;
     }
     }

+ 2 - 1
gqy-system/src/main/java/com/gqy/document/service/IDcbBlockService.java

@@ -5,6 +5,7 @@ import com.gqy.document.domain.DcbBlock;
 import com.gqy.document.domain.vo.PageResult;
 import com.gqy.document.domain.vo.PageResult;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 数据块服务接口
  * 数据块服务接口
@@ -21,7 +22,7 @@ public interface IDcbBlockService {
      * @param document
      * @param document
      * @return
      * @return
      */
      */
-    public PageResult searchlistDoc(Integer page, Integer pageSize, DcbBlock document);
+    public PageResult searchlistDoc(Integer page, Integer pageSize, DcbBlock document, Map maps);
 
 
     /**
     /**
      * 查询数据块列表
      * 查询数据块列表

+ 8 - 1
gqy-system/src/main/java/com/gqy/document/service/IDocumentService.java

@@ -31,7 +31,7 @@ public interface IDocumentService
      * @param dcDocument
      * @param dcDocument
      * @return
      * @return
      */
      */
-    public PageResult selectDcDocumentList(Integer page, Integer pageSize, DcDocument dcDocument);
+    public PageResult selectDcDocumentList(Integer page, Integer pageSize, DcDocument dcDocument,Map maps);
 
 
 
 
     /**
     /**
@@ -57,6 +57,13 @@ public interface IDocumentService
     public int deleteDcDocumentById(Long id);
     public int deleteDcDocumentById(Long id);
 
 
 
 
+    /**
+     *  根据id查询文档
+     * @param id
+     * @return
+     */
+    public DcDocument selectDcDocumentByDcmId(Long id);
+
 //    /**
 //    /**
 //     * 更新文档
 //     * 更新文档
 //     * @param document
 //     * @param document

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

@@ -57,9 +57,17 @@ public class DcDocumentServiceImpl implements IDocumentService
      * @param dcDocument
      * @param dcDocument
      * @return
      * @return
      */
      */
-    public PageResult selectDcDocumentList(Integer page, Integer pageSize, DcDocument dcDocument){
+    public PageResult selectDcDocumentList(Integer page, Integer pageSize, DcDocument dcDocument,Map maps){
         PageHelper.startPage(page, pageSize);
         PageHelper.startPage(page, pageSize);
         List<DcDocument> list = documentMapper.selectDcDocumentList(dcDocument);
         List<DcDocument> list = documentMapper.selectDcDocumentList(dcDocument);
+        //isContentShow   true 显示 false 不显现
+        boolean isContentShow = (boolean)maps.get("isContentShow");
+        if(!isContentShow){
+            for(DcDocument dcDocument1 : list){
+                dcDocument1.setDcm_data("");
+            }
+        }
+
         PageInfo<DcDocument> pageInfo = new PageInfo<>(list);
         PageInfo<DcDocument> pageInfo = new PageInfo<>(list);
         return new PageResult(
         return new PageResult(
                 pageInfo.getPageNum(),
                 pageInfo.getPageNum(),
@@ -108,6 +116,17 @@ public class DcDocumentServiceImpl implements IDocumentService
     }
     }
 
 
 
 
+    /**
+     *
+     * chax
+     * @param id
+     * @return
+     */
+    public DcDocument selectDcDocumentByDcmId(Long id){
+        return documentMapper.selectDcDocumentByDcmId(id);
+    }
+
+
 
 
 //    @Autowired
 //    @Autowired
 //    private DocumentMapper documentMapper;
 //    private DocumentMapper documentMapper;

+ 10 - 2
gqy-system/src/main/java/com/gqy/document/service/impl/DcbBlockServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 数据块服务实现类
  * 数据块服务实现类
@@ -31,11 +32,18 @@ public class DcbBlockServiceImpl implements IDcbBlockService {
      * @param dcbBlock
      * @param dcbBlock
      * @return
      * @return
      */
      */
-    public PageResult searchlistDoc(Integer page, Integer pageSize, DcbBlock dcbBlock){
+    public PageResult searchlistDoc(Integer page, Integer pageSize, DcbBlock dcbBlock, Map maps){
         PageHelper.startPage(page, pageSize);
         PageHelper.startPage(page, pageSize);
 
 
         List<DcbBlock> list = dcbBlockMapper.selectDcbBlockList(dcbBlock);
         List<DcbBlock> list = dcbBlockMapper.selectDcbBlockList(dcbBlock);
-
+        //isContentShow   true 显示 false 不显现
+        boolean isContentShow = (boolean) maps.get("isContentShow");
+        if (!isContentShow){
+            for (DcbBlock block : list) {
+                block.setDcb_nr("");
+                block.setDcb_attrs("");
+            }
+        }
         PageInfo<DcbBlock> pageInfo = new PageInfo<>(list);
         PageInfo<DcbBlock> pageInfo = new PageInfo<>(list);
 
 
 
 

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

@@ -27,8 +27,9 @@
             <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>
+            and dcm_status in (5,6)
         </where>
         </where>
-        and dcm_status in (5,6)
+
         order by dcm_id desc,dcm_status asc
         order by dcm_id desc,dcm_status asc
     </select>
     </select>
 
 

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

@@ -54,8 +54,8 @@
             <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>
+            and dcb_status in (5,6)
         </where>
         </where>
-        and dcb_status in (5,6)
         order by dcb_id desc
         order by dcb_id desc
     </select>
     </select>