项目文件上传后及时下载不成功修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -1332,19 +1332,21 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 
     public ProjectReportRecord getProjectReportRecord(String reportId){
         ProjectReportRecord projectReportRecord = dao.getProjectReportRecord(reportId);
-        if (projectReportRecord!=null && com.jeeplus.common.utils.StringUtils.isNotBlank(projectReportRecord.getId())){
-            Workattachment workattachment = new Workattachment();
-            workattachment.setAttachmentId(projectReportRecord.getId());
-            workattachment.setAttachmentFlag("99");
-            projectReportRecord.setWorkAttachments(workattachmentService.findList(workattachment));
-        }
-        if (projectReportRecord.getSignCostOne()!=null && com.jeeplus.common.utils.StringUtils.isNotBlank(projectReportRecord.getSignCostOne().getId())){
-            User signCostOne = UserUtils.get(projectReportRecord.getSignCostOne().getId());
-            projectReportRecord.setSignCostOne(signCostOne);
-        }
-        if (projectReportRecord.getSignCostTwo()!=null && com.jeeplus.common.utils.StringUtils.isNotBlank(projectReportRecord.getSignCostTwo().getId())){
-            User signCostTwo = UserUtils.get(projectReportRecord.getSignCostTwo().getId());
-            projectReportRecord.setSignCostTwo(signCostTwo);
+        if(projectReportRecord != null){
+            if (com.jeeplus.common.utils.StringUtils.isNotBlank(projectReportRecord.getId())){
+                Workattachment workattachment = new Workattachment();
+                workattachment.setAttachmentId(projectReportRecord.getId());
+                workattachment.setAttachmentFlag("99");
+                projectReportRecord.setWorkAttachments(workattachmentService.findList(workattachment));
+            }
+            if (projectReportRecord.getSignCostOne()!=null && com.jeeplus.common.utils.StringUtils.isNotBlank(projectReportRecord.getSignCostOne().getId())){
+                User signCostOne = UserUtils.get(projectReportRecord.getSignCostOne().getId());
+                projectReportRecord.setSignCostOne(signCostOne);
+            }
+            if (projectReportRecord.getSignCostTwo()!=null && com.jeeplus.common.utils.StringUtils.isNotBlank(projectReportRecord.getSignCostTwo().getId())){
+                User signCostTwo = UserUtils.get(projectReportRecord.getSignCostTwo().getId());
+                projectReportRecord.setSignCostTwo(signCostTwo);
+            }
         }
         return projectReportRecord;
     }
@@ -2362,6 +2364,6 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         //修改项目表中字段信息
         dao.updateReported(records);
         //完成上报
-        return "上报成功";
+        return "";
     }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -171,12 +171,14 @@ public class RuralProjectRecordsController extends BaseController {
 			List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
 			projectRecords.setProjectPlanList(projectPlanList);
 			projectRecords.setWorkAttachments(projectPlanAttachment);
-			//处理项目类别
-			List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
-			for (MainDictDetail info: mainDictList) {
-				if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
-					projectRecords.setAttachmentProjectSort(info.getLabel());
-					break;
+			if(StringUtils.isNotBlank(projectRecords.getAttachmentProjectSort())){
+				//处理项目类别
+				List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+				for (MainDictDetail info: mainDictList) {
+					if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
+						projectRecords.setAttachmentProjectSort(info.getLabel());
+						break;
+					}
 				}
 			}
 

src/main/java/com/jeeplus/modules/utils/SftpClientUtil.java

@@ -104,6 +104,8 @@ public class SftpClientUtil {
      * @throws Exception
      */
     public void delete(String deleteFile) throws Exception {
+        //截取文件保存路径
+        deleteFile=deleteFile.substring(deleteFile.indexOf("?file=")+6,deleteFile.length());
         if(StringUtils.isNotBlank(host) && ("127.0.0.1".equals(host) || "localhost".equals(host))) {
             //根据路径创建文件对象
             File file = new File(deleteFile);

src/main/java/com/jeeplus/modules/utils/ViewFileUtil.java

@@ -41,6 +41,9 @@ public class ViewFileUtil {
     /** 文件存储方式（0：本地服务器存储。1：云端存储） */
     private final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
 
+    /** 文件服务器IP地址 */
+    private final static String visit = Global.getConfig("remoteServer.visit");
+
     /**
      * 判断存储位置
      * @return
@@ -53,9 +56,9 @@ public class ViewFileUtil {
      * 返回服务器ip和端口号
      */
     public static String getServerIPAndPort(){
-        String ipAndPort = null;
+        String ipAndPort = visit;
 
-        try {
+        /*try {
             //获取外网ip
             String ip = getOutIPV4();
             //获取端口号
@@ -67,7 +70,7 @@ public class ViewFileUtil {
             ipAndPort = ip +":" +port;
         } catch (Exception e) {
             e.printStackTrace();
-        }
+        }*/
         return ipAndPort;
     }
 

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementTypeController.java

@@ -88,7 +88,6 @@ public class WorkReimbursementTypeController extends BaseController {
      * @param model
      * @return
      */
-    @RequiresPermissions(value={"reimbursementType:reimbursementType:view"},logical=Logical.OR)
     @RequestMapping(value = "view")
     public String view(WorkReimbursementTypeInfo workReimbursementTypeInfo, Model model) {
         if(workReimbursementTypeInfo!=null&&workReimbursementTypeInfo.getParent()!=null&&StringUtils.isNotBlank(workReimbursementTypeInfo.getParent().getId())){

src/main/resources/jeeplus.properties

@@ -276,3 +276,6 @@ remoteServer.winDirectory =d:/attachment-file
 
 #\u6587\u4EF6\u5B58\u50A8\u65B9\u5F0F\uFF080\uFF1A\u672C\u5730\u670D\u52A1\u5668\u5B58\u50A8\u30021\uFF1A\u4E91\u7AEF\u5B58\u50A8\uFF09
 remoteServer.uploadMode =0
+
+#\u6587\u4EF6\u670D\u52A1\u5668IP\u5730\u5740
+remoteServer.visit =

src/main/webapp/webpage/modules/ruralprojectrecords/subProjectInfo/subProjectFileForm.jsp

@@ -28,7 +28,7 @@
                 <div class="ibox float-e-margins">
                     <div class="ibox-content">
                         <div class="page-container">
-                            <p>您可以尝试文件拖拽或者点击添加压缩文件按钮，来上传文件（仅可上传 zip、rar、7z文件）.</p>
+                            <p>您可以尝试文件拖拽或者点击添加压缩文件按钮，来上传文件（仅可上传 zip、7z文件）.</p>
                             <p style="color: red">如果项目定义号重复则将会进行替代原项目信息</p>
                             <div id="uploader" class="wu-example">
                                 <div class="queueList">
@@ -130,8 +130,8 @@
 
             accept: {
                 title: '',
-                extensions: 'zip,rar,7z',
-                mimeTypes: 'zip,rar,7z'
+                extensions: 'zip,7z',
+                mimeTypes: 'zip,7z'
             },
 
             // swf文件路径