SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #220.
This commit is contained in:
hejinbo
2023-11-20 10:46:29 +08:00
committed by Gitea
parent a99e281f8a 440e895c51
commit b3a2a2af3e
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java
+8 -13
View File
@@ -375,12 +375,12 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
} }
@Override @Override
public AjaxResult insertTemplate(TemplateManage templateManage , MultipartFile file) { public AjaxResult insertTemplate(TemplateManage templateManage, MultipartFile file) {
//参数校验 //参数校验
if (templateManage.getIdentifyId() == null || file == null || templateManage.getTemName() == null){ if (templateManage.getIdentifyId() == null || file == null || templateManage.getTemName() == null) {
return AjaxResult.error("请检查参数是否完整"); return AjaxResult.error("请检查参数是否完整");
} }
if (templateManage.getTemType() == null){ if (templateManage.getTemType() == null) {
templateManage.setTemType(1); //默认模板类型为1(裁决书) templateManage.setTemType(1); //默认模板类型为1(裁决书)
} }
try { try {
@@ -396,7 +396,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
templateManage.setTemFormat(format); templateManage.setTemFormat(format);
templateManage.setCreateBy(getUsername()); templateManage.setCreateBy(getUsername());
int i = templateManageMapper.insertTemplateManage(templateManage); int i = templateManageMapper.insertTemplateManage(templateManage);
if (i>0){ if (i > 0) {
return AjaxResult.success("新增成功"); return AjaxResult.success("新增成功");
} }
} catch (IOException e) { } catch (IOException e) {
@@ -424,7 +424,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
templateManage.setTemFormat(format); templateManage.setTemFormat(format);
templateManage.setUpdateBy(getUsername()); templateManage.setUpdateBy(getUsername());
int i = templateManageMapper.updateTemplateManage(templateManage); int i = templateManageMapper.updateTemplateManage(templateManage);
if (i>0){ if (i > 0) {
return AjaxResult.success("修改成功"); return AjaxResult.success("修改成功");
} }
} catch (IOException e) { } catch (IOException e) {
@@ -447,16 +447,10 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
@Override @Override
public List<TemplateManage> getTemplateList(DeptIdentify deptIdentify) { public List<TemplateManage> getTemplateList(DeptIdentify deptIdentify) {
if (deptIdentify.getId() == null) {
return null;
}
TemplateManage templateManage = new TemplateManage(); TemplateManage templateManage = new TemplateManage();
templateManage.setIdentifyId(deptIdentify.getId()); templateManage.setIdentifyId(deptIdentify.getId());
List<TemplateManage> templateManages = templateManageMapper.selectTemplateList(templateManage); List<TemplateManage> templateManages = templateManageMapper.selectTemplateList(templateManage);
if (templateManages != null && templateManages.size() > 0) { return templateManages;
return templateManages;
}
return null;
} }
private String generateUniqueUsername() { private String generateUniqueUsername() {
@@ -472,7 +466,8 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
} }
} }
} }
private String getFileExtension(String fileName) {
private String getFileExtension(String fileName) {
int lastDotIndex = fileName.lastIndexOf("."); int lastDotIndex = fileName.lastIndexOf(".");
if (lastDotIndex > 0 && lastDotIndex < fileName.length() - 1) { if (lastDotIndex > 0 && lastDotIndex < fileName.length() - 1) {
return fileName.substring(lastDotIndex + 1); return fileName.substring(lastDotIndex + 1);