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

重点工程部分代码

pull/14/head
z 2023-12-28 10:23:30 +08:00
parent bd49c64ae5
commit 77bdb85662
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/zcloud/controller/app/AppImgFilesController.java
View File

@ -1,16 +1,15 @@
package com.zcloud.controller.app;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.mq.DockSendMessageService;
import com.zcloud.util.*;
import org.apache.commons.io.FileUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
@ -19,13 +18,12 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import org.apache.commons.io.FileUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.ImgFilesService;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 说明：图片管理
@ -51,6 +49,7 @@ public class AppImgFilesController extends BaseController {
@RequestMapping(value = "/add", headers = "content-type=multipart/form-data")
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object finish(
@RequestParam(value = "FFILE", required = false) MultipartFile[] files,
@RequestParam(value = "TYPE", required = false) String TYPE,

8
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java
View File

@ -56,7 +56,7 @@ public class AppKeyprojectCheckController extends BaseController {
*/
@RequestMapping(value="/add")
@ResponseBody
@DockAnnotation(isAdd = true)
@DockAnnotation(hasAnnex = true)
public Object add() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -138,7 +138,7 @@ public class AppKeyprojectCheckController extends BaseController {
hiddenList.add(hidden);
time = DateUtil.calculateDateSecond(time, 1);
}
pd.put("HIDDEN", hiddenList);
pd.put("HIDDEN", JSON.toJSONString(hiddenList));
}
try {
//这里发送短信 通知 先判断重点工程是否要求发短信, 不发直接过，发的话 找到对应人以及对应手机号 发送对应模板短信啊
@ -266,8 +266,8 @@ public class AppKeyprojectCheckController extends BaseController {
List<PageData> situationList = keyprojectcheckInfoService.listAll(pd);
pd.put("FOREIGN_ID", pd.getString("KEYPROJECTCHECK_ID"));
pd.put("hiddenList", keyprojectHiddenService.listAllInspection(pd));
pd.put("situationList", situationList);
pd.put("hiddenList", JSON.toJSONString(keyprojectHiddenService.listAllInspection(pd)));
pd.put("situationList", JSON.toJSONString(situationList));
map.put("pd", pd);
map.put("result", errInfo);
return map;