Merge remote-tracking branch 'origin/master'

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/utils/EasyExcelUtils.java

@@ -124,7 +124,7 @@ public class EasyExcelUtils {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
         String fileName = URLEncoder.encode(rawFileName, "UTF-8").replaceAll("\\+", "%20");
-        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
     }
 
     /**

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtPlanServiceImpl.java

@@ -192,7 +192,7 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
                     case "新增":
                         //先校验
                         stringBuffer = this.checkPlan(excelVO, i, stringBuffer, projectId);
-                        stringBuffer = this.checkFileNumber(excelVO, i, stringBuffer);
+                        /*stringBuffer = this.checkFileNumber(excelVO, i, stringBuffer);*/
                         addPlans.add(excelVO);
                         break;
                     case "更改":
@@ -327,8 +327,8 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
                 return "";
             } else {
                 for (DictDataVO dictDataVO : dictDatasByDictCode) {
-                    if (dictKey.equals(dictDataVO.getDictKey())) {
-                        return dictDataVO.getDictValue();
+                    if (dictKey.equals(dictDataVO.getDictValue())) {
+                        return dictDataVO.getDictKey();
                     }
                 }
                 return "";
@@ -397,7 +397,7 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
      * @param stringBuffer
      * @return
      */
-    private StringBuffer checkFileNumber(PlanExcelVO excelVO, int i, StringBuffer stringBuffer) {
+/*    private StringBuffer checkFileNumber(PlanExcelVO excelVO, int i, StringBuffer stringBuffer) {
         //fileNumber可能会已存在，校验编号重复问题
         DxDocumentVO searchDocByNumber = this.searchDocByNumber(excelVO.getFileNumber());
         if (!ObjectUtils.isEmpty(searchDocByNumber)) {
@@ -405,7 +405,7 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
         }
 
         return stringBuffer;
-    }
+    }*/
 
     /**
      * 通过number查询文档
@@ -553,7 +553,8 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
         extPlanVO.setNumber(planExcelVO.getNumber());
         extPlanVO.setOperator(operatorType);
         // 密级
-        extPlanVO.setSecretCode(planExcelVO.getSecretCode());
+        String secretCodeKey = this.searchDictDataByDictCode(Constants.SECRET_CODE, planExcelVO.getSecretCode());
+        extPlanVO.setSecretCode(secretCodeKey);
         // 反馈类型
         String feedbackType = extPlanVO.getFeedbackType();
         switch (feedbackType) {

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtSupplierManageServiceImpl.java

@@ -150,7 +150,7 @@ public class ExtSupplierManageServiceImpl<V extends ExtSupplierManageVO> impleme
         log.info("changeStatus.条数：{}", content.size());
         for (ExtSupplierManageVO extSupplierManageVO : content) {
             Long id = extSupplierManageVO.getId();
-            this.changeStatus(id, "Expired", true);
+            this.changeStatus(id, Constants.CONTEXT_DISABLE, true);
         }
     }