|
|
|
@@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.MallUserInfo; |
|
|
|
import com.iformall.domain.po.WxFlowConfig; |
|
|
|
import com.iformall.domain.po.WxFlowModel; |
|
|
|
import com.iformall.domain.po.WxFlowRecord; |
|
|
|
import com.iformall.enums.EnumFlowRecordStatus; |
|
|
|
@@ -13,6 +14,7 @@ import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
@@ -224,9 +226,9 @@ public class WxFlowAbleController extends BaseController { |
|
|
|
@ApiOperation(value = "删除模板") |
|
|
|
@PostMapping(value = "delModel") |
|
|
|
@SystemControllerLog(description = "工作流-删除模板") |
|
|
|
public ResultData delModel(@ModelAttribute WxFlowModel wxFlowModel) { |
|
|
|
public ResultData delModel(@RequestBody WxFlowModel wxFlowModel) { |
|
|
|
wxFlowModel.setTenantId(getTenantId()); |
|
|
|
return wxFlowService.createModel(wxFlowModel); |
|
|
|
return wxFlowService.delModel(wxFlowModel); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@@ -255,10 +257,43 @@ public class WxFlowAbleController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), |
|
|
|
}) |
|
|
|
@SystemControllerLog(description = "工作流-配置列表") |
|
|
|
public ResultData configList(@ModelAttribute WxFlowModel wxFlowModel,Integer pageNum, Integer pageSize) { |
|
|
|
public ResultData configList(@ModelAttribute WxFlowConfig wxFlowConfig, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList"); |
|
|
|
wxFlowModel.setTenantId(getTenantId()); |
|
|
|
return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize)); |
|
|
|
wxFlowConfig.setTenantId(getTenantId()); |
|
|
|
if(pageSize == null){ |
|
|
|
pageSize = 99999999; |
|
|
|
} |
|
|
|
if(pageNum == null){ |
|
|
|
pageNum = 1; |
|
|
|
} |
|
|
|
|
|
|
|
PageInfo<WxFlowConfig> pageInfo = wxFlowService.configList(wxFlowConfig,pageNum,pageSize); |
|
|
|
List<WxFlowConfig> list = pageInfo.getList(); |
|
|
|
for (WxFlowConfig c:list) { |
|
|
|
if(CollectionUtils.isNotEmpty(c.getChilds())){ |
|
|
|
for (WxFlowConfig ch:c.getChilds()) { |
|
|
|
if(ch.getModelId() != null){ |
|
|
|
WxFlowModel query = new WxFlowModel(); |
|
|
|
query.setId(ch.getModelId()); |
|
|
|
ch.setWxFlowModel((WxFlowModel)wxFlowService.findModelById(query).data); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
pageInfo.setList(list); |
|
|
|
return new ResultData(pageInfo); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 类型设置 |
|
|
|
*/ |
|
|
|
@ApiOperation(value = "类型设置") |
|
|
|
@PostMapping(value = "updateConfig") |
|
|
|
@SystemControllerLog(description = "工作流-类型设置") |
|
|
|
public ResultData updateConfig(@RequestBody WxFlowConfig wxFlowConfig) { |
|
|
|
wxFlowConfig.setTenantId(getTenantId()); |
|
|
|
return wxFlowService.updateConfig(wxFlowConfig); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |