2024-08-21 文档库优化

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

@@ -179,7 +179,7 @@ public class ServiceHGWD001 extends ServiceEPBase {
                 Map<?, ?> map = eiBlock.getRow(i);
                 hgwd001.fromMap(map);
 
-                HGWD001 wd001 =HGWDTools.HgWd001.get(hgwd001.getId());
+                //HGWD001 wd001 =HGWDTools.HgWd001.get(hgwd001.getId());
                 HGWD001A hgwd001a = new HGWD001A();
                 hgwd001a.setCompanyCode(hgwd001.getCompanyCode());
                 hgwd001a.setCompanyName(hgwd001.getCompanyName());
@@ -188,12 +188,9 @@ public class ServiceHGWD001 extends ServiceEPBase {
                 hgwd001a.setChangeType(ChangeTypeEnum.RELEASE.getCode());
                 hgwd001a.setMatId(hgwd001.getId());
                 hgwd001a.setChangeContent("发布");
-                if (wd001 != null){
-                    hgwd001a.setChangeStart(wd001.getFileName());
-                }
-                hgwd001a.setChangeEnd(hgwd001.getFileName());
+                hgwd001a.setChangeStart("V".concat(hgwd001.getDocVersion()+""));
+                hgwd001a.setChangeEnd("V".concat(hgwd001.getDocVersion()+1+""));
                 HGWDTools.HgWd001.add(hgwd001a);
-                hgwd001.setDocVersion(hgwd001.getDocVersion() + 1);
                 hgwd001.setStatus(HgWdConstant.FileStatus.S_1);
                 hgwd001.setReleaseDate(DateUtils.shortDateTime());
                 DaoUtils.update(HGWD001.RELEASE_DATE, hgwd001);

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

@@ -185,6 +185,7 @@
         UPDATE ${hggpSchema}.HGWD001
         SET
         RELEASE_DATE = #releaseDate#,  <!--发布时间-->
+        DOC_VERSION = DOC_VERSION + 1, <!--版本号-->
         STATUS = #status#,   <!-- 状态 -->
         <include refid="SqlBase.updateRevise"/>
         WHERE ID = #id#

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

@@ -148,9 +148,9 @@ let save = function (btnNode) {
         return;
     }
     let flag = true;
-    /*$.each(rows, function(index, item) {
+    $.each(rows, function(index, item) {
         let companyCode= item.get("companyCode");
-        let projCode= item.get("projCode");
+        let projCode= item.get("projName");
         if(isBlank(companyCode)){
             message("选中的第"+(index+1)+"行\"公司\"，不能为空!");
             flag = false;
@@ -161,7 +161,7 @@ let save = function (btnNode) {
             flag = false;
             return false;
         }
-    });*/
+    });
     if(flag) {
         JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
             ok: function () {

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

@@ -42,7 +42,7 @@
             <EF:EFComboColumn ename="companyCode" cname="公司名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="true" width="210" required="true"
+                              maxLength="16" readonly="true" width="160" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
@@ -56,7 +56,7 @@
                 <EF:EFCodeOption codeName="hggp.hgwd.fileType"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="fileName" cname="文件名称" width="160" enable="true" readonly="false" align="center" required="true"/>
-            <EF:EFColumn ename="fileId" cname="文件号" width="100" enable="true" readonly="true" align="center" required="true"/>
+            <EF:EFColumn ename="fileId" cname="文件号" width="100" enable="true" readonly="true" align="center" required="false"/>
             <EF:EFColumn ename="createdName" cname="创建人" align="center" width="100" readonly="true" required="false"
                          enable="false"/>
             <EF:EFColumn ename="createdTime" cname="创建时间" parseFormats="['yyyyMMddHHmmss']" editType="datetime"

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

@@ -42,22 +42,22 @@
             <EF:EFComboColumn ename="companyCode" cname="公司名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="false" width="160" required="true"
+                              maxLength="16" readonly="false" width="160" required="false"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="projName" cname="所属项目" width="160" enable="true" readonly="false" align="center" required="true"/>
+            <EF:EFColumn ename="projName" cname="所属项目" width="160" enable="true" readonly="false" align="center" required="false"/>
            <%-- <EF:EFComboColumn ename="projCode" cname="所属项目" blockName="proj_record_block_id"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="false" width="200" required="true"
                               align="center" filter="contains" sort="true" />--%>
-            <EF:EFComboColumn ename="changeType" cname="变更类型" width="100" align="center" readonly="true" required="true" defaultValue="20">
+            <EF:EFComboColumn ename="changeType" cname="变更类型" width="100" align="center" readonly="true" required="false" defaultValue="20">
                 <EF:EFCodeOption codeName="hggp.hgwd.changeType"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="changeContent" cname="变更内容" width="160" enable="true" readonly="true" align="center" required="true"/>
-            <EF:EFColumn ename="changeStart" cname="变更前" width="160" enable="true" readonly="false" align="center" required="true"/>
-            <EF:EFColumn ename="changeEnd" cname="变更后" width="160" enable="true" readonly="true" align="center" required="true"/>
+            <EF:EFColumn ename="changeContent" cname="变更内容" width="160" enable="true" readonly="true" align="center" required="false"/>
+            <EF:EFColumn ename="changeStart" cname="变更前" width="160" enable="true" readonly="false" align="center" required="false"/>
+            <EF:EFColumn ename="changeEnd" cname="变更后" width="160" enable="true" readonly="true" align="center" required="false"/>
             <EF:EFColumn ename="createdName" cname="创建人" align="center" width="100" readonly="true" required="false"
                          enable="false"/>
             <EF:EFColumn ename="createdTime" cname="创建时间" parseFormats="['yyyyMMddHHmmss']" editType="datetime"