diff --git a/src/main/java/cn/com/tenlion/systemoa/controller/api/mail/MailController.java b/src/main/java/cn/com/tenlion/systemoa/controller/api/mail/MailController.java index ba4a1bb..dd68ba8 100644 --- a/src/main/java/cn/com/tenlion/systemoa/controller/api/mail/MailController.java +++ b/src/main/java/cn/com/tenlion/systemoa/controller/api/mail/MailController.java @@ -94,7 +94,7 @@ public class MailController extends DefaultBaseController { } /** - * 查询收件箱详情 + * 草稿箱分页列表 * @param page * @return */ @@ -117,7 +117,7 @@ public class MailController extends DefaultBaseController { } /** - * 保存草稿箱 + * 更新草稿 */ @PostMapping("update-draft-mail") public SuccessResult updateDraftMail(@RequestBody MailSendVO vo){ @@ -167,7 +167,7 @@ public class MailController extends DefaultBaseController { } /** - * 查询收件箱详情 + * 查询垃圾箱详情 * @return */ @GetMapping("get-del-mail") @@ -178,7 +178,7 @@ public class MailController extends DefaultBaseController { } /** - * 查询收件箱详情 + * 恢复垃圾箱邮件 * @return */ @GetMapping("get-recover-del-mail/{ids}") diff --git a/src/main/java/cn/com/tenlion/systemoa/controller/app/api/fileupload/FileUploadAppController.java b/src/main/java/cn/com/tenlion/systemoa/controller/app/api/fileupload/FileUploadAppController.java index 83685ea..7aded41 100644 --- a/src/main/java/cn/com/tenlion/systemoa/controller/app/api/fileupload/FileUploadAppController.java +++ b/src/main/java/cn/com/tenlion/systemoa/controller/app/api/fileupload/FileUploadAppController.java @@ -106,6 +106,7 @@ public class FileUploadAppController extends DefaultBaseController { @GetMapping("listpagefileupload") public SuccessResultList> listPage(@RequestHeader("token") String token, ListPage page) { Map params = requestParams(); + params.put("token", token); page.setParams(params); return fileUploadService.listPage(page); } diff --git a/src/main/java/cn/com/tenlion/systemoa/controller/app/api/mail/MailAppController.java b/src/main/java/cn/com/tenlion/systemoa/controller/app/api/mail/MailAppController.java index 405d7ce..ceed536 100644 --- a/src/main/java/cn/com/tenlion/systemoa/controller/app/api/mail/MailAppController.java +++ b/src/main/java/cn/com/tenlion/systemoa/controller/app/api/mail/MailAppController.java @@ -1,17 +1,23 @@ package cn.com.tenlion.systemoa.controller.app.api.mail; -import cn.com.tenlion.systemoa.pojo.vos.carapply.CarApplyVO; +import cn.com.tenlion.systemoa.pojo.dtos.mail.MailDelDTO; +import cn.com.tenlion.systemoa.pojo.dtos.mail.MailInboxDTO; +import cn.com.tenlion.systemoa.pojo.dtos.mail.MailSendDTO; import cn.com.tenlion.systemoa.pojo.vos.mail.MailSendVO; import cn.com.tenlion.systemoa.service.mail.IMailService; -import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultList; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + /** * @author xwangs * @create 2022-04-19 17:18 @@ -37,4 +43,224 @@ public class MailAppController extends DefaultBaseController { return new SuccessResult(); } + @ApiOperation(value = "发件箱分页列表", notes = "发件箱分页列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "标题|收件人姓名", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-page-app=send-mail") + public SuccessResultList> listPageAppSendMail(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return mailService.listPageAppSendMail(token, page); + } + + @ApiOperation(value = "发件箱详情", notes = "发件箱详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-app=send-mail/{mailId}") + public MailSendDTO getAppSendMail(@RequestHeader("token") String token, + @PathVariable("mailId") String mailId){ + Map params = requestParams(); + params.put("mailId", mailId); + MailSendDTO sendMail = mailService.getSendMail(params); + return sendMail; + } + + @ApiOperation(value = "收件箱分页列表", notes = "收件箱分页列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-page-app=inbox-mail") + public SuccessResultList> listPageAppInboxMail(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return mailService.listPageAppInboxMail(token, page); + } + + + @ApiOperation(value = "收件箱详情", notes = "发件箱详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-app=inbox-mail/{id}") + public MailInboxDTO getAppInboxMail(@RequestHeader("token") String token, + @PathVariable("id") String id){ + Map params = requestParams(); + params.put("id", id); + MailInboxDTO inboxMail = mailService.getAppInboxMail(token, params); + return inboxMail; + } + + /** + * 保存草稿箱 + */ + @ApiOperation(value = "保存草稿", notes = "保存草稿") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save-app-draft-mail") + public SuccessResult saveAppDraftMail(@RequestHeader("token") String token, + @RequestBody MailSendVO vo){ + mailService.saveAppDraftMail(token,vo); + return new SuccessResult(); + } + + @ApiOperation(value = "草稿箱分页列表", notes = "草稿箱分页列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-page-app=draft-mail") + public SuccessResultList> listPageAppDraftMail(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return mailService.listPageAppDraftMail(token, page); + } + + @ApiOperation(value = "草稿箱详情", notes = "草稿箱详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-app=draft-mail/{mailId}") + public MailSendDTO getAppDraftMail(@RequestHeader("token") String token, + @PathVariable("mailId") String mailId){ + Map params = requestParams(); + params.put("mailId", mailId); + MailSendDTO draftMail = mailService.getAppDraftMail(token, params); + return draftMail; + } + + @ApiOperation(value = "更新草稿", notes = "更新草稿") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("update-app-draft-mail/{mailId}") + public SuccessResult updateAppDraftMail(@RequestBody MailSendVO vo, + @PathVariable("mailId") String mailId){ + vo.setMailId(mailId); + mailService.updateAppDraftMail(vo); + return new SuccessResult(); + } + + /** + * 草稿发送 + */ + @ApiOperation(value = "更新草稿", notes = "更新草稿") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save-app-send-draft-mail") + public SuccessResult saveAppSendDraftMail(@RequestHeader("token") String token, + @RequestBody MailSendVO vo){ + mailService.saveAppSendDraftMail(token, vo); + return new SuccessResult(); + } + + @ApiOperation(value = "垃圾箱分页列表", notes = "垃圾箱分页列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-page-app=del-mail") + public SuccessResultList> listPageAppDelMail(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return mailService.listPageAppDelMail(token, page); + } + + @ApiOperation(value = "垃圾箱详情", notes = "垃圾箱详情") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "id", value = "Id值", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-app=del-mail/{id}") + public MailDelDTO getAppDelMail(@RequestHeader("token") String token, + @PathVariable("id") String id){ + Map params = requestParams(); + params.put("id", id); + MailDelDTO delMail = mailService.getAppDelMail(token, params); + return delMail; + } + + /** + * 恢复垃圾箱邮件 + * @return + */ + @ApiOperation(value = "恢复垃圾箱邮件", notes = "恢复垃圾箱邮件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "ids", value = "多个id用逗号拼接", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-app-recover-del-mail/{ids}") + public void getAppRecoverDelMail(@RequestHeader("token") String token, + @PathVariable("ids") String ids){ + mailService.getRecoverDelMail(ids); + } + + @ApiOperation(value = "删除-发件箱邮件", notes = "删除-发件箱邮件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "ids", value = "取mailId,多个mailId用逗号拼接", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("delete-app-send-mail/{ids}") + public void deleteAppSendMail(@RequestHeader("token") String token, + @PathVariable("ids") String ids){ + mailService.deleteAppSendMail(token, ids); + } + + @ApiOperation(value = "删除-收件箱邮件", notes = "删除-收件箱邮件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "ids", value = "取id,多个id用逗号拼接", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("delete-app-inbox-mail/{ids}") + public void deleteAppInboxMail(@RequestHeader("token") String token, + @PathVariable("ids") String ids){ + mailService.deleteAppInboxMail(token, ids); + } + + @ApiOperation(value = "删除-草稿箱邮件", notes = "删除-草稿箱邮件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "ids", value = "取mailId,多个mailId用逗号拼接", paramType = "path") + }) + @DeleteMapping("delete-app-draft-mail/{ids}") + public void deleteAppDraftMail(@RequestHeader("token") String token, + @PathVariable("ids") String ids){ + mailService.deleteAppDraftMail(token, ids); + } + + @ApiOperation(value = "删除-垃圾箱邮件", notes = "删除-垃圾箱邮件") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "ids", value = "取id,多个id用逗号拼接", paramType = "path") + }) + @DeleteMapping("delete-app-del-mail/{ids}") + public void deleteAppDelMail(@RequestHeader("token") String token, + @PathVariable("ids") String ids){ + mailService.deleteDelMail(ids); + } + } diff --git a/src/main/java/cn/com/tenlion/systemoa/controller/route/fileupload/FileUploadRouteController.java b/src/main/java/cn/com/tenlion/systemoa/controller/route/fileupload/FileUploadRouteController.java index 5fa2e55..5fc4b3a 100644 --- a/src/main/java/cn/com/tenlion/systemoa/controller/route/fileupload/FileUploadRouteController.java +++ b/src/main/java/cn/com/tenlion/systemoa/controller/route/fileupload/FileUploadRouteController.java @@ -48,4 +48,9 @@ public class FileUploadRouteController extends DefaultBaseController { return new ModelAndView("fileupload/list-share-public"); } + @GetMapping("list-share-share") + public ModelAndView listShareShare() { + return new ModelAndView("fileupload/list-share-share"); + } + } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/systemoa/dao/filetype/IFileTypeDao.java b/src/main/java/cn/com/tenlion/systemoa/dao/filetype/IFileTypeDao.java index 800af3c..5982485 100644 --- a/src/main/java/cn/com/tenlion/systemoa/dao/filetype/IFileTypeDao.java +++ b/src/main/java/cn/com/tenlion/systemoa/dao/filetype/IFileTypeDao.java @@ -117,4 +117,6 @@ public interface IFileTypeDao { */ Integer count(Map params) throws SearchException; + FileTypeDTO getName(Map params); + } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailDelDTO.java b/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailDelDTO.java index 93ced60..3b874c4 100644 --- a/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailDelDTO.java +++ b/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailDelDTO.java @@ -1,5 +1,7 @@ package cn.com.tenlion.systemoa.pojo.dtos.mail; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -10,23 +12,41 @@ import lombok.ToString; */ @Data @ToString +@ApiModel public class MailDelDTO { + @ApiModelProperty(name = "id", value = "自增主键") private String id; + @ApiModelProperty(name = "mailId", value = "逻辑主键") private String mailId; + @ApiModelProperty(name = "recipientIds", value = "收件人IDs-逗号分割") private String recipientIds; + @ApiModelProperty(name = "recipientNames", value = "收件人名字") private String recipientNames; + @ApiModelProperty(name = "copyForIds", value = "抄送人IDs-逗号分割") private String copyForIds; + @ApiModelProperty(name = "copyForNames", value = "抄送人名字") private String copyForNames; + @ApiModelProperty(name = "secretIds", value = "密送人IDs-逗号分割") private String secretIds; + @ApiModelProperty(name = "secretNames", value = "密送人名字") private String secretNames; + @ApiModelProperty(name = "title", value = "邮件主题") private String title; + @ApiModelProperty(name = "mailFiles", value = "附件IDs") private String mailFiles; + @ApiModelProperty(name = "contentRich", value = "富文本内容") private String contentRich; + @ApiModelProperty(name = "content", value = "纯文本内容") private String content; + @ApiModelProperty(name = "creator", value = "发件人ID") private String creator; + @ApiModelProperty(name = "gmtCreate", value = "发件时间") private String gmtCreate; + @ApiModelProperty(name = "sourceFrom", value = "来源") private String sourceFrom; + @ApiModelProperty(name = "delUserId", value = "删除人") private String delUserId; + @ApiModelProperty(name = "delTime", value = "删除时间") private String delTime; } diff --git a/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailInboxDTO.java b/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailInboxDTO.java index 540ebec..f627510 100644 --- a/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailInboxDTO.java +++ b/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailInboxDTO.java @@ -1,5 +1,7 @@ package cn.com.tenlion.systemoa.pojo.dtos.mail; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -10,23 +12,41 @@ import lombok.ToString; */ @Data @ToString +@ApiModel public class MailInboxDTO { + @ApiModelProperty(name = "mailId", value = "自增主键") private String id; + @ApiModelProperty(name = "mailIdLink", value = "邮件ID") private String mailIdLink; + @ApiModelProperty(name = "recipientIds", value = "收件人IDs-逗号分割") private String recipientIds; + @ApiModelProperty(name = "recipientNames", value = "收件人名字") private String recipientNames; + @ApiModelProperty(name = "copyForIds", value = "抄送人IDs-逗号分割") private String copyForIds; + @ApiModelProperty(name = "copyForNames", value = "抄送人名字") private String copyForNames; + @ApiModelProperty(name = "secretIds", value = "密送人IDs-逗号分割") private String secretIds; + @ApiModelProperty(name = "secretNames", value = "密送人名字") private String secretNames; + @ApiModelProperty(name = "title", value = "邮件主题") private String title; + @ApiModelProperty(name = "mailFiles", value = "附件IDs") private String mailFiles; + @ApiModelProperty(name = "contentRich", value = "富文本内容") private String contentRich; + @ApiModelProperty(name = "content", value = "纯文本内容") private String content; + @ApiModelProperty(name = "creator", value = "发件人ID") private String creator; + @ApiModelProperty(name = "gmtCreate", value = "发件时间") private String gmtCreate; + @ApiModelProperty(name = "copyForTypes", value = "抄送标记") private String copyForTypes; + @ApiModelProperty(name = "secretTypes", value = "密送标记") private String secretTypes; + @ApiModelProperty(name = "creatorNames", value = "发件人姓名") private String creatorNames; } diff --git a/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailSendDTO.java b/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailSendDTO.java index d9c4be6..f45e43b 100644 --- a/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailSendDTO.java +++ b/src/main/java/cn/com/tenlion/systemoa/pojo/dtos/mail/MailSendDTO.java @@ -1,5 +1,7 @@ package cn.com.tenlion.systemoa.pojo.dtos.mail; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -10,21 +12,37 @@ import lombok.ToString; */ @Data @ToString +@ApiModel public class MailSendDTO { + @ApiModelProperty(name = "mailId", value = "逻辑主键") private String mailId; + @ApiModelProperty(name = "recipientIds", value = "收件人IDs-逗号分割") private String recipientIds; + @ApiModelProperty(name = "recipientNames", value = "收件人名字") private String recipientNames; + @ApiModelProperty(name = "copyForIds", value = "抄送人IDs-逗号分割") private String copyForIds; + @ApiModelProperty(name = "copyForNames", value = "抄送人名字") private String copyForNames; + @ApiModelProperty(name = "secretIds", value = "密送人IDs-逗号分割") private String secretIds; + @ApiModelProperty(name = "secretNames", value = "密送人名字") private String secretNames; + @ApiModelProperty(name = "title", value = "邮件主题") private String title; + @ApiModelProperty(name = "mailFiles", value = "附件IDs") private String mailFiles; + @ApiModelProperty(name = "contentRich", value = "富文本内容") private String contentRich; + @ApiModelProperty(name = "content", value = "纯文本内容") private String content; + @ApiModelProperty(name = "creator", value = "发件人ID") private String creator; + @ApiModelProperty(name = "gmtCreate", value = "发件时间") private String gmtCreate; + @ApiModelProperty(name = "modifier", value = "系统默认字段") private String modifier; + @ApiModelProperty(name = "gmtModified", value = "系统默认字段") private String gmtModified; } diff --git a/src/main/java/cn/com/tenlion/systemoa/service/filerole/IFileRoleService.java b/src/main/java/cn/com/tenlion/systemoa/service/filerole/IFileRoleService.java index db8bcc5..75a6436 100644 --- a/src/main/java/cn/com/tenlion/systemoa/service/filerole/IFileRoleService.java +++ b/src/main/java/cn/com/tenlion/systemoa/service/filerole/IFileRoleService.java @@ -1,5 +1,6 @@ package cn.com.tenlion.systemoa.service.filerole; +import cn.com.tenlion.systemoa.pojo.dtos.filetype.FileTypeDTO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; import cn.com.tenlion.systemoa.pojo.dtos.filerole.FileRoleDTO; @@ -184,5 +185,4 @@ public interface IFileRoleService { * @return */ Integer count(Map params); - } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/systemoa/service/filetype/IFileTypeService.java b/src/main/java/cn/com/tenlion/systemoa/service/filetype/IFileTypeService.java index 03993bc..8a2dafb 100644 --- a/src/main/java/cn/com/tenlion/systemoa/service/filetype/IFileTypeService.java +++ b/src/main/java/cn/com/tenlion/systemoa/service/filetype/IFileTypeService.java @@ -1,5 +1,6 @@ package cn.com.tenlion.systemoa.service.filetype; +import cn.com.tenlion.systemoa.pojo.dtos.filerole.FileRoleDTO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; import cn.com.tenlion.systemoa.pojo.dtos.filetype.FileTypeDTO; @@ -185,4 +186,9 @@ public interface IFileTypeService { */ Integer count(Map params); + List getShare(Map params); + + FileTypeDTO getName(String fileTypeId); + + FileTypeDTO getName(Map params); } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/systemoa/service/filetype/impl/FileTypeServiceImpl.java b/src/main/java/cn/com/tenlion/systemoa/service/filetype/impl/FileTypeServiceImpl.java index 886cfae..61b48a4 100644 --- a/src/main/java/cn/com/tenlion/systemoa/service/filetype/impl/FileTypeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/systemoa/service/filetype/impl/FileTypeServiceImpl.java @@ -1,5 +1,7 @@ package cn.com.tenlion.systemoa.service.filetype.impl; +import cn.com.tenlion.systemoa.pojo.dtos.filerole.FileRoleDTO; +import cn.com.tenlion.systemoa.service.filerole.IFileRoleService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.bos.UserInfoBO; @@ -33,6 +35,8 @@ public class FileTypeServiceImpl extends DefaultBaseService implements IFileType @Autowired private IFileTypeDao fileTypeDao; + @Autowired + private IFileRoleService fileRoleService; @Override public void save(FileTypeVO fileTypeVO) { @@ -106,6 +110,11 @@ public class FileTypeServiceImpl extends DefaultBaseService implements IFileType @Override public FileTypeDTO get(Map params) { + /*if(null != params.get("typeBelong")) { + if("共享文档".equals(params.get("typeBelong").toString())) { + params.put("typeBelong", "个人文档"); + } + }*/ return fileTypeDao.get(params); } @@ -150,6 +159,11 @@ public class FileTypeServiceImpl extends DefaultBaseService implements IFileType if(null != userInfoBO) { params.put("creator", userInfoBO.getUserId()); } + if(null != params.get("typeBelong")) { + if("共享文档".equals(params.get("typeBelong").toString())) { + params.put("typeBelong", "个人文档"); + } + } List fileTypeDTOList = fileTypeDao.list(params); Iterator it = fileTypeDTOList.iterator(); while (it.hasNext()) { @@ -194,4 +208,22 @@ public class FileTypeServiceImpl extends DefaultBaseService implements IFileType return count == null ? 0 : count; } + @Override + public List getShare(Map params) { + List list = fileRoleService.list(params); + return list; + } + + @Override + public FileTypeDTO getName(String fileTypeId) { + Map params = super.getHashMap(2); + params.put("fileTypeId", fileTypeId); + return getName(params); + } + + @Override + public FileTypeDTO getName(Map params) { + return fileTypeDao.getName(params); + } + } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/systemoa/service/fileupload/impl/FileUploadServiceImpl.java b/src/main/java/cn/com/tenlion/systemoa/service/fileupload/impl/FileUploadServiceImpl.java index adeb97f..17c547f 100644 --- a/src/main/java/cn/com/tenlion/systemoa/service/fileupload/impl/FileUploadServiceImpl.java +++ b/src/main/java/cn/com/tenlion/systemoa/service/fileupload/impl/FileUploadServiceImpl.java @@ -3,6 +3,7 @@ package cn.com.tenlion.systemoa.service.fileupload.impl; import cn.com.tenlion.systemoa.config.properties.ConfigPro; import cn.com.tenlion.systemoa.dao.fileupload.IFileUploadDao; import cn.com.tenlion.systemoa.pojo.bos.fileupload.FileUploadBO; +import cn.com.tenlion.systemoa.pojo.dtos.filerole.FileRoleDTO; import cn.com.tenlion.systemoa.pojo.dtos.filetype.FileTypeDTO; import cn.com.tenlion.systemoa.pojo.dtos.fileupload.FileUploadDTO; import cn.com.tenlion.systemoa.pojo.pos.fileupload.FileUploadPO; @@ -18,6 +19,7 @@ import ink.wgink.exceptions.SearchException; import ink.wgink.module.file.dao.IFileDao; import ink.wgink.module.file.service.IFileService; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.app.AppTokenUser; import ink.wgink.pojo.bos.UserInfoBO; import ink.wgink.pojo.pos.FilePO; import ink.wgink.pojo.result.SuccessResultList; @@ -141,10 +143,13 @@ public class FileUploadServiceImpl extends DefaultBaseService implements IFileUp FileUploadDTO fileUploadDTO = fileUploadDao.get(params); if(null != fileUploadDTO) { if(!StringUtils.isEmpty(fileUploadDTO.getFileTypeId())) { - FileTypeDTO fileTypeDTO = fileTypeService.get(fileUploadDTO.getFileTypeId()); + FileTypeDTO fileTypeDTO = fileTypeService.getName(fileUploadDTO.getFileTypeId()); if(null != fileTypeDTO) { fileUploadDTO.setOldFileType(fileTypeDTO.getTypeName()); fileUploadDTO.setFileTypeName(fileTypeDTO.getTypeName()); + + fileUploadDTO.setCatalogueType(fileTypeDTO.getTypeBelong()); + fileUploadDTO.setCatalogueName(fileTypeDTO.getTypeName()); } } if(!StringUtils.isEmpty(fileUploadDTO.getFileId())) { @@ -205,38 +210,62 @@ public class FileUploadServiceImpl extends DefaultBaseService implements IFileUp @Override public List list(Map params) { UserInfoBO userInfoBO = this.securityComponent.getCurrentUser(); - if(null != userInfoBO) { + if (null != userInfoBO) { params.put("creator", userInfoBO.getUserId()); } + String token = null; + if(null != params.get("token")) { + token = params.get("token").toString(); + try { + AppTokenUser appTokenUser = securityComponent.getAppTokenUser(token); + if(null != appTokenUser) { + params.put("creator", appTokenUser.getId()); + } + }catch (Exception e) { + e.printStackTrace(); + } + + } List fileUploadDTOList = fileUploadDao.list(params); if(null != fileUploadDTOList && fileUploadDTOList.size() > 0) { Iterator it = fileUploadDTOList.iterator(); while(it.hasNext()) { FileUploadDTO fileUploadDTO = (FileUploadDTO) it.next(); params.put("fileTypeId", fileUploadDTO.getFileTypeId()); + params.put("fileUploadId", fileUploadDTO.getFileUploadId()); + String typeBelong = null; + if(null != params.get("typeBelong")) { + typeBelong = params.get("typeBelong").toString(); + if("共享文档".equals(typeBelong)) { + typeBelong = "个人文档"; + } + } + if(null != params.get("typeBelong") && "共享文档".equals(params.get("typeBelong").toString())) { + List fileRoleDTOList = fileTypeService.getShare(params); + if(null == fileRoleDTOList || fileRoleDTOList.size() == 0) { + it.remove(); + continue; + } + } + params.remove("typeBelong"); + params.remove("creator"); FileTypeDTO fileTypeDTO = fileTypeService.get(params); + params.put("typeBelong", typeBelong); if(null != params.get("typeBelong") && null != fileTypeDTO) { if(!params.get("typeBelong").toString().equals(fileTypeDTO.getTypeBelong())) { it.remove(); continue; } } - if(null != fileTypeDTO) { - fileUploadDTO.setCatalogueType(fileTypeDTO.getTypeBelong()); - fileUploadDTO.setCatalogueName(fileTypeDTO.getTypeName()); + + + FileTypeDTO fileTypeDTO1 = fileTypeService.getName(fileUploadDTO.getFileTypeId()); + if(null != fileTypeDTO1) { + fileUploadDTO.setCatalogueType(fileTypeDTO1.getTypeBelong()); + fileUploadDTO.setCatalogueName(fileTypeDTO1.getTypeName()); } } } - /*if(null != fileUploadDTOList && fileUploadDTOList.size() > 0) { - for(FileUploadDTO fileUploadDTO: fileUploadDTOList) { - params.put("fileCatalogueId", fileUploadDTO.getCatalogueId()); - FileCatalogueDTO fileCatalogueDTO = fileCatalogueService.get(params); - if(null != fileCatalogueDTO) { - fileUploadDTO.setCatalogueName(fileCatalogueDTO.getName()); - fileUploadDTO.setCatalogueType(fileCatalogueDTO.getType()); - } - } - }*/ return fileUploadDTOList; } diff --git a/src/main/java/cn/com/tenlion/systemoa/service/mail/IMailService.java b/src/main/java/cn/com/tenlion/systemoa/service/mail/IMailService.java index e1b626c..8fa3fb4 100644 --- a/src/main/java/cn/com/tenlion/systemoa/service/mail/IMailService.java +++ b/src/main/java/cn/com/tenlion/systemoa/service/mail/IMailService.java @@ -71,4 +71,32 @@ public interface IMailService { * @param vo 邮件VO */ void appSendMail(String token, MailSendVO vo); + + SuccessResultList> listPageAppSendMail(String token, ListPage page); + + SuccessResultList> listPageAppInboxMail(String token, ListPage page); + + + MailInboxDTO getAppInboxMail(String token, Map params); + + void saveAppDraftMail(String token, MailSendVO vo); + + SuccessResultList> listPageAppDraftMail(String token, ListPage page); + + MailSendDTO getAppDraftMail(String token, Map params); + + void updateAppDraftMail(MailSendVO vo); + + void saveAppSendDraftMail(String token, MailSendVO vo); + + SuccessResultList> listPageAppDelMail(String token, ListPage page); + + MailDelDTO getAppDelMail(String token, Map params); + + void deleteAppSendMail(String token, String ids); + + void deleteAppInboxMail(String token, String ids); + + void deleteAppDraftMail(String token, String ids); + } diff --git a/src/main/java/cn/com/tenlion/systemoa/service/mail/impl/MailServiceImpl.java b/src/main/java/cn/com/tenlion/systemoa/service/mail/impl/MailServiceImpl.java index 4e2b744..7c227cf 100644 --- a/src/main/java/cn/com/tenlion/systemoa/service/mail/impl/MailServiceImpl.java +++ b/src/main/java/cn/com/tenlion/systemoa/service/mail/impl/MailServiceImpl.java @@ -69,6 +69,21 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService return new SuccessResultList<>(list, pageInfo.getPageNum(), pageInfo.getTotal()); } + @Override + public SuccessResultList> listPageAppSendMail(String token, ListPage page) { + AppTokenUser appTokenUser = getAppTokenUser(token); + if(appTokenUser == null || "".equals(appTokenUser.getId())){ + return new SuccessResultList<>(new ArrayList<>(0), 0, 0L); + } + PageHelper.startPage(page.getPage(), page.getRows()); + Map params = page.getParams(); + params.put("creator", appTokenUser.getId()); + List list = mailDao.listSendMail(params); + PageInfo pageInfo = new PageInfo<>(list); + return new SuccessResultList<>(list, pageInfo.getPageNum(), pageInfo.getTotal()); + + } + @Override public MailSendDTO getSendMail(Map params) { MailSendDTO dto = mailDao.getSendMail(params); @@ -121,6 +136,52 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService return new SuccessResultList<>(list, pageInfo.getPageNum(), pageInfo.getTotal()); } + @Override + public SuccessResultList> listPageAppInboxMail(String token, ListPage page) { + AppTokenUser appTokenUser = getAppTokenUser(token); + if(appTokenUser == null || "".equals(appTokenUser.getId())){ + return new SuccessResultList<>(new ArrayList<>(0), 0, 0L); + } + Map params = page.getParams(); + params.put("userId", appTokenUser.getId()); + PageHelper.startPage(page.getPage(), page.getRows()); + List list = mailDao.listInboxMail(params); + // 处理抄送情况 + for(MailInboxDTO item : list){ + if(item.getCopyForIds() == null || "".equals(item.getCopyForIds())){ + continue; + } + String[] copyForIds = item.getCopyForIds().split(","); + for (String str : copyForIds){ + if(str.equals(appTokenUser.getId())){ + item.setCopyForTypes("1"); + continue; + } + } + } + // 处理密送情况 + for(MailInboxDTO item : list){ + if(item.getSecretIds() == null || "".equals(item.getSecretIds())){ + continue; + } + String[] secretIds = item.getSecretIds().split(","); + for (String str : secretIds){ + String tempId = ""; + String tempName = ""; + if(str.equals(appTokenUser.getId())){ + tempId = str; + tempName = appTokenUser.getUsername() + "[" + appTokenUser.getName() + "]"; + item.setSecretIds(tempId); + item.setSecretNames(tempName); + item.setSecretTypes("1"); + continue; + } + } + } + PageInfo pageInfo = new PageInfo<>(list); + return new SuccessResultList<>(list, pageInfo.getPageNum(), pageInfo.getTotal()); + } + @Override public MailInboxDTO getInboxMail(Map params) { MailInboxDTO dto = mailDao.getInboxMail(params); @@ -148,6 +209,34 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService return dto; } + @Override + public MailInboxDTO getAppInboxMail(String token, Map params) { + MailInboxDTO dto = mailDao.getInboxMail(params); + AppTokenUser appTokenUser = getAppTokenUser(token); + String userId = appTokenUser.getId(); + // 处理密送 + if(dto.getSecretIds() != null && !"".equals(dto.getSecretIds())){ + String[] secretIds = dto.getSecretIds().split(","); + for (String str : secretIds){ + String tempId = ""; + String tempName = ""; + if(str.equals(userId)){ + tempId = str; + tempName = appTokenUser.getUsername() + "[" + appTokenUser.getName() + "]"; + dto.setSecretIds(tempId); + dto.setSecretNames(tempName); + } + } + } + UserDTO sendDto = userService.get(dto.getCreator()); + dto.setCreatorNames(sendDto.getUserUsername() + "[" + sendDto.getUserName() + "]"); + /*String spx = "




在 "+ dto.getGmtCreate() + ", " + +""+ currentUser.getUserUsername() + " [" + currentUser.getUserName() + "] 写道:" +"

" + + "

"; + dto.setContentRich(spx + dto.getContentRich());*/ + return dto; + } + @Override public void saveDraftMail(MailSendVO vo) { String uuid = UUIDUtil.getUUID(); @@ -157,6 +246,15 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService mailDao.saveDraftMail(saveParam); } + @Override + public void saveAppDraftMail(String token, MailSendVO vo) { + String uuid = UUIDUtil.getUUID(); + Map saveParam = HashMapUtil.beanToMap(vo); + saveParam.put("mailId", uuid); + setAppSaveInfo(token, saveParam); + mailDao.saveDraftMail(saveParam); + } + @Override public SuccessResultList> listPageDraftMail(ListPage page) { UserInfoBO currentUser = securityComponent.getCurrentUser(); @@ -171,12 +269,32 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService return new SuccessResultList<>(list, pageInfo.getPageNum(), pageInfo.getTotal()); } + @Override + public SuccessResultList> listPageAppDraftMail(String token, ListPage page) { + AppTokenUser appTokenUser = getAppTokenUser(token); + if(appTokenUser == null || "".equals(appTokenUser.getId())){ + return new SuccessResultList<>(new ArrayList<>(0), 0, 0L); + } + PageHelper.startPage(page.getPage(), page.getRows()); + Map params = page.getParams(); + params.put("creator", appTokenUser.getId()); + List list = mailDao.listDraftMail(params); + PageInfo pageInfo = new PageInfo<>(list); + return new SuccessResultList<>(list, pageInfo.getPageNum(), pageInfo.getTotal()); + } + @Override public MailSendDTO getDraftMail(Map params) { MailSendDTO dto = mailDao.getDraftMail(params); return dto; } + @Override + public MailSendDTO getAppDraftMail(String token, Map params) { + MailSendDTO dto = mailDao.getDraftMail(params); + return dto; + } + @Override public void updateDraftMail(MailSendVO vo) { Map updateParam = HashMapUtil.beanToMap(vo); @@ -184,6 +302,13 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService mailDao.updateDraftMail(updateParam); } + @Override + public void updateAppDraftMail(MailSendVO vo) { + Map updateParam = HashMapUtil.beanToMap(vo); + updateParam.put("gmtCreate", DateUtil.getTime()); + mailDao.updateDraftMail(updateParam); + } + @Override public void saveSendDraftMail(MailSendVO vo) { Map saveParam = HashMapUtil.beanToMap(vo); @@ -195,6 +320,16 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService mailDao.deleteDraftMail(vo.getMailId()); } + @Override + public void saveAppSendDraftMail(String token, MailSendVO vo) { + Map saveParam = HashMapUtil.beanToMap(vo); + setAppSaveInfo(token, saveParam); + mailDao.saveSendMail(saveParam); + saveParam.put("mailIdLink", vo.getMailId()); + mailDao.saveInboxMail(saveParam); + mailDao.deleteDraftMail(vo.getMailId()); + } + @Override public void deleteSendMail(String ids) { UserInfoBO currentUser = securityComponent.getCurrentUser(); @@ -219,6 +354,30 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService mailDao.deleteSendMail(ids); } + @Override + public void deleteAppSendMail(String token, String ids) { + AppTokenUser appTokenUser = getAppTokenUser(token); + if(appTokenUser == null || "".equals(appTokenUser.getId())){ + return; + } + String[] idArray = ids.split(","); + if(idArray.length > 1 && "".equals(idArray[0])){ + return; + } + // 将发件箱中邮件保存到垃圾箱中 + Map param = new HashMap<>(8); + for(String str : idArray){ + param.put("mailId", str); + MailSendDTO sendMail = mailDao.getSendMail(param); + Map saveObj = HashMapUtil.beanToMap(sendMail); + saveObj.put("sourceFrom", "send"); + saveObj.put("delUserId", appTokenUser.getId()); + saveObj.put("delTime", DateUtil.getTime()); + mailDao.saveDelMail(saveObj); + } + mailDao.deleteSendMail(ids); + } + @Override public void deleteInboxMail(String ids) { UserInfoBO currentUser = securityComponent.getCurrentUser(); @@ -244,6 +403,31 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService mailDao.deleteInboxMail(ids); } + @Override + public void deleteAppInboxMail(String token, String ids) { + AppTokenUser appTokenUser = getAppTokenUser(token); + if(appTokenUser == null || "".equals(appTokenUser.getId())){ + return; + } + String[] idArray = ids.split(","); + if(idArray.length > 1 && "".equals(idArray[0])){ + return; + } + // 将收件箱中邮件保存到垃圾箱 + Map param = new HashMap<>(8); + for(String str : idArray){ + param.put("id", str); + MailInboxDTO inboxMail = mailDao.getInboxMail(param); + Map saveObj = HashMapUtil.beanToMap(inboxMail); + saveObj.put("mailId", saveObj.get("mailIdLink")); + saveObj.put("sourceFrom", "inbox"); + saveObj.put("delUserId", appTokenUser.getId()); + saveObj.put("delTime", DateUtil.getTime()); + mailDao.saveDelMail(saveObj); + } + mailDao.deleteInboxMail(ids); + } + @Override public void deleteDraftMail(String ids) { UserInfoBO currentUser = securityComponent.getCurrentUser(); @@ -268,6 +452,30 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService mailDao.deleteDraftMail(ids); } + @Override + public void deleteAppDraftMail(String token, String ids) { + AppTokenUser appTokenUser = getAppTokenUser(token); + if(appTokenUser == null || "".equals(appTokenUser.getId())){ + return; + } + String[] idArray = ids.split(","); + if(idArray.length > 1 && "".equals(idArray[0])){ + return; + } + // 将草稿箱中邮件保存到垃圾箱中 + Map param = new HashMap<>(8); + for(String str : idArray){ + param.put("mailId", str); + MailSendDTO sendMail = mailDao.getDraftMail(param); + Map saveObj = HashMapUtil.beanToMap(sendMail); + saveObj.put("sourceFrom", "draft"); + saveObj.put("delUserId", appTokenUser.getId()); + saveObj.put("delTime", DateUtil.getTime()); + mailDao.saveDelMail(saveObj); + } + mailDao.deleteDraftMail(ids); + } + @Override public void deleteDelMail(String ids) { String[] idArray = ids.split(","); @@ -291,12 +499,32 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService return new SuccessResultList<>(list, pageInfo.getPageNum(), pageInfo.getTotal()); } + @Override + public SuccessResultList> listPageAppDelMail(String token, ListPage page) { + AppTokenUser appTokenUser = getAppTokenUser(token); + if(appTokenUser == null || "".equals(appTokenUser.getId())){ + return new SuccessResultList<>(new ArrayList<>(0), 0, 0L); + } + PageHelper.startPage(page.getPage(), page.getRows()); + Map params = page.getParams(); + params.put("delUserId", appTokenUser.getId()); + List list = mailDao.listDelMail(params); + PageInfo pageInfo = new PageInfo<>(list); + return new SuccessResultList<>(list, pageInfo.getPageNum(), pageInfo.getTotal()); + } + @Override public MailDelDTO getDelMail(Map params) { MailDelDTO dto = mailDao.getDelMail(params); return dto; } + @Override + public MailDelDTO getAppDelMail(String token, Map params) { + MailDelDTO dto = mailDao.getDelMail(params); + return dto; + } + @Override public void getRecoverDelMail(String ids) { String[] idArray = ids.split(","); @@ -334,7 +562,6 @@ public class MailServiceImpl extends DefaultBaseService implements IMailService } } - /** * 崔宝成-日程通知提醒邮件接口 * @param sendUserId 发件人Id diff --git a/src/main/resources/mybatis/mapper/filerole/file-role-mapper.xml b/src/main/resources/mybatis/mapper/filerole/file-role-mapper.xml index 31bab19..83c8ae8 100644 --- a/src/main/resources/mybatis/mapper/filerole/file-role-mapper.xml +++ b/src/main/resources/mybatis/mapper/filerole/file-role-mapper.xml @@ -235,6 +235,9 @@ t1.id LIKE CONCAT('%', #{keywords}, '%') ) + + AND t1.file_upload_id = #{fileUploadId} + AND LEFT(t1.gmt_create, 10) = ]]> #{startTime} diff --git a/src/main/resources/mybatis/mapper/filetype/file-type-mapper.xml b/src/main/resources/mybatis/mapper/filetype/file-type-mapper.xml index a5d233a..75261cd 100644 --- a/src/main/resources/mybatis/mapper/filetype/file-type-mapper.xml +++ b/src/main/resources/mybatis/mapper/filetype/file-type-mapper.xml @@ -124,6 +124,42 @@ + + -
+
@@ -50,11 +50,11 @@
-
+
diff --git a/src/main/resources/templates/filerole/update.html b/src/main/resources/templates/filerole/update.html index 9ee03b3..d733e2d 100644 --- a/src/main/resources/templates/filerole/update.html +++ b/src/main/resources/templates/filerole/update.html @@ -35,11 +35,11 @@
-
+
@@ -56,11 +56,11 @@
-
+
diff --git a/src/main/resources/templates/filetype/list.html b/src/main/resources/templates/filetype/list.html index cde34db..a7dede3 100644 --- a/src/main/resources/templates/filetype/list.html +++ b/src/main/resources/templates/filetype/list.html @@ -220,7 +220,7 @@ // 文档共享 if('share' == obj.event) { console.log(data) - share(data.fileTypeId, data.typeBelong); + share(data.fileUploadId, data.typeBelong); } }); diff --git a/src/main/resources/templates/fileupload/list-share-personal.html b/src/main/resources/templates/fileupload/list-share-personal.html index a1ea93a..5d02bb8 100644 --- a/src/main/resources/templates/fileupload/list-share-personal.html +++ b/src/main/resources/templates/fileupload/list-share-personal.html @@ -28,8 +28,14 @@ @@ -118,6 +124,12 @@ } return rowData; } + }, + {field: 'share', fixed: 'right', width: 150, title: '共享', align:'center', + templet: function(row) { + var rowData = '文档共享'; + return rowData; + } } ] ], @@ -313,7 +325,7 @@ area: ['100%', '100%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/fileupload/update?fileUploadId={fileUploadId}&typeBelong={typeBelong}', [checkDatas[0].fileUploadId, checkDatas[0].catalogueName]), + content: top.restAjax.path('route/fileupload/update?fileUploadId={fileUploadId}&typeBelong={typeBelong}', [checkDatas[0].fileUploadId, '个人文档']), end: function() { reloadTable(); } diff --git a/src/main/resources/templates/fileupload/list-share-public.html b/src/main/resources/templates/fileupload/list-share-public.html index da63f1a..3728316 100644 --- a/src/main/resources/templates/fileupload/list-share-public.html +++ b/src/main/resources/templates/fileupload/list-share-public.html @@ -125,7 +125,7 @@ return rowData; } }, - {field: 'share', fixed: 'right', width: 150, title: '共享', align:'center', + /*{field: 'share', fixed: 'right', width: 150, title: '共享', align:'center', templet: function(row) { var rowData; if(row['shareRole'] == '否') { @@ -137,7 +137,7 @@ } return rowData; } - } + }*/ ] ], page: true, diff --git a/src/main/resources/templates/fileupload/list-share-share.html b/src/main/resources/templates/fileupload/list-share-share.html new file mode 100644 index 0000000..a825ddd --- /dev/null +++ b/src/main/resources/templates/fileupload/list-share-share.html @@ -0,0 +1,340 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/fileupload/update.html b/src/main/resources/templates/fileupload/update.html index b23bee1..041d3bb 100644 --- a/src/main/resources/templates/fileupload/update.html +++ b/src/main/resources/templates/fileupload/update.html @@ -159,7 +159,7 @@
- +
diff --git a/src/main/resources/templates/userarchives/dept-user.html b/src/main/resources/templates/userarchives/dept-user.html index 159ea10..61c6e1e 100644 --- a/src/main/resources/templates/userarchives/dept-user.html +++ b/src/main/resources/templates/userarchives/dept-user.html @@ -29,12 +29,12 @@
@@ -69,7 +69,6 @@ height: $win.height() - 60, limit: 20, limits: [20, 40, 60, 80, 100, 200], - toolbar: '#headerToolBar', request: { pageName: 'page', limitName: 'rows'