Просмотр исходного кода

[审批流][修改][init]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
49d6eddc9b
5 измененных файлов: 96 добавлений и 1 удалений
  1. +15
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java
  2. +18
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java
  4. +38
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java
  5. +24
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 15
- 0
mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java Просмотреть файл

@@ -207,5 +207,20 @@ public class WxFlowAbleController extends BaseController {
return wxFlowService.createModel(wxFlowModel);
}

/**
* 模板列表
*/
@ApiOperation("模板列表")
@GetMapping(value = "/modelList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
@SystemControllerLog(description = "工作流-模板列表")
public ResultData modelList(@ModelAttribute WxFlowModel wxFlowModel,Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList");
wxFlowModel.setTenantId(getTenantId());
return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize));
}

}

+ 18
- 0
mallinkService/src/main/java/com/iformall/domain/vo/FlowUserVo.java Просмотреть файл

@@ -0,0 +1,18 @@
package com.iformall.domain.vo;

import lombok.Data;
import java.io.Serializable;

@Data
public class FlowUserVo implements Serializable{
private static final long serialVersionUID = 1L;

@io.swagger.annotations.ApiModelProperty(value="用户id",name="id")
private Long id;

@io.swagger.annotations.ApiModelProperty(value="姓名",name="name")
private String name;


}

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java Просмотреть файл

@@ -13,7 +13,7 @@ public class UserTaskVo implements Serializable{
private String name;

@io.swagger.annotations.ApiModelProperty(value="用户列表",name="userList")
private List<Long> userList;
private List<FlowUserVo> userList;

//1普通 2会签 3或签
@io.swagger.annotations.ApiModelProperty(value="节点类型,1普通 2会签 3或签",name="type")


+ 38
- 0
mallinkService/src/main/java/com/iformall/enums/EnumTaskType.java Просмотреть файл

@@ -0,0 +1,38 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumTaskType {


NORMAL(1, "正常"),
AND(2, "会签"),
OR(3,"或签"),
;

public static EnumTaskType getEnum(Integer code) {
for (EnumTaskType value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumTaskType(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 24
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -4,11 +4,14 @@ import com.alibaba.druid.support.json.JSONUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.domain.po.msg.MailMsg;
import com.iformall.domain.po.msg.WxMsgRecord;
import com.iformall.domain.vo.FlowUserVo;
import com.iformall.domain.vo.UserTaskVo;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.*;
@@ -1135,6 +1138,27 @@ public class WxFlowServiceImpl implements WxFlowService {

@Override
public ResultData createModel(WxFlowModel wxFlowModel) {
final IdWorker idWorker = IdWorker.get();
wxFlowModel.setId(idWorker.nextId());

String flow = "发起人-";
for (UserTaskVo taskVo:wxFlowModel.getTaskList()) {
List<FlowUserVo> userInfoList = taskVo.getUserList();
for (int i = 0; i < userInfoList.size()-1; i++) {
if(i == userInfoList.size()-1){
flow += userInfoList.get(i).getName();
}else{
flow += userInfoList.get(i).getName() + "、";
}
}
if(taskVo.getType().equals(EnumTaskType.AND.getCode())){
flow += "(会签)";
}else if(taskVo.getType().equals(EnumTaskType.OR.getCode())){
flow += "(或签)";
}
flow += "-";
}
flow += "结束";
wxFlowModelMapper.insertSelective(wxFlowModel);
return new ResultData();
}


Загрузка…
Отмена
Сохранить