diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java index a04fa5f12..4fed51a3a 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java @@ -6,7 +6,7 @@ package com.iformall.enums; public enum EnumTaskType { - NORMAL(1, "正常"), + NORMAL(1, "普通"), AND(2, "会签"), OR(3,"或签"), ; 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 054247257..1368e80f8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -86,8 +86,6 @@ public class WxFlowServiceImpl implements WxFlowService { @Autowired private MqBaseProducer mqBaseProducer; @Autowired - private WxBillActionService wxBillActionService; - @Autowired private WxBillPropertyDepositMapper wxBillPropertyDepositMapper; @Autowired private WxBillDepositMapper wxBillDepositMapper; @@ -1201,10 +1199,10 @@ public class WxFlowServiceImpl implements WxFlowService { } } + //部署 BpmnModel bpmnModel = new BpmnModel(); bpmnModel.addProcess(process); DeploymentBuilder deploymentBuilder = repositoryService.createDeployment().addBpmnModel(process.getId()+".bpmn20.xml", bpmnModel); - //部署 deploymentBuilder.deploy(); wxFlowModel.setFlowId(process.getId()); @@ -1220,6 +1218,11 @@ public class WxFlowServiceImpl implements WxFlowService { return new ResultData(); } + /** + * 创建连接线 + * @param size + * @return + */ public List createFlow(int size){ List result = new ArrayList<>(); for (int i = 0; i < size+1; i++) { @@ -1278,7 +1281,6 @@ public class WxFlowServiceImpl implements WxFlowService { return new ResultData(Result.ERROR, "该流程模板在使用中,须先停用正在\n" + "使用该模板的审批类型。"); } - wxFlowModelMapper.deleteByPrimaryKey(wxFlowModel.getId()); return new ResultData(); } diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 975c901c4..a4aca973c 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -275,12 +275,12 @@ - u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,u.`flow_permission`, + u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`, m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h`,email - u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,u.`flow_permission`, + u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`, u.`bopen_id`,u.`web_open_id`, m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h`,email