ferrum/quotation-system-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ferrum:4fec612e359fa3741febebbacddc2591966e00bf
Branches Tags
ferrum:master
ferrum:tzx
..
compare: ferrum:4abd0682a91abb06781efbdc931b09b9a07dab96
Branches Tags
ferrum:tzx
ferrum:master

No commits in common. "4fec612e359fa3741febebbacddc2591966e00bf" and "4abd0682a91abb06781efbdc931b09b9a07dab96" have entirely different histories.
4fec612e35 ... 4abd0682a9

2 changed files with 64 additions and 62 deletions
Show Stats Expand all files Collapse all files

58
quotation-admin/src/main/java/net/ferrum/web/controller/business/QsSupplierController.java
View File

@ -3,10 +3,8 @@ package net.ferrum.web.controller.business;
import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.RequiredArgsConstructor;
import net.ferrum.business.domain.bo.QsSupplierBo;
import net.ferrum.business.domain.bo.QsUserSupplierBo;
import net.ferrum.business.domain.vo.QsSupplierVo;
import net.ferrum.business.service.IQsSupplierService;
import net.ferrum.business.service.IQsUserSupplierService;
import net.ferrum.common.annotation.Log;
import net.ferrum.common.annotation.RepeatSubmit;
import net.ferrum.common.core.controller.BaseController;
@ -23,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -42,18 +39,13 @@ public class QsSupplierController extends BaseController {
private final IQsSupplierService iQsSupplierService;
private final IQsUserSupplierService iQsUserSupplierService;
/**
* 查询供应商信息列表
*/
@SaCheckPermission("business:supplier:list")
@GetMapping("/list")
public TableDataInfo<QsSupplierVo> list(QsSupplierBo bo, PageQuery pageQuery) {
return iQsUserSupplierService.selectSuppliersByUsersPages(bo, pageQuery);
//return iQsSupplierService.queryPageList(bo, pageQuery);
return iQsSupplierService.queryPageList(bo, pageQuery);
}
/**
@ -75,8 +67,8 @@ public class QsSupplierController extends BaseController {
@SaCheckPermission("business:supplier:query")
@GetMapping("/{supplierId}")
public R<QsSupplierVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable String supplierId) {
return R.ok(iQsSupplierService.queryById(Long.parseLong(supplierId)));
@PathVariable Long supplierId) {
return R.ok(iQsSupplierService.queryById(supplierId));
}
/**
@ -87,26 +79,7 @@ public class QsSupplierController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody QsSupplierBo bo) {
boolean ret = iQsSupplierService.insertByBo(bo);
if (ret == true){
bo.getDockerUsers().forEach(dockerUser -> {
if(dockerUser.getDel()==null){ //=null是新增加的，=2是增加后，又删除了的
QsUserSupplierBo qsUserSupplierBo = new QsUserSupplierBo();
qsUserSupplierBo.setSupplierId(bo.getSupplierId());
qsUserSupplierBo.setUserId(dockerUser.getUserId());
if (dockerUser.getId() == null){
iQsUserSupplierService.insertByBo(qsUserSupplierBo);
}
else{
qsUserSupplierBo.setId(dockerUser.getId());
iQsUserSupplierService.updateByBo(qsUserSupplierBo);
}
}
});
}
return toAjax(ret);
return toAjax(iQsSupplierService.insertByBo(bo));
}
/**
@ -117,29 +90,6 @@ public class QsSupplierController extends BaseController {
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody QsSupplierBo bo) {
List<Long> ids = new ArrayList<>();
bo.getDockerUsers().forEach(dockerUser -> {
if(dockerUser.getDel()!=null){//=null是原来有的，!=null 是后增加的
ids.add(dockerUser.getId());
}
else{
QsUserSupplierBo qsUserSupplierBo = new QsUserSupplierBo();
qsUserSupplierBo.setSupplierId(bo.getSupplierId());
qsUserSupplierBo.setUserId(dockerUser.getUserId());
if (dockerUser.getId() == null){
iQsUserSupplierService.insertByBo(qsUserSupplierBo);
}
else{
qsUserSupplierBo.setId(dockerUser.getId());
iQsUserSupplierService.updateByBo(qsUserSupplierBo);
}
}
});
if ( !(ids == null || ids.isEmpty()) ){
iQsUserSupplierService.deleteWithValidByIds(ids,true);
}
return toAjax(iQsSupplierService.updateByBo(bo));
}

68
quotation-system/src/main/java/net/ferrum/workflow/service/impl/WfProcessServiceImpl.java
View File

@ -157,16 +157,11 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
@Override
public TableDataInfo<WfTaskVo> selectPageAllProcessList(ProcessQuery processQuery, PageQuery pageQuery) {
Page<WfTaskVo> page = new Page<>();
HistoricProcessInstanceQuery historicProcessInstanceQuery = historyService.createHistoricProcessInstanceQuery()
//.startedBy(TaskUtils.getUserId())
.orderByProcessInstanceStartTime()
.desc();
Page<WfTaskVo> page = getHistProcessList(historicProcessInstanceQuery,processQuery,pageQuery);
return TableDataInfo.build(page);
}
Page<WfTaskVo> getHistProcessList(HistoricProcessInstanceQuery historicProcessInstanceQuery,ProcessQuery processQuery, PageQuery pageQuery){
Page<WfTaskVo> page = new Page<>();
// 构建搜索条件
ProcessUtils.buildProcessSearch(historicProcessInstanceQuery, processQuery);
int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
@ -240,16 +235,73 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
taskVoList.add(taskVo);
}
page.setRecords(taskVoList);
return page;
return TableDataInfo.build(page);
}
@Override
public TableDataInfo<WfTaskVo> selectPageOwnProcessList(ProcessQuery processQuery, PageQuery pageQuery) {
Page<WfTaskVo> page = new Page<>();
HistoricProcessInstanceQuery historicProcessInstanceQuery = historyService.createHistoricProcessInstanceQuery()
.startedBy(TaskUtils.getUserId())
.orderByProcessInstanceStartTime()
.desc();
Page<WfTaskVo> page = getHistProcessList(historicProcessInstanceQuery,processQuery,pageQuery);
// 构建搜索条件
ProcessUtils.buildProcessSearch(historicProcessInstanceQuery, processQuery);
int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery
.listPage(offset, pageQuery.getPageSize());
page.setTotal(historicProcessInstanceQuery.count());
List<WfTaskVo> taskVoList = new ArrayList<>();
for (HistoricProcessInstance hisIns : historicProcessInstances) {
WfTaskVo taskVo = new WfTaskVo();
// 获取流程状态
HistoricVariableInstance processStatusVariable = historyService.createHistoricVariableInstanceQuery()
.processInstanceId(hisIns.getId())
.variableName(ProcessConstants.PROCESS_STATUS_KEY)
.singleResult();
String processStatus = null;
if (ObjectUtil.isNotNull(processStatusVariable)) {
processStatus = Convert.toStr(processStatusVariable.getValue());
}
// 兼容旧流程
if (processStatus == null) {
processStatus = ObjectUtil.isNull(hisIns.getEndTime()) ? ProcessStatus.RUNNING.getStatus() : ProcessStatus.COMPLETED.getStatus();
}
taskVo.setProcessStatus(processStatus);
taskVo.setCreateTime(hisIns.getStartTime());
taskVo.setFinishTime(hisIns.getEndTime());
taskVo.setProcInsId(hisIns.getId());
//add for test --tzx
String spec[] = new String[2];
getHistSpecInfo(hisIns.getId(),spec);
taskVo.setSpecBatch(spec[0]);
taskVo.setSpecName(spec[1]);
//add end for test --tzx
// 计算耗时
if (Objects.nonNull(hisIns.getEndTime())) {
taskVo.setDuration(DateUtils.getDatePoor(hisIns.getEndTime(), hisIns.getStartTime()));
} else {
taskVo.setDuration(DateUtils.getDatePoor(DateUtils.getNowDate(), hisIns.getStartTime()));
}
// 流程部署实例信息
Deployment deployment = repositoryService.createDeploymentQuery()
.deploymentId(hisIns.getDeploymentId()).singleResult();
taskVo.setDeployId(hisIns.getDeploymentId());
taskVo.setProcDefId(hisIns.getProcessDefinitionId());
taskVo.setProcDefName(hisIns.getProcessDefinitionName());
taskVo.setProcDefVersion(hisIns.getProcessDefinitionVersion());
taskVo.setCategory(deployment.getCategory());
// 当前所处流程
List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).includeIdentityLinks().list();
if (CollUtil.isNotEmpty(taskList)) {
taskVo.setTaskName(taskList.stream().map(Task::getName).filter(StringUtils::isNotEmpty).collect(Collectors.joining(",")));
}
taskVoList.add(taskVo);
}
page.setRecords(taskVoList);
return TableDataInfo.build(page);
}