|
@@ -108,7 +108,7 @@ public class TravelCostEvent extends BaseController {
|
|
|
entity.setFlowStatus(FLOW_FINISHED);
|
|
|
entity.setFlowFinishtime(LocalDateTime.now());
|
|
|
travelCostService.updateTravelCostEntity(TravelCostConvert.INSTANCE.convert(entity));
|
|
|
- projectCostService.updateTravelCost(entity.getTotalAmount(),entity.getProjectId());
|
|
|
+ projectCostService.updateTravelCost(entity.getTotalAmount(), entity.getProjectId());
|
|
|
projectService.calcProject(entity.getProjectId());
|
|
|
return ok("true");
|
|
|
} else {
|
|
@@ -447,6 +447,36 @@ public class TravelCostEvent extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @PostMapping("/specialProject")
|
|
|
+ public String specialProject(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
|
|
|
+ try {
|
|
|
+ String flowInstanceId = flowInstance.get("id").toString();
|
|
|
+ TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
|
|
|
+ Project project = projectService.selectById(entity.getProjectId());
|
|
|
+ if (project.getId().equals("31414c5bef38ca7eb9ce31612e84e8e8") || project.getId().equals("3ce706b5a67bb175929cda0117c11620")) {
|
|
|
+ return "true";
|
|
|
+ }
|
|
|
+ return "false";
|
|
|
+ } catch (Exception ex) {
|
|
|
+ return error(ex.getMessage(), ErrorCode.DEFAULT);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @PostMapping("/not-specialProject")
|
|
|
+ public String notSpecialProject(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
|
|
|
+ try {
|
|
|
+ String flowInstanceId = flowInstance.get("id").toString();
|
|
|
+ TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
|
|
|
+ Project project = projectService.selectById(entity.getProjectId());
|
|
|
+ if (project.getId().equals("31414c5bef38ca7eb9ce31612e84e8e8") || project.getId().equals("3ce706b5a67bb175929cda0117c11620")) {
|
|
|
+ return "false";
|
|
|
+ }
|
|
|
+ return "true";
|
|
|
+ } catch (Exception ex) {
|
|
|
+ return error(ex.getMessage(), ErrorCode.DEFAULT);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@PostMapping("/to-project-dept-manager")
|
|
|
public String toProjectDeptManager(String flowInstanceId) {
|
|
|
try {
|
|
@@ -454,10 +484,10 @@ public class TravelCostEvent extends BaseController {
|
|
|
TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
|
|
|
Project project = projectService.selectById(entity.getProjectId());
|
|
|
List<Map<String, String>> userMaps = new ArrayList<>();
|
|
|
- if(project.getId().equals("31414c5bef38ca7eb9ce31612e84e8e8") || project.getId().equals("3ce706b5a67bb175929cda0117c11620") ){
|
|
|
+ if (project.getId().equals("31414c5bef38ca7eb9ce31612e84e8e8") || project.getId().equals("3ce706b5a67bb175929cda0117c11620")) {
|
|
|
//卓一瑞
|
|
|
HashMap<String, String> map = new HashMap<>();
|
|
|
- map.put("id","d05dc4f4-ead4-4925-9aaa-0c4d3bc470b6");
|
|
|
+ map.put("id", "d05dc4f4-ead4-4925-9aaa-0c4d3bc470b6");
|
|
|
userMaps.add(map);
|
|
|
return ok(userMaps);
|
|
|
}
|