Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/controller/FileUploadController.java

@@ -16,9 +16,11 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import net.sf.json.JSONObject;
+import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -30,7 +32,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping({"/upload/file"})
 public class FileUploadController {
-	
+
 	/**
 	 * 更具docId上传文件
 	 *
@@ -44,7 +46,11 @@ public class FileUploadController {
 			JSONObject upload = new JSONObject();
 			String projectEnv = ProjectInfo.getProjectEnv();
 			if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
-				upload = UploadUtils.upload((CommonsMultipartFile)file);
+				Iterator multiFileIterator = ((DefaultMultipartHttpServletRequest) request).getMultiFileMap().get("uploadFile").iterator();
+				while(multiFileIterator.hasNext()) {
+					CommonsMultipartFile multipartFile = (CommonsMultipartFile)multiFileIterator.next();
+					upload = UploadUtils.upload(multipartFile);
+				}
 			}else {
 				upload = UploadUtils.uploadFile(request);
 			}
@@ -58,7 +64,7 @@ public class FileUploadController {
 			return resultMap;
 		}
 	}
-	
+
 	/**
 	 * @param content
 	 * @return
@@ -75,5 +81,5 @@ public class FileUploadController {
 			return resultMap;
 		}
 	}
-	
+
 }

src/main/java/com/baosight/hggp/core/security/UserSessionUtils.java

@@ -133,6 +133,27 @@ public class UserSessionUtils extends UserSession {
 	}
 	
 	/**
+	 * 获取登录用户的所有组
+	 *
+	 * @return
+	 */
+	public static List<String> getAllGroupCode() {
+		List<Org> orgs = HGXSTools.XsOrg.queryByUser();
+		if (CollectionUtils.isEmpty(orgs)) {
+			return new ArrayList<>();
+		}
+		List<String> prodGroupCodes = new ArrayList<>();
+		for (Org org : orgs) {
+			if (OrgTypeEnum.PROD_GROUP.getCode().equals(org.getOrgType())
+					|| OrgTypeEnum.CUT_GROUP.getCode().equals(org.getOrgType())
+					|| OrgTypeEnum.SYN_GROUP.getCode().equals(org.getOrgType())) {
+				prodGroupCodes.add(org.getOrgId());
+			}
+		}
+		return prodGroupCodes;
+	}
+	
+	/**
 	 * 获取登录用户所有角色
 	 *
 	 * @return

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">	<!--      table information
-		Generate time : 2024-05-23 17:55:59
-   		Version :  1.0
-		schema : hggp
-		tableName : HGSC007
-		 id  BIGINT   NOT NULL   primarykey,
-		 order_id  BIGINT   NOT NULL,
-		 order_detail_id  BIGINT   NOT NULL,
-		 tech_flow_id  BIGINT,
-		 tech_flow_name  BIGINT,
-		 invent_process_id  BIGINT,
-		 process_code  VARCHAR,
-		 process_name  VARCHAR,
-		 process_order  BIGINT,
-		 company_code  VARCHAR   NOT NULL,
-		 company_name  VARCHAR   NOT NULL,
-		 dep_code  VARCHAR,
-		 dep_name  VARCHAR,
-		 proj_code  VARCHAR,
-		 proj_name  VARCHAR,
-		 task_code  VARCHAR,
-		 product_type  TINYINT,
-		 product_code  VARCHAR,
-		 product_name  VARCHAR,
-		 plan_start_date  VARCHAR,
-		 plan_end_date  VARCHAR,
-		 factory_code  VARCHAR,
-		 factory_name  VARCHAR,
-		 group_code  VARCHAR,
-		 group_name  VARCHAR,
-		 complete_date  VARCHAR,
-		 quantity  TINYINT,
-		 finish_quantity  TINYINT,
-		 unfinish_quantity  TINYINT,
-		 single_weight  DECIMAL,
-		 total_weight  DECIMAL,
-		 finish_weight  DECIMAL,
-		 unfinish_weight  DECIMAL,
-		 account_code  VARCHAR   NOT NULL,
-		 created_by  VARCHAR,
-		 created_name  VARCHAR,
-		 created_time  VARCHAR,
-		 updated_by  VARCHAR,
-		 updated_name  VARCHAR,
-		 updated_time  VARCHAR
-	-->
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
 <sqlMap namespace="HGSC007">
 
 	<sql id="condition">
@@ -184,6 +139,13 @@
 			ifnull(complete_date,'') != ''
 		</isEqual>
 	</sql>
+
+    <sql id="customCondition">
+        <isNotEmpty prepend=" AND " property="groupCodes">
+            GROUP_CODE IN <iterate close=")" open="(" conjunction="," property="groupCodes">#groupCodes[]#</iterate>
+        </isNotEmpty>
+    </sql>
+
 	<sql id="appCondition">
 		<!-- 无权限时使用 -->
 		<isNotEmpty prepend=" AND " property="authDepCode">

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

@@ -108,7 +108,7 @@
                 $orderBy$
             </isNotEmpty>
             <isEmpty property="orderBy">
-                ID desc
+                ID DESC
             </isEmpty>
         </dynamic>
     </sql>

src/main/java/com/baosight/hggp/hg/wd/tools/HGWDTools.java

 package com.baosight.hggp.hg.wd.tools;
 
-import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoBase;
 import com.baosight.hggp.core.dao.DaoUtils;
-import com.baosight.hggp.hg.sb.domain.HGSB002;
 import com.baosight.hggp.hg.wd.constant.HgWdSqlConstant;
 import com.baosight.hggp.hg.wd.domain.HGWD001;
 import com.baosight.hggp.hg.wd.domain.HGWD001A;
 import com.baosight.hggp.util.AssertUtils;
-
 import org.apache.commons.collections.CollectionUtils;
 
 import java.util.HashMap;
@@ -32,7 +29,7 @@ public class HGWDTools {
 		 * @return
 		 */
 		public static HGWD001 get(String fileId) {
-			AssertUtils.isNull(fileId, "文件ID不能为空");
+			AssertUtils.isEmpty(fileId, "文件ID不能为空");
 			Map queryMap = new HashMap();
 			queryMap.put(HGWD001.FIELD_FILE_ID, fileId);
 			List<HGWD001> results = DaoBase.getInstance().query(HGWD001.QUERY, queryMap);
@@ -57,7 +54,7 @@ public class HGWDTools {
 		 * @param fileId
 		 */
 		public static void previewIncr(String fileId) {
-			AssertUtils.isNull(fileId, "文件ID不能为空");
+			AssertUtils.isEmpty(fileId, "文件ID不能为空");
 			Map queryMap = new HashMap();
 			queryMap.put(HGWD001.FIELD_FILE_ID, fileId);
 			DaoUtils.update(HgWdSqlConstant.HgWd001.PREVIEW_INCR, queryMap);
@@ -69,7 +66,7 @@ public class HGWDTools {
 		 * @param fileId
 		 */
 		public static void downloadIncr(String fileId) {
-			AssertUtils.isNull(fileId, "文件ID不能为空");
+			AssertUtils.isEmpty(fileId, "文件ID不能为空");
 			Map queryMap = new HashMap();
 			queryMap.put(HGWD001.FIELD_FILE_ID, fileId);
 			DaoUtils.update(HgWdSqlConstant.HgWd001.DOWNLOAD_INCR, queryMap);

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

@@ -21,7 +21,7 @@ $(function () {
 			}, {
 				field: "docVersion",
 				template: function (model) {
-					return "V" + model.docVersion;
+					return "v" + model.docVersion;
 				}
 			}],
 			loadComplete: function (grid) {

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

@@ -34,6 +34,8 @@
 			<EF:EFColumn ename="docVersion" cname="版本号" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="docId" cname="文件号" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="docName" cname="文件附件名称" enable="false" width="100" align="left"/>
+			<EF:EFColumn ename="previewNum" cname="预览次数" enable="false" width="100" align="right"/>
+			<EF:EFColumn ename="downloadNum" cname="下载次数" enable="false" width="100" align="right"/>
 		</EF:EFGrid>
 	</EF:EFRegion>