|
@@ -27,6 +27,7 @@ import org.springblade.system.user.entity.User;
|
|
|
import org.springblade.system.user.feign.IUserClient;
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import java.io.FileNotFoundException;
|
|
@@ -219,7 +220,7 @@ public class TaskClientImpl implements TaskClient {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void saveFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer linkSort,Integer userSort) {
|
|
|
+ public void saveFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer linkSort,Integer userSort,Integer flowTaskType) {
|
|
|
Map<Long, String> userMap = iUserClient.selectUserAll().stream().filter(f -> ObjectUtil.isNotEmpty(f.getRealName())).collect(Collectors.toMap(User::getId, User::getRealName));
|
|
|
for (String userId : userIds.split(",")) {
|
|
|
FixedFlowLink fixedFlowLink = new FixedFlowLink();
|
|
@@ -232,6 +233,7 @@ public class TaskClientImpl implements TaskClient {
|
|
|
fixedFlowLink.setProjectId(projectId);
|
|
|
fixedFlowLink.setContractId(contractId);
|
|
|
fixedFlowLink.setFixedFlowBranchSort(userSort+=1);
|
|
|
+ fixedFlowLink.setFlowTaskType(flowTaskType);
|
|
|
fixedFlowLinkServiceImpl.save(fixedFlowLink);
|
|
|
}
|
|
|
}
|
|
@@ -242,8 +244,8 @@ public class TaskClientImpl implements TaskClient {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void updateFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer linkSort,Integer userSort) {
|
|
|
- this.saveFixedFlowLink(fixedFlowId, name, type, userIds, projectId, contractId, linkSort,userSort);
|
|
|
+ public void updateFixedFlowLink(Long fixedFlowId, String name, Integer type, String userIds, Long projectId, Long contractId, Integer linkSort,Integer userSort,Integer flowTaskType) {
|
|
|
+ this.saveFixedFlowLink(fixedFlowId, name, type, userIds, projectId, contractId, linkSort,userSort,flowTaskType);
|
|
|
}
|
|
|
|
|
|
@Override
|