OpenGitLink
/
snow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/develop1.0' into feature/develop1.0

This commit is contained in:
459816669@qq.com 2021-02-22 20:55:51 +08:00
parent cb62915184 a7f100ddfd
commit a0758c3697
6 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java
View File

@ -2,6 +2,7 @@ package com.snow.web.controller.flowable;
import cn.hutool.core.util.ReflectUtil;
import com.alibaba.fastjson.JSON;
import com.snow.common.annotation.RepeatSubmit;
import com.snow.common.core.controller.BaseController;
import com.snow.common.core.domain.AjaxResult;
import com.snow.common.core.page.PageModel;
@ -68,6 +69,7 @@ public class FlowController extends BaseController {
*/
@PostMapping("/finishTask")
@ResponseBody
@RepeatSubmit
public AjaxResult finishTask(CompleteTaskDTO completeTaskDTO)
{
SysUser sysUser = ShiroUtils.getSysUser();
@ -149,6 +151,10 @@ public class FlowController extends BaseController {
return prefix +"/myStartProcessDetail";
}
/**
* 我参与的任务
* @return
*/
@RequiresPermissions("flow:process:getMyTakePartInProcess")
@GetMapping("/toMyTakePartInProcess")
public String getMyTakePartInProcess()

2
snow-admin/src/main/java/com/snow/web/controller/flowable/FlowModelerController.java
View File

@ -1,6 +1,7 @@
package com.snow.web.controller.flowable;
import com.snow.common.annotation.Log;
import com.snow.common.annotation.RepeatSubmit;
import com.snow.common.core.controller.BaseController;
import com.snow.common.core.domain.AjaxResult;
import com.snow.common.core.page.PageModel;
@ -136,6 +137,7 @@ public class FlowModelerController extends BaseController
@RequiresPermissions("modeler:deployment:deployment")
@PostMapping("/importData")
@ResponseBody
@RepeatSubmit
public AjaxResult importData(MultipartFile file, String name,String key,String category) throws Exception
{
InputStream inputStream = file.getInputStream();

6
snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java
View File

@ -9,6 +9,7 @@ import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.read.metadata.ReadSheet;
import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import com.snow.common.annotation.RepeatSubmit;
import com.snow.common.constant.SequenceContants;
import com.snow.common.utils.poi.EasyExcelUtil;
import com.snow.flowable.domain.CompleteTaskDTO;
@ -143,6 +144,7 @@ public class PurchaseOrderController extends BaseController
@Log(title = "采购单主表", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
@RepeatSubmit
public AjaxResult addSave(PurchaseOrderMain purchaseOrderMain)
{
return toAjax(purchaseOrderMainService.insertPurchaseOrderMain(purchaseOrderMain));
@ -190,10 +192,11 @@ public class PurchaseOrderController extends BaseController
* 修改保存采购单并发起申请
*/
@RequiresPermissions("system:purchaseOrder:edit")
@Log(title = "采购单主表", businessType = BusinessType.UPDATE)
@Log(title = "采购单主表", businessType = BusinessType.OTHER)
@PostMapping("/edit")
@ResponseBody
@Transactional
@RepeatSubmit
public AjaxResult editSave(PurchaseOrderMain purchaseOrderMain)
{
SysUser sysUser = ShiroUtils.getSysUser();
@ -245,6 +248,7 @@ public class PurchaseOrderController extends BaseController
@PostMapping("/restart")
@ResponseBody
@Transactional
@RepeatSubmit
public AjaxResult restart(PurchaseOrderMainTask purchaseOrderMainTask)
{
SysUser sysUser = ShiroUtils.getSysUser();

3
snow-admin/src/main/resources/templates/flow/myStartProcess.html
View File

@ -13,7 +13,7 @@
<div class="row">
<ul>
<li>
<label>&nbsp;&nbsp; 流程名称：</label>
<label>流程名称：</label>
<input type="text" name="processDefinitionName"/>
</li>
<li>
@ -40,7 +40,6 @@
<th:block th:include="include :: select2-js" />
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('system:flow:myStartProcessDetail')}]];
var processInstanceStatusDatas = [[${@dict.getType('process_instance_status')}]];
var prefixFlow = ctx + "flow";
$(function() {

2
snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowablePublishServiceImpl.java
View File

@ -175,7 +175,7 @@ public class FlowablePublishServiceImpl implements FlowablePublishService {
}
return null;
} catch (IOException e) {
log.error("DeploymentByModelId is fail",e.getMessage());
log.error("deploymentByModelId is fail",e.getMessage());
throw new RuntimeException("发布流程失败");
}
}

5
snow-flowable/src/main/java/com/snow/flowable/service/impl/FlowableServiceImpl.java
View File

@ -620,6 +620,9 @@ public class FlowableServiceImpl implements FlowableService {
if(!StringUtils.isEmpty(processInstanceDTO.getStartedUserId())){
historicProcessInstanceQuery.startedBy(processInstanceDTO.getStartedUserId());
}
if(!StringUtils.isEmpty(processInstanceDTO.getProcessDefinitionName())){
historicProcessInstanceQuery.processDefinitionName(processInstanceDTO.getProcessDefinitionName());
}
historicProcessInstanceQuery.includeProcessVariables();
long count = historicProcessInstanceQuery.
orderByProcessInstanceStartTime().
@ -683,7 +686,7 @@ public class FlowableServiceImpl implements FlowableService {
}
);
if(!StringUtils.isEmpty(historicTaskInstanceDTO.getBusinessKeyLike())){
historicTaskInstanceQuery.processInstanceBusinessKeyLike(historicTaskInstanceDTO.getBusinessKeyLike());
historicTaskInstanceQuery.processInstanceBusinessKeyLike("%"+historicTaskInstanceDTO.getBusinessKeyLike()+"%");
}
if(!StringUtils.isEmpty(historicTaskInstanceDTO.getBusinessKey())){
historicTaskInstanceQuery.processInstanceBusinessKey(historicTaskInstanceDTO.getBusinessKey());