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-15 16:29:51 +08:00
parent 9cc5b5eda1 33d2595974
commit cf0ee02aeb
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterController.java
View File

@ -121,7 +121,7 @@ public class AbilityCenterController {
if (tAbilityApplicationDTO.getId() == null) { if (tAbilityApplicationDTO.getId() == null) {
return null; return null;
} }
codeGenerationUtils.setApplyNumber("NLSY", new ArrayList<>(Arrays.asList(tAbilityApplicationDTO.getId())), jdbcTemplate); codeGenerationUtils.setApplyNumber("NLSY", Arrays.asList(tAbilityApplicationDTO.getId()), jdbcTemplate);
tAbilityApplicationDTO.setCompleteEntry(Boolean.TRUE); tAbilityApplicationDTO.setCompleteEntry(Boolean.TRUE);
// 仿照请求接口 /act/running/startOfBusinessKey // 仿照请求接口 /act/running/startOfBusinessKey

3
renren-admin/src/main/java/io/renren/common/controller/CommentController.java
View File

@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -90,7 +89,7 @@ public class CommentController {
tDemandCommentDTO.setDelFlag(2); // 待审核 tDemandCommentDTO.setDelFlag(2); // 待审核
tDemandCommentDTO.setCompleteEntry(Boolean.TRUE); tDemandCommentDTO.setCompleteEntry(Boolean.TRUE);
tDemandCommentService.update(tDemandCommentDTO); tDemandCommentService.update(tDemandCommentDTO);
codeGenerationUtils.setApplyNumber("XQPL", new ArrayList<>(Arrays.asList(tDemandCommentDTO.getId())), jdbcTemplate); codeGenerationUtils.setApplyNumber("XQPL", Arrays.asList(tDemandCommentDTO.getId()), jdbcTemplate);
// 仿照请求接口 /act/running/startOfBusinessKey // 仿照请求接口 /act/running/startOfBusinessKey
ProcessStartDTO processStartDTO = new ProcessStartDTO(); ProcessStartDTO processStartDTO = new ProcessStartDTO();

3
renren-admin/src/main/java/io/renren/common/controller/DemandDataController.java
View File

@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -81,7 +80,7 @@ public class DemandDataController {
if (tDemandDataDTO.getId() == null) { if (tDemandDataDTO.getId() == null) {
return null; return null;
} }
codeGenerationUtils.setApplyNumber("NLXQ", new ArrayList<>(Arrays.asList(tDemandDataDTO.getId())), jdbcTemplate); codeGenerationUtils.setApplyNumber("NLXQ", Arrays.asList(tDemandDataDTO.getId()), jdbcTemplate);
tDemandDataDTO.setCompleteEntry(Boolean.TRUE); tDemandDataDTO.setCompleteEntry(Boolean.TRUE);
logger.info("-------------------1.保存申请表单成功--------------------------"); logger.info("-------------------1.保存申请表单成功--------------------------");
// 仿照请求接口 /act/running/startOfBusinessKey // 仿照请求接口 /act/running/startOfBusinessKey

5
renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java
View File

@ -119,7 +119,7 @@ public class ResourceMountController {
if (tResourceMountApplyDTO.getId() == null) { if (tResourceMountApplyDTO.getId() == null) {
return null; return null;
} }
codeGenerationUtils.setApplyNumber("NLSJ", new ArrayList<>(Arrays.asList(tResourceMountApplyDTO.getId())), jdbcTemplate); codeGenerationUtils.setApplyNumber("NLSJ", Arrays.asList(tResourceMountApplyDTO.getId()), jdbcTemplate);
TaskQuery taskQuery = taskService.createTaskQuery(); TaskQuery taskQuery = taskService.createTaskQuery();
Task task = taskQuery.active().processInstanceBusinessKey(tResourceMountApplyDTO.getId().toString()).singleResult(); Task task = taskQuery.active().processInstanceBusinessKey(tResourceMountApplyDTO.getId().toString()).singleResult();
if (task != null) { if (task != null) {
@ -191,13 +191,12 @@ public class ResourceMountController {
} }
dto.setUndercarriageReason(tResourceUndercarriageApplyDTO.getReason()); dto.setUndercarriageReason(tResourceUndercarriageApplyDTO.getReason());
dto.setDelFlag(ResourceEntityDelFlag.NORMAL.getFlag()); // 设置为正常 dto.setDelFlag(ResourceEntityDelFlag.NORMAL.getFlag()); // 设置为正常
// dto.setApplyNumber(codeGenerationUtils.getApplyNumber("NLXJ"));
String userId = SecurityUser.getUserId().toString(); String userId = SecurityUser.getUserId().toString();
Optional<SysUserDTO> userDTO = Optional.ofNullable(sysUserService.get(Long.valueOf(userId))); Optional<SysUserDTO> userDTO = Optional.ofNullable(sysUserService.get(Long.valueOf(userId)));
userDTO.ifPresent(user -> { userDTO.ifPresent(user -> {
dto.setUndercarriageUserName(user.getRealName()); dto.setUndercarriageUserName(user.getRealName());
}); });
codeGenerationUtils.setApplyNumber("NLXJ", new ArrayList<>(Arrays.asList(dto.getId())), jdbcTemplate); codeGenerationUtils.setApplyNumber("NLXJ", Arrays.asList(dto.getId()), jdbcTemplate);
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
resourceService.update(dto); resourceService.update(dto);
logger.error(resourceDTO.get().toString()); logger.error(resourceDTO.get().toString());