guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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

pull/14/head
liulixin 2024-01-23 18:05:39 +08:00
parent cfcd363e36 d8b0f384e2
commit 9e0f486228
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/zcloud/controller/app/AppPromiseController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.app; package com.zcloud.controller.app;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page; import com.zcloud.entity.Page;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
@ -16,10 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Date; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* 说明：手机承诺书表 * 说明：手机承诺书表
@ -61,6 +60,7 @@ public class AppPromiseController extends BaseController {
}else { }else {
map.put("ISSIGN", 0); map.put("ISSIGN", 0);
} }
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -98,12 +98,14 @@ public class AppPromiseController extends BaseController {
*/ */
@RequestMapping(value="/editpeople") @RequestMapping(value="/editpeople")
@ResponseBody @ResponseBody
@DockAnnotation(hasAnnex = true)
public Object editpeople(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{ public Object editpeople(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
String ffile = DateUtil.getDays(); String ffile = DateUtil.getDays();
List<String> sendPicturesList = new ArrayList<>();
if (file != null){ if (file != null){
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); 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)) { if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
@ -115,6 +117,7 @@ public class AppPromiseController extends BaseController {
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("FILEPATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
sendPicturesList.add(pd.getString("FILEPATH") + "@@" + fileName);
pd.put("SIGNTIME", pd.getString("SIGNTIME")); pd.put("SIGNTIME", pd.getString("SIGNTIME"));
pd.put("ISSIGN",1); pd.put("ISSIGN",1);
pd.put("ISREAD","0"); pd.put("ISREAD","0");
@ -141,6 +144,8 @@ public class AppPromiseController extends BaseController {
} }
} }
} }
map.put("sendPicturesList", JSON.toJSONString(sendPicturesList));
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }
@ -213,6 +218,7 @@ public class AppPromiseController extends BaseController {
*/ */
@RequestMapping(value="/editIsRead") @RequestMapping(value="/editIsRead")
@ResponseBody @ResponseBody
@DockAnnotation
public Object editIsRead() throws Exception{ public Object editIsRead() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
@ -221,6 +227,7 @@ public class AppPromiseController extends BaseController {
pd.put("ISREAD","1"); pd.put("ISREAD","1");
corpPromisePeopleService.editIsRead(pd); //阅读状态修改为已阅 corpPromisePeopleService.editIsRead(pd); //阅读状态修改为已阅
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }
} }