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

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

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
6e4cd19654
6 измененных файлов: 84 добавлений и 3 удалений
  1. +11
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxFlowConfig.java
  3. +13
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxFlowConfigMapper.java
  4. +6
    -0
      mallinkService/src/main/java/com/iformall/service/WxFlowService.java
  5. +12
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  6. +41
    -0
      mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml

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

@@ -218,6 +218,17 @@ public class WxFlowAbleController extends BaseController {
return wxFlowService.findModelById(wxFlowModel); return wxFlowService.findModelById(wxFlowModel);
} }


/**
* 删除模板
*/
@ApiOperation(value = "删除模板")
@PostMapping(value = "delModel")
@SystemControllerLog(description = "工作流-删除模板")
public ResultData delModel(@ModelAttribute WxFlowModel wxFlowModel) {
wxFlowModel.setTenantId(getTenantId());
return wxFlowService.createModel(wxFlowModel);
}

/** /**
* 模板列表 * 模板列表
*/ */


+ 1
- 0
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") @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate")
private Date updateDate; private Date updateDate;


@Transient
private WxFlowModel wxFlowModel; private WxFlowModel wxFlowModel;


@Transient @Transient


+ 13
- 0
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<WxFlowConfig, Long> {
List<WxFlowConfig> findList(WxFlowConfig wxFlowConfig);

}

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

@@ -101,6 +101,12 @@ public interface WxFlowService {
*/ */
ResultData findModelById(WxFlowModel wxFlowModel); ResultData findModelById(WxFlowModel wxFlowModel);


/**
* 删除模板
* @return
*/
ResultData delModel(WxFlowModel wxFlowModel);

/** /**
* 模板列表 * 模板列表
* @return * @return


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

@@ -1158,12 +1158,15 @@ public class WxFlowServiceImpl implements WxFlowService {
process.addFlowElement(start); process.addFlowElement(start);
process.addFlowElement(sequenceFlow); process.addFlowElement(sequenceFlow);




wxFlowModel.setFlow(JsonUtil.obj2Json(wxFlowModel)); wxFlowModel.setFlow(JsonUtil.obj2Json(wxFlowModel));
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
wxFlowModel.setId(idWorker.nextId()); 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(); return new ResultData();
} }


@@ -1221,4 +1224,10 @@ public class WxFlowServiceImpl implements WxFlowService {
public ResultData findModelById(WxFlowModel wxFlowModel) { public ResultData findModelById(WxFlowModel wxFlowModel) {
return new ResultData(wxFlowModelMapper.selectByPrimaryKey(wxFlowModel.getId())); return new ResultData(wxFlowModelMapper.selectByPrimaryKey(wxFlowModel.getId()));
} }

@Override
public ResultData delModel(WxFlowModel wxFlowModel) {
wxFlowModelMapper.deleteByPrimaryKey(wxFlowModel.getId());
return new ResultData();
}
} }

+ 41
- 0
mallinkService/src/main/resources/mapper/WxFlowConfigMapper.xml Просмотреть файл

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iformall.mapper.WxFlowConfigMapper">

<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxFlowConfig">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenantId" property="tenantId" />

<result column="parent_id" property="parentId" />
<result column="name" property="name" />
<result column="type" property="type" />
<result column="status" property="status" />
<result column="model_id" property="modelId" />

<result column="create_date" property="createDate" />
<result column="update_date" property="updateDate" />
</resultMap>


<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != id "> and `id` = #{id} </if>
<if test=" null != name "> and `name` like concat('%', #{name},'%') </if>

<if test=" null != sortColumns"> order by ${sortColumns} </if>
<if test=" null == sortColumns"> order by id desc </if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxFlowModel" resultMap="BaseResultMap">
select * from wx_flow_model
<include refid="dynamicWhereConditions" />
</select>





</mapper>

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