diff --git a/src/main/java/com/yxt/customer/apiadmin/CrmFileRest.java b/src/main/java/com/yxt/customer/apiadmin/CrmFileRest.java index 26deb3e..d6636a7 100644 --- a/src/main/java/com/yxt/customer/apiadmin/CrmFileRest.java +++ b/src/main/java/com/yxt/customer/apiadmin/CrmFileRest.java @@ -123,6 +123,14 @@ public class CrmFileRest { return rb.success(); } + @ApiOperation("附件保存") + @PostMapping("/saveAppendix") + ResultBean saveAppendix(@RequestParam(value = "linkSid") String linkSid,@RequestParam(value = "attachType") String attachType, @RequestBody List list){ + ResultBean rb = ResultBean.fireFail(); + crmFileService.saveAppendix(linkSid,attachType, list); + return rb.success(); + } + @ApiOperation("PC端保存/修改附件") @PostMapping("/saveOrUpdatePcAppendix") public ResultBean saveOrUpdatePcAppendix(@RequestBody PcCommonAppendixDto dto, @RequestParam("sid") String sid, @RequestParam("staffSid") String staffSid, @RequestParam("attachType") String attachType){ @@ -139,9 +147,9 @@ public class CrmFileRest { @ApiOperation(value = "批量删除文件") @PostMapping("/deleteFiles") - ResultBean deleteFiles(@RequestParam(value = "linkSid") String linkSid){ + ResultBean deleteFiles(@RequestParam(value = "linkSid") String linkSid,@RequestParam(value = "attachType") String attachType){ ResultBean rb = ResultBean.fireFail(); - int i = crmFileService.deleteFiles(linkSid); + int i = crmFileService.deleteFiles(linkSid,attachType); return rb.success().setMsg("删除成功"); } diff --git a/src/main/java/com/yxt/customer/biz/crmfile/CrmFile.java b/src/main/java/com/yxt/customer/biz/crmfile/CrmFile.java index 1cccf70..894b6ec 100644 --- a/src/main/java/com/yxt/customer/biz/crmfile/CrmFile.java +++ b/src/main/java/com/yxt/customer/biz/crmfile/CrmFile.java @@ -44,7 +44,7 @@ import io.swagger.annotations.ApiModelProperty; * @since 1.0 */ @ApiModel(value = "客户资料表", description = "客户资料表") -@TableName("crm_file") +@TableName("crm_appendix") public class CrmFile extends BaseEntity { private static final long serialVersionUID = 1L; @@ -53,8 +53,6 @@ public class CrmFile extends BaseEntity { private String fileName; // 文件名 @ApiModelProperty("文件类型") private String fileType; // 文件类型 - @ApiModelProperty("上传人姓名") - private String name; // 上传人姓名 @ApiModelProperty("关联业务对象sid") private String linkSid; // 关联业务对象sid @ApiModelProperty("附件类型") @@ -90,19 +88,6 @@ public class CrmFile extends BaseEntity { public void setFileType(String fileType){ this.fileType = fileType; } - /** - * @return 上传人姓名 - */ - public String getName(){ - return name; - } - - /** - * @param name 上传人姓名 to set - */ - public void setName(String name){ - this.name = name; - } /** * @return 关联业务对象sid */ diff --git a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.java b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.java index a5ac3dd..daedd1b 100644 --- a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.java +++ b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.java @@ -33,6 +33,7 @@ import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -57,15 +58,15 @@ public interface CrmFileMapper extends BaseMapper { List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from crm_file") + @Select("select * from crm_appendix") List selectListVo(); List selectByLinkSid(@Param("linkSid") String linkSid, @Param("attachType") String attachType); - @Delete("delete from crm_file where linkSid=#{linkSid} and filePath=#{filePath}") + @Delete("delete from crm_appendix where linkSid=#{linkSid} and filePath=#{filePath}") int delByLinkSidAndFilePath(@Param("linkSid") String linkSid, @Param("filePath") String filePath); - @Select("select * from crm_file where linkSid = #{sid}") + @Select("select * from crm_appendix where linkSid = #{sid}") List fetchByLinkSid(String sid); int selectPath(String path); @@ -78,8 +79,8 @@ public interface CrmFileMapper extends BaseMapper { List selByLinkSid(String sid); - @Delete("DELETE FROM crm_file WHERE linkSid = #{linkSid}") - int deleteFiles(String linkSid); + @Delete("DELETE FROM crm_appendix WHERE linkSid = #{linkSid} and attachType =#{attachType}") + int deleteFiles(@Param("linkSid") String linkSid,@Param("attachType") String attachType); List getPcAppendix(@Param("type") String type, @Param("linkSid") String linkSid, @Param("path") String path); diff --git a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.xml b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.xml index 4dd8cda..cf09700 100644 --- a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.xml +++ b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileMapper.xml @@ -10,21 +10,21 @@ name, createTime FROM - crm_file + crm_appendix ${ew.sqlSegment} select count(*) - from crm_file + from crm_appendix where filePath = #{path} delete - from crm_file + from crm_appendix where filePath = #{path} delete - from crm_file + from crm_appendix where linkSid = #{sid} and attachType = #{key} @@ -69,9 +69,8 @@ cax.fileName, cax.createBySid, DATE_FORMAT(cax.createTime, '%Y-%m-%d') AS createTime, - cax.name, cax.linkSid - FROM crm_file cax + FROM crm_appendix cax WHERE attachType = #{type} AND linkSid = #{linkSid} diff --git a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileService.java b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileService.java index 4929995..315a317 100644 --- a/src/main/java/com/yxt/customer/biz/crmfile/CrmFileService.java +++ b/src/main/java/com/yxt/customer/biz/crmfile/CrmFileService.java @@ -265,8 +265,8 @@ public class CrmFileService extends MybatisBaseService { return z; } - public int deleteFiles(String linkSid) { - int i = baseMapper.deleteFiles(linkSid); + public int deleteFiles(String linkSid,String attachType) { + int i = baseMapper.deleteFiles(linkSid,attachType); return i; } @@ -307,4 +307,26 @@ public class CrmFileService extends MybatisBaseService { String urlPrefix = fileUploadComponent.getUrlPrefix(); return baseMapper.getPcAppendix(attachType,linkSid, urlPrefix); } + + public void saveAppendix(String linkSid, String attachType, List list) { + for (PcCommonAppendixDto pcCommonAppendixDto : list) { + CrmFile commonAppendix = new CrmFile(); + commonAppendix.setLinkSid(linkSid); + if (StringUtils.isNotBlank(pcCommonAppendixDto.getCreateBySid())) { + commonAppendix.setCreateBySid(pcCommonAppendixDto.getCreateBySid()); + } + if (StringUtils.isNotBlank(pcCommonAppendixDto.getFileName())) { + commonAppendix.setFileName(pcCommonAppendixDto.getFileName()); + } + if (StringUtils.isNotBlank(pcCommonAppendixDto.getFileType())) { + commonAppendix.setFileType(pcCommonAppendixDto.getFileType()); + } + if (StringUtils.isNotBlank(pcCommonAppendixDto.getFileSize())) { + commonAppendix.setFileSize(pcCommonAppendixDto.getFileSize()); + } + commonAppendix.setAttachType(attachType); + commonAppendix.setFilePath(pcCommonAppendixDto.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")); + save(commonAppendix); + } + } }