2024-09-02 文档库优化

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD002.java

@@ -2,12 +2,15 @@ package com.baosight.hggp.hg.wd.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.wd.constant.HgWdConstant;
 import com.baosight.hggp.hg.wd.domain.HGWD001;
 import com.baosight.hggp.hg.wd.domain.HGWD002;
+import com.baosight.hggp.hg.xs.domain.User;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
@@ -52,6 +55,7 @@ public class ServiceHGWD002 extends ServiceBase {
 			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
 			// 仅查询已发布的文件
 			queryRow.put(HGWD001.FIELD_STATUS, HgWdConstant.FileStatus.S_1);
+			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, User.FIELD_USER_ID, UserSessionUtils.getUserId());
 			inInfo = super.query(inInfo, HGWD002.QUERY, new HGWD002());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD099.java

@@ -60,7 +60,6 @@ public class ServiceHGWD099 extends ServiceEPBase {
         try {
             Map queryRow =EiInfoUtils.getFirstRow(inInfo);
             if (StringUtils.isNotEmpty(queryRow.get(HGWD001.FIELD_FILE_ID).toString())){
-                inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, User.FIELD_USER_ID, UserSessionUtils.getUserId());
                 inInfo = super.query(inInfo, HGWD099.QUERY, new HGWD099());
             }
         } catch (Throwable e) {

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml

@@ -30,6 +30,7 @@
 
     <sql id="condition">
         AND DELETE_FLAG = 0
+        <include refid="HGXSDataAuth.authCondition"/>
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD002.xml

@@ -23,6 +23,7 @@
 
     <sql id="condition">
         AND A.DELETE_FLAG = 0
+        AND B.DELETE_FLAG = 0
         AND B.BIZ_TYPE = 'WD'
         <include refid="HGXSDataAuth.authConditionA"/>
 		<isNotEmpty prepend=" AND " property="id">
@@ -52,6 +53,9 @@
         <isNotEmpty prepend=" AND " property="docName">
             B.DOC_NAME LIKE CONCAT('%', #docName#, '%')
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="parentId">
+            B.BIZ_ID IN (select FILE_ID from ${hggpSchema}.hgwd003 where USER_ID = #userId# and FILE_ID = #parentId# )
+        </isNotEmpty>
 	</sql>
 
     <sql id="orderBy">

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD099.xml

@@ -35,9 +35,9 @@
         <isNotEmpty prepend=" AND " property="bizId">
             BIZ_ID = #bizId#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="fileId">
+        <!--<isNotEmpty prepend=" AND " property="fileId">
             BIZ_ID IN (select FILE_ID from ${hggpSchema}.hgwd003 where USER_ID = #userId# and FILE_ID = #fileId# )
-        </isNotEmpty>
+        </isNotEmpty>-->
         <isNotEmpty prepend=" AND " property="docId">
             DOC_ID = #docId#
         </isNotEmpty>
@@ -50,6 +50,9 @@
         <isNotEmpty prepend=" AND " property="releaseDate">
             RELEASE_DATE = #releaseDate#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="parentId">
+            BIZ_ID = #parentId#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">

src/main/webapp/HG/WD/HGWD001.js

@@ -471,9 +471,10 @@ $(function () {
 
                 // 附件上传
                 $("#UPLOAD_FILE").on("click", uploadFile);
-
-                $("#RELEASE").click("click",updateRelease)
-
+                //发布
+                $("#RELEASE").click("click",updateRelease);
+                //变更记录
+                $("#CHANGE_RECORD").on("click", changeResord);
             },
             onDelete: function (e) {
                 // 阻止默认请求，使用自定义删除
@@ -833,7 +834,7 @@ function uploadFile() {
     });
 }
 
-function changeFile(docId,bizId) {
+function changeResor(docId,bizId) {
     JSColorbox.open({
         href: "HGWD099A?methodName=initLoad&inqu_status-0-bizType=WD" +
             "&inqu_status-0-bizId="+bizId+"" +
@@ -925,7 +926,6 @@ function updateRelease() {
     );
 }
 
-
 /**
  * 显示授权按钮
  */
@@ -935,8 +935,31 @@ let showAuthButton = function () {
     if (leafType && leafType >0) {
         $("#RELEASE").attr("disabled", false);
         $("#UPLOAD_FILE").attr("disabled", false);
+        $("#CHANGE_RECORD").attr("disabled", true);
     } else {
         $("#RELEASE").attr("disabled", true);
         $("#UPLOAD_FILE").attr("disabled", true);
+        $("#CHANGE_RECORD").attr("disabled", false);
     }
+}
+
+/**
+ * 文件上传
+ */
+function changeResord() {
+    let leafType = IPLATUI.EFTree.categoryTree.selectTreeNode.leafLevel;
+    if (isBlank(leafType)){
+        message("请选择文档目录树节点！");
+        return;
+    }
+    JSColorbox.open({
+        href: "HGWD001A?methodName=initLoad&inqu_status-0-bizType=WD" +
+            "&inqu_status-0-projCode=" + $("#inqu_status-0-parentId").val()+"" +
+            "&inqu_status-0-projName=" + $("#inqu_status-0-fileName").val() +
+            "&efParentFormEname=HGWD001",
+        title: "<div style='text-align: center;'>变更记录</div>",
+        width: "80%",
+        height: "80%",
+        callbackName: uploadFileCallback
+    });
 }
\ No newline at end of file

src/main/webapp/HG/WD/HGWD001A.js

@@ -4,7 +4,7 @@ $(function () {
         "result": {
             exportGrid: false, // 隐藏右侧自定义导出按钮
             pageable: {
-                pageSize: 20,
+                pageSize: 10,
                 pageSizes: [20, 50, 70, 100],
             },
             columns: [/*{
@@ -22,19 +22,19 @@ $(function () {
                 field: "changeStart",
                 template: function (item) {
                     let template = item["changeStart"]
-                    if (item.changeType == "uploadAdd" || item.changeType == "uploadDelete") {
+                   /* if (item.changeType == "uploadAdd" || item.changeType == "uploadDelete") {
                         template = "";
-                    }
+                    }*/
                     return template;
                 }
             },{
                 field: "changeEnd",
                 template: function (item) {
                     let template = item["changeEnd"]
-                    if (item.changeType == "uploadAdd" || item.changeType == "uploadDelete") {
+                    /*if (item.changeType == "uploadAdd" || item.changeType == "uploadDelete") {
                         template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
                             + 'href="' + downloadHref(item.changeStart) + '" target="_blank">'+item.changeEnd+'</a>';
-                    }
+                    }*/
                     return template;
                 }
             }],

src/main/webapp/HG/WD/HGWD001A.jsp

@@ -20,11 +20,12 @@
 <EF:EFPage  title="变更记录">
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
-            <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains" readonly="true">
+            <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
-            <EF:EFInput blockId="inqu_status" row="0" ename="projName" cname="项目名称" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="projCode" cname="项目编码" type="hidden" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="projName" cname="项目名称" placeholder="模糊查询" colWidth="3" readonly="true"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="changeType" cname="变更类型" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hggp.hgwd.changeType"/>

src/main/webapp/HG/WD/HGWD001E.js

@@ -177,7 +177,14 @@ let save = function (btnNode) {
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
             ok: function () {
-                JSUtils.submitGridsData("result", "HGWD001E", "save", true);
+                JSUtils.submitGridsData("result", "HGWD001E", "save", true,
+                    function (e) {
+                        var status = e.status;
+                        if (status !== -1) {
+                            let parentOrgId = $("#inqu_status-0-parentOrgId").val();
+                            parent.JSColorbox.setValueCallback(parentOrgId);
+                        }
+                    });
                 btnNode.attr("disabled", false);
             }
         });

src/main/webapp/HG/WD/HGWD001F.js

@@ -145,7 +145,15 @@ let save = function (btnNode) {
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
             ok: function () {
-                JSUtils.submitGridsData("result", "HGWD001F", "save", true);
+                JSUtils.submitGridsData("result", "HGWD001F", "save", true,
+                    function (e) {
+                        var status = e.status;
+                        if (status !== -1) {
+                            let parentOrgId = $("#inqu_status-0-parentOrgId").val();
+                            parent.JSColorbox.setValueCallback(parentOrgId);
+                        }
+                    }
+                );
                 btnNode.attr("disabled", false);
             }
         });