소스 검색

[铜锣湾][修改][预账单]

release_toaliyun_real
luozukai 7 년 전
committed by Stormeye Wu
부모
커밋
86e26c400c
2개의 변경된 파일22개의 추가작업 그리고 6개의 파일을 삭제
  1. +11
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java
  2. +11
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 11
- 0
mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java 파일 보기

@@ -13,6 +13,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.flowable.engine.RuntimeService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@ public class WxFlowAbleController extends BaseController {
@Autowired @Autowired
private WxFlowService wxFlowService; private WxFlowService wxFlowService;
@Autowired @Autowired
<<<<<<< HEAD
private MessageProducer messageProducer; private MessageProducer messageProducer;


@ApiOperation(value = "mqSend",notes = "") @ApiOperation(value = "mqSend",notes = "")
@@ -37,6 +39,9 @@ public class WxFlowAbleController extends BaseController {
messageProducer.sendMessage("aaaa","topic-1","tag-1","key1"); messageProducer.sendMessage("aaaa","topic-1","tag-1","key1");
return new ResultData(); return new ResultData();
} }
=======
RuntimeService runtimeService;
>>>>>>> [铜锣湾][修改][预账单]


@ApiOperation(value = "启动流程",notes = "{\"businessId\":\"221178539888607232\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"243650055783841792\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"\"}],\"variables\":[{\"key\":\"contractType\",\"value\":\"1\"},{\"key\":\"contractNumber\",\"value\":\"1111\"}]}") @ApiOperation(value = "启动流程",notes = "{\"businessId\":\"221178539888607232\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"243650055783841792\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"\"}],\"variables\":[{\"key\":\"contractType\",\"value\":\"1\"},{\"key\":\"contractNumber\",\"value\":\"1111\"}]}")
@PostMapping("/start") @PostMapping("/start")
@@ -45,6 +50,12 @@ public class WxFlowAbleController extends BaseController {
return wxFlowService.start(params,super.getUser().getId(),super.getUser().getName(),super.getTenantId()); return wxFlowService.start(params,super.getUser().getId(),super.getUser().getName(),super.getTenantId());
} }


@GetMapping(value = "/del")
public ResultData list(String id) {
runtimeService.deleteProcessInstance(id, "驳回");
return new ResultData();
}

/** /**
* 用户代办列表 * 用户代办列表
*/ */


+ 11
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java 파일 보기

@@ -260,12 +260,18 @@ public class WxFlowServiceImpl implements WxFlowService {


@Override @Override
public ResultData list(String flowType, Integer pageNum, Integer pageSize,Long userId) { public ResultData list(String flowType, Integer pageNum, Integer pageSize,Long userId) {
List<String> definitionKeyList = new ArrayList<>();
for (String ft:flowType.split(",")) {
definitionKeyList.add(getFlowKeyByType(Integer.parseInt(ft)));
}
TaskQuery taskQuery = taskService.createTaskQuery(); TaskQuery taskQuery = taskService.createTaskQuery();
taskQuery.processDefinitionKeyIn(definitionKeyList);
//流程过滤条件
if(StringUtils.isNotBlank(flowType)) {
List<String> definitionKeyList = new ArrayList<>();
for (String ft : flowType.split(",")) {
definitionKeyList.add(getFlowKeyByType(Integer.parseInt(ft)));
}
if(CollectionUtils.isNotEmpty(definitionKeyList)){
taskQuery.processDefinitionKeyIn(definitionKeyList);
}
}

int total = taskQuery.taskCandidateUser(userId.toString()).list().size(); int total = taskQuery.taskCandidateUser(userId.toString()).list().size();
int pages; int pages;
if(total % pageSize == 0){ if(total % pageSize == 0){
@@ -306,7 +312,6 @@ public class WxFlowServiceImpl implements WxFlowService {
return new ResultData(pageInfo); return new ResultData(pageInfo);
} }



@Override @Override
public ResultData applyHistory(Long businessId,String tenantId) { public ResultData applyHistory(Long businessId,String tenantId) {
List<WxFlowRecord> result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); List<WxFlowRecord> result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId));


불러오는 중...
취소
저장