wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-14 11:09:19 +08:00
parent e6f2e3e5b2 74edb1ef0c
commit 53798a2e7f
6 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
renren-admin/src/main/java/io/renren/common/utils/CodeGenerationUtils.java
View File

@ -114,4 +114,5 @@ public class CodeGenerationUtils {
public static CodeGenerationUtils getInstance() {
return CodeGenerationUtilsEnum.INSTANCE.getInstnce();
}
}

3
renren-admin/src/main/java/io/renren/modules/activiti/dto/ProcessInstanceDTO.java
View File

@ -88,4 +88,7 @@ public class ProcessInstanceDTO {
private Integer demandCommentFlag;
@ApiModelProperty(value = "评论情况")
private String demandCommentFlagTip;
@ApiModelProperty(value = "申请单号")
private String applyNumber;
}

6
renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
View File

@ -289,12 +289,14 @@ public class ActHistoryService {
stringBuffer.deleteCharAt(stringBuffer.length() - 1);
dto.setName(stringBuffer.toString());
dto.setResourceId(null);
dto.setApplyNumber(abilityApplicationDTO.get(0).getApplyNumber());
}
} else {
TAbilityApplicationDTO abilityApplicationDTO1 = tAbilityApplicationService.getByBusinessKey(dto.getBusinessKey());
if (abilityApplicationDTO1 != null) {
dto.setName(abilityApplicationDTO1.getSystem());
dto.setResourceId(abilityApplicationDTO1.getResourceId());
dto.setApplyNumber(abilityApplicationDTO1.getApplyNumber());
} else {
TResourceMountApplyDTO resourceMountApplyDTO = tResourceMountApplyService.get(Long.valueOf(dto.getBusinessKey()));
if (resourceMountApplyDTO != null && resourceMountApplyDTO.getResourceDTO() != null
@ -306,6 +308,7 @@ public class ActHistoryService {
if (resourceDTO != null) {
dto.setName(resourceDTO.getName());
dto.setResourceId(resourceDTO.getId().toString());
dto.setApplyNumber(resourceMountApplyDTO.getApplyNumber());
}
}
} else {
@ -313,6 +316,7 @@ public class ActHistoryService {
if (resourceDTO != null) {
dto.setName(resourceDTO.getName());
dto.setResourceId(resourceDTO.getId().toString());
dto.setApplyNumber(resourceDTO.getApplyNumber());
} else {
TDemandCommentDTO tDemandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey()));
if (tDemandCommentDTO != null) {
@ -323,6 +327,7 @@ public class ActHistoryService {
if (tDemandCommentEntityDelFlag.isPresent()) {
dto.setDemandCommentFlagTip(tDemandCommentEntityDelFlag.get().getTip());
}
dto.setApplyNumber(tDemandCommentDTO.getApplyNumber());
} else {
TDemandDataDTO tDemandDataDTO = tDemandDataService.get(Long.valueOf(dto.getBusinessKey()));
if (tDemandDataDTO != null) {
@ -333,6 +338,7 @@ public class ActHistoryService {
if (tDemandCommentEntityDelFlag.isPresent()) {
dto.setDemandFlagTip(tDemandCommentEntityDelFlag.get().getTip());
}
dto.setApplyNumber(tDemandDataDTO.getApplyNumber());
}
}
}

4
renren-admin/src/main/java/io/renren/modules/developmentGuide/controller/DevelopmentGuideController.java
View File

@ -48,8 +48,8 @@ public class DevelopmentGuideController {
})
public Result uploadDevelopmentFile(@RequestParam("file") MultipartFile uploadFile, HttpServletRequest request) {
try {
developmentGuideService.uploadDevelopmentFile(uploadFile, request);
return new Result();
String s = developmentGuideService.uploadDevelopmentFile(uploadFile, request);
return new Result().ok(s);
}catch (Exception e) {
return new Result().error(e.getMessage());
}

2
renren-admin/src/main/java/io/renren/modules/developmentGuide/service/DevelopmentGuideService.java
View File

@ -9,5 +9,5 @@ public interface DevelopmentGuideService {
void getDevelopmentFile(HttpServletRequest request, HttpServletResponse response) throws Exception;
void uploadDevelopmentFile(MultipartFile uploadFile, HttpServletRequest request) throws Exception;
String uploadDevelopmentFile(MultipartFile uploadFile, HttpServletRequest request) throws Exception;
}

3
renren-admin/src/main/java/io/renren/modules/developmentGuide/service/impl/DevelopmentGuideServiceImpl.java
View File

@ -61,7 +61,7 @@ public class DevelopmentGuideServiceImpl implements DevelopmentGuideService {
}
@Override
public void uploadDevelopmentFile(MultipartFile uploadFile, HttpServletRequest request) throws Exception{
public String uploadDevelopmentFile(MultipartFile uploadFile, HttpServletRequest request) throws Exception{
logger.info("----------------------------------开始上传开发指南--------------------------------------------------");
String type = request.getParameter("type");
String fileName = request.getParameter("fileName");
@ -81,6 +81,7 @@ public class DevelopmentGuideServiceImpl implements DevelopmentGuideService {
// 文件保存
uploadFile.transferTo(new File(path, fileName));
logger.info("----------------------------------文件上传成功--------------------------------------");
return folder.getPath();
} catch (IOException e) {
logger.info("----------------------------------文件上传失败--------------------------------------");
logger.info("异常描述" + e.getMessage());