Merge remote-tracking branch 'origin/czks1.0' into czks1.0

src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java

@@ -2,6 +2,7 @@ package com.zcloud.controller.keyProjects;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.zcloud.aspect.DockAnnotation;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
@@ -43,6 +44,7 @@ public class KeyprojectCheckController extends BaseController {
 	 */
 	@RequestMapping(value="/add")
 	@ResponseBody
+	@DockAnnotation(isAdd = true)
 	public Object add() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -111,6 +113,7 @@ public class KeyprojectCheckController extends BaseController {
 			pd.put("hiddenList", hiddenList);
 		}
 		map.put("pd", pd);
+		map.put("dockData", JSON.toJSONString(pd));
 		map.put("result", errInfo);
 		return map;
 	}

src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java

@@ -59,7 +59,7 @@ public class OutSourcedController extends BaseController {
     @RequestMapping(value = "/add")
     @RequiresPermissions("outsourced:add")
     @ResponseBody
-    @DockAnnotation(isAdd = true)
+    @DockAnnotation(isAdd = true,hasAnnex = true)
     public Object add(@RequestParam(value = "file", required = false) MultipartFile file,
                       @RequestParam(value = "file1", required = false) MultipartFile file1,
                       @RequestParam(value = "file2", required = false) MultipartFile file2,
@@ -86,7 +86,6 @@ public class OutSourcedController extends BaseController {
         pd.put("IS_CORP_TYPE", "1");    //是否企业重点工程0监管重点工程;1企业重点工程
 
         ArrayList<String> strings = new ArrayList<>();
-
         if (null != file && !file.isEmpty()) {
             String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
             if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
@@ -113,6 +112,8 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file1, fileName, Const.FILEPATHFILE + ffile);
             pd.put("MEASURES", Const.FILEPATHFILE + ffile + "/" + fileName);
+            strings.add(Const.FILEPATHFILE + ffile + "/" + fileName);
+
         }
         if (null != file2 && !file2.isEmpty()) {
             String suffixName = file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -126,6 +127,7 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file2.getOriginalFilename().substring(file2.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file2, fileName, Const.FILEPATHFILE + ffile);
             pd.put("MANAGE_APTITUDE", Const.FILEPATHFILE + ffile + "/" + fileName);
+            strings.add(Const.FILEPATHFILE + ffile + "/" + fileName);
         }
         if (null != file3 && !file3.isEmpty()) {
             String suffixName = file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -139,6 +141,7 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file3.getOriginalFilename().substring(file3.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file3, fileName, Const.FILEPATHFILE + ffile);
             pd.put("DESIGE", Const.FILEPATHFILE + ffile + "/" + fileName);
+            strings.add(Const.FILEPATHFILE + ffile + "/" + fileName);
         }
         if (null != file4 && !file4.isEmpty()) {
             String suffixName = file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -152,6 +155,7 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file4.getOriginalFilename().substring(file4.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file4, fileName, Const.FILEPATHFILE + ffile);
             pd.put("ATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName);
+            strings.add(Const.FILEPATHFILE + ffile + "/" + fileName);
         }
         if (null != file5 && !file5.isEmpty()) {
             String suffixName = file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -165,6 +169,7 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file5.getOriginalFilename().substring(file5.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file5, fileName, Const.FILEPATHFILE + ffile);
             pd.put("RECORDS", Const.FILEPATHFILE + ffile + "/" + fileName);
+            strings.add(Const.FILEPATHFILE + ffile + "/" + fileName);
         }
         if (null != file6 && !file6.isEmpty()) {
             String suffixName = file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -178,6 +183,7 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file6.getOriginalFilename().substring(file6.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file6, fileName, Const.FILEPATHFILE + ffile);
             pd.put("SHEET", Const.FILEPATHFILE + ffile + "/" + fileName);
+            strings.add(Const.FILEPATHFILE + ffile + "/" + fileName);
         }
         if (null != file7 && !file7.isEmpty()) {
             String suffixName = file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -191,6 +197,7 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file7.getOriginalFilename().substring(file7.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file7, fileName, Const.FILEPATHFILE + ffile);
             pd.put("EXAMINATION", Const.FILEPATHFILE + ffile + "/" + fileName);
+            strings.add(Const.FILEPATHFILE + ffile + "/" + fileName);
         }
         if (null != file8 && !file8.isEmpty()) {
             String suffixName = file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@@ -204,6 +211,7 @@ public class OutSourcedController extends BaseController {
             String fileName = this.get32UUID() + file8.getOriginalFilename().substring(file8.getOriginalFilename().lastIndexOf("."));
             Smb.sshSftp(file8, fileName, Const.FILEPATHFILE + ffile);
             pd.put("OATTACHMENTS", Const.FILEPATHFILE + ffile + "/" + fileName);
+            strings.add(Const.FILEPATHFILE + ffile + "/" + fileName);
         }
 
         if (null != file9 && file9.length > 0) {
@@ -242,9 +250,9 @@ public class OutSourcedController extends BaseController {
         //}
         pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID());
         outsourcedService.save(pd);
+        pd.put("pictList",strings);
         map.put("dockData", JSON.toJSONString(pd));
         map.put("result", errInfo);
-        map.put("sendPicturesList", strings);
         return map;
     }
 

src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java

@@ -3,6 +3,7 @@ package com.zcloud.controller.keyProjects.app;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zcloud.aspect.DockAnnotation;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
@@ -55,6 +56,7 @@ public class AppKeyprojectCheckController extends BaseController {
 	 */
 	@RequestMapping(value="/add")
 	@ResponseBody
+	@DockAnnotation(isAdd = true)
 	public Object add() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
@@ -117,6 +119,7 @@ public class AppKeyprojectCheckController extends BaseController {
 				hidden.put("ISDELETE", "0");    //是否删除(0:有效 1：删除)
 				hidden.put("POSITIONDESC",json.getString("POSITIONDESC"));// 隐患位置描述
 
+
 				keyprojectHiddenService.save(hidden);
 				hiddenList.add(hidden);
 				time = DateUtil.calculateDateSecond(time, 1);
@@ -174,6 +177,7 @@ public class AppKeyprojectCheckController extends BaseController {
 			e.printStackTrace();
 		}finally {
 			map.put("pd", pd);
+			map.put("dockData", JSON.toJSONString(pd));
 			map.put("result", errInfo);
 		}
 		return map;