指标积分个性化修改

src/main/java/com/keymobile/indicators/model/entity/scorecard/IndScorecard.java

@@ -28,6 +28,7 @@ public class IndScorecard {
 	private Double compLimitScore;
 	
 	private String scoreType;//综合评分类型  0:定义    1：公式
+	private String improveScoreType;//改善提升类型(新增字段2022-03-31) 0:普通	1:公式
 	//定义综合评价
 	private Double indBaseScore;//基础分
 	private Double moreAverage;//大于组内平均分加分
@@ -61,12 +62,22 @@ public class IndScorecard {
 
 	private Double improveBaseScore;//改善提升基础分，新增改善提升基础分-hzc 2020 12 29
 
-
 	private String sectionFormula;//区间公式表达式
 
-
 	private Double compLimitFloorScore;//综合评价下限
 
 	private Double limitFloorScore;//改善提升下限
 
+	private Double improveLimitScore;// 改善提升积分上限(新增字段2022-03-31)
+
+	private Double improveLimitFloorScore;// 改善提升积分下限(新增字段2022-03-31)
+
+	private String improveFormulaInfo;//(新增字段2022-03-31)
+
+	private String improveOtherCalFormula;// 改善提升公式积分公式(新增字段2022-03-31)
+
+	private Double improveBestScore;// 改善提升同比值最佳积分(新增字段2022-03-31)
+
+	private Double improveWorstScore;// 改善提升同比值最差积分(新增字段2022-03-31)
+
 }

src/main/java/com/keymobile/indicators/model/entity/uploadfile/UploadFile.java

@@ -23,4 +23,5 @@ public class UploadFile {
 	private String uploadUser;//上传用户名
 	private String uploadDate;//上传时间
 	private String code;//机构编码
+	private String orgName;//机构名称
 }

src/main/java/com/keymobile/indicators/service/uploadfile/UploadFileService.java

 package com.keymobile.indicators.service.uploadfile;
 
 import java.io.InputStream;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson.JSONObject;
+import com.keymobile.indicators.service.SystemAuthService;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,6 +26,8 @@ public class UploadFileService {
 	
 	@Autowired
 	private UploadFileMapper uploadFileMapper;
+	@Autowired
+	private SystemAuthService systemAuthService;
 	
 	@Value("${uploadfile.path}")
 	private String uploadFilePath;
@@ -34,6 +35,7 @@ public class UploadFileService {
 	//上传文件
 	public void uploadFile(InputStream in,String fileName,String fileType,
 			String user,String code) throws Exception{
+		fileName = this.filterFilename(fileName);
 		//先保存文件详情到数据库中
 		UploadFile uploadFile = new UploadFile();
 		if(StringUtils.isNotBlank(fileType)) {
@@ -46,6 +48,12 @@ public class UploadFileService {
 		uploadFile.setUploadUser(user);
 		uploadFile.setUploadDate(DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
 		uploadFile.setCode(code);
+		List<String> codes = new ArrayList<>();
+		codes.add(code);
+		List<JSONObject> jsonObjects = systemAuthService.getByNos(codes);
+		for (JSONObject object : jsonObjects){
+			uploadFile.setOrgName(object.getString("name"));
+		}
 		//保存
 		uploadFileMapper.insert(uploadFile);
 		//设置上传文件路径
@@ -81,6 +89,9 @@ public class UploadFileService {
 			int page,int rows)throws Exception{
 		Map<String,Object> resultMap = new HashMap<>();
 		Map<String,Object> paramMap = new HashMap<>();
+		if(code.length()>2){
+			code = code.substring(0,code.length()-2);
+		}
 		paramMap.put("code", code+"%");
 		if(StringUtils.isBlank(keyword)) {
 			paramMap.put("keyword", null);
@@ -105,4 +116,26 @@ public class UploadFileService {
 	public void deleteUploadFile(List<Integer> ids) {
 		uploadFileMapper.deleteByIdIn(ids);
 	}
+
+	/**
+	 * 过滤文件名称
+	 * @param filename
+	 * @return
+	 */
+	private String filterFilename(String filename) {
+		String newFileName;
+		// 看是否unix带路径格式
+		int unixSep = filename.lastIndexOf('/');
+		// 看是否win带路径格式
+		int winSep = filename.lastIndexOf('\\');
+		// 检查分隔符长度  winSep == -1 && unixSep == -1 则filename不带路径格式
+		int pos = (winSep > unixSep ? winSep : unixSep);
+		if (pos != -1)  {
+			// 只获取分隔符后文件名
+			filename = filename.substring(pos + 1);
+		}
+		newFileName = filename;
+		return newFileName;
+	}
+
 }