修复安全环保检查申辩流程通过后的编辑操作中检查人确认图片丢失问题
parent
58123cad6c
commit
54ffb49e8b
|
@ -366,7 +366,7 @@ public class SafetyEnvironmentalController extends BaseController {
|
|||
@RequestMapping(value = "/edit")
|
||||
@RequiresPermissions("safetyenvironmental:edit")
|
||||
@ResponseBody
|
||||
@DockAnnotation
|
||||
@DockAnnotation(hasAnnex = true)
|
||||
public Object edit() throws Exception {
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
String errInfo = "success";
|
||||
|
@ -377,6 +377,7 @@ public class SafetyEnvironmentalController extends BaseController {
|
|||
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
|
||||
pd.put("CORPINFO_ID", "1".equals(Jurisdiction.getUSER_ID()) ? "" : Jurisdiction.getCORPINFO_ID()); //企业ID
|
||||
pd.put("ACTION_USER", Jurisdiction.getName()); //操作人
|
||||
ArrayList<String> strings = new ArrayList<>();
|
||||
if (StringUtils.isNotBlank(pd.getString("CONFIRM_MESSAGE_SIGN"))) {
|
||||
MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("CONFIRM_MESSAGE_SIGN"));
|
||||
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
|
||||
|
@ -390,10 +391,12 @@ public class SafetyEnvironmentalController extends BaseController {
|
|||
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
|
||||
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
|
||||
pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
|
||||
strings.add(pd.getString("CONFIRM_MESSAGE_SIGN_ROUTE")+"@@"+fileName);
|
||||
}
|
||||
List<PageData> hiddenList = safetyenvironmentalService.edit(pd);
|
||||
pd.put("hiddenList", hiddenList);
|
||||
map.put("pd", pd);
|
||||
map.put("sendPicturesList",JSON.toJSONString(strings));
|
||||
map.put("result", errInfo);
|
||||
map.put("dockData", JSON.toJSONString(pd));
|
||||
return map;
|
||||
|
|
Loading…
Reference in New Issue