diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index f5b73740c..a52421d14 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -218,6 +218,17 @@ public class WxFlowAbleController extends BaseController { return wxFlowService.findModelById(wxFlowModel); } + /** + * 删除模板 + */ + @ApiOperation(value = "删除模板") + @PostMapping(value = "delModel") + @SystemControllerLog(description = "工作流-删除模板") + public ResultData delModel(@ModelAttribute WxFlowModel wxFlowModel) { + wxFlowModel.setTenantId(getTenantId()); + return wxFlowService.createModel(wxFlowModel); + } + /** * 模板列表 */ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java index a67b23957..c03d8995a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java @@ -42,6 +42,7 @@ public class WxFlowConfig extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate") private Date updateDate; + @Transient private WxFlowModel wxFlowModel; @Transient diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java new file mode 100644 index 000000000..c45553609 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java @@ -0,0 +1,13 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxFlowConfig; +import java.util.List; + +/** + * @author luozukai + */ +public interface WxFlowConfigMapper extends CommonMapper { + List findList(WxFlowConfig wxFlowConfig); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java index 727181b8a..1f67633ad 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFlowService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFlowService.java @@ -101,6 +101,12 @@ public interface WxFlowService { */ ResultData findModelById(WxFlowModel wxFlowModel); + /** + * 删除模板 + * @return + */ + ResultData delModel(WxFlowModel wxFlowModel); + /** * 模板列表 * @return diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 0782a1790..26736dc58 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -1158,12 +1158,15 @@ public class WxFlowServiceImpl implements WxFlowService { process.addFlowElement(start); process.addFlowElement(sequenceFlow); - - wxFlowModel.setFlow(JsonUtil.obj2Json(wxFlowModel)); final IdWorker idWorker = IdWorker.get(); wxFlowModel.setId(idWorker.nextId()); - wxFlowModelMapper.insertSelective(wxFlowModel); + if(wxFlowModel.getId() == null) { + wxFlowModelMapper.insertSelective(wxFlowModel); + }else{ + wxFlowModel.setUpdateDate(new Date()); + wxFlowModelMapper.updateByPrimaryKeySelective(wxFlowModel); + } return new ResultData(); } @@ -1221,4 +1224,10 @@ public class WxFlowServiceImpl implements WxFlowService { public ResultData findModelById(WxFlowModel wxFlowModel) { return new ResultData(wxFlowModelMapper.selectByPrimaryKey(wxFlowModel.getId())); } + + @Override + public ResultData delModel(WxFlowModel wxFlowModel) { + wxFlowModelMapper.deleteByPrimaryKey(wxFlowModel.getId()); + return new ResultData(); + } } diff --git a/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml new file mode 100644 index 000000000..b836d6191 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + where 1 = 1 + + and `tenant_id` = #{tenantId} + + and `id` = #{id} + and `name` like concat('%', #{name},'%') + + order by ${sortColumns} + order by id desc + + + + + + + + +