diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BaseProjectController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BaseProjectController.java index d168214..2e7ec34 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BaseProjectController.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/BaseProjectController.java @@ -82,7 +82,7 @@ public class BaseProjectController extends BaseController try{ BaseProject project = JSON.parseObject(params, BaseProject.class); if (!projectService.checkProjectDeptNameUniqueAdd(project)) { - return error("修改项目'" + project.getProjectDepartName() + "'失败,项目名称已存在"); + return error("新增项目部'" + project.getProjectDepartName() + "'失败,项目部名称已存在"); } project.setCreateBy(SecurityUtils.getUsername()); // project.setDelFlag(0); @@ -103,7 +103,7 @@ public class BaseProjectController extends BaseController public AjaxResult edit(@RequestParam(value = "file", required = false) MultipartFile[] file, String params) { BaseProject project = JSON.parseObject(params, BaseProject.class); if (!projectService.checkProjectDeptNameUnique(project)) { - return error("修改项目'" + project.getProjectDepartName() + "'失败,项目名称已存在"); + return error("修改项目部'" + project.getProjectDepartName() + "'失败,项目部名称已存在"); } project.setUpdateBy(SecurityUtils.getUsername()); return projectService.updateProject(file,params); diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BaseProjectMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BaseProjectMapper.java index 1f347ca..e4c8691 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BaseProjectMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/BaseProjectMapper.java @@ -76,4 +76,6 @@ public interface BaseProjectMapper * @return */ public List getProjectSomeLists(int[] ids); + + } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java index a029a57..b6babe5 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java @@ -631,14 +631,24 @@ public class PersonMgeServiceImpl implements IPersonMgeService { */ public ResourceFileVo setCertificateResourceFileData(JSONObject item, CertificateVo vo) { ResourceFileVo fileVo = new ResourceFileVo(); - String fileType = String.valueOf(vo.getCertificateType() + 1); + String fileType = null; + if(item.get("suffix").equals(".pdf") || item.get("suffix").equals(".doc") || item.get("suffix").equals(".docx")){ + fileType = "0"; + }else{ + fileType = String.valueOf(vo.getCertificateType() + 1); + } String resourceId = IdUtils.simpleUUID(); - fileVo.setFileType(vo.getCertificateType() + 1); + if(fileType.equals("0")){ + fileVo.setFileType(0); + fileVo.setSourceType(String.valueOf(vo.getCertificateType() + 1)); + }else{ + fileVo.setFileType(1); + fileVo.setSourceType(fileType); + } fileVo.setFilePath(item.getString("fileId")); fileVo.setFileSuffix(item.getString("suffix")); fileVo.setFileName(item.getString("fileName")); fileVo.setSourceId(vo.getId() + ""); - fileVo.setSourceType(fileType); return fileVo; } diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml index 238e8b0..5eccb35 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml @@ -132,4 +132,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by a.id + \ No newline at end of file diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml index 5bf84a0..f3e68d7 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml @@ -133,7 +133,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"