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

[审批][修改][全列表添加过滤审批]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
57487ad83f
5 измененных файлов: 23 добавлений и 12 удалений
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java
  2. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java
  3. +0
    -3
      mallinkService/src/main/java/com/iformall/service/WxFlowService.java
  4. +12
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  5. +3
    -0
      mallinkService/src/main/resources/mapper/WxFlowRecordMapper.xml

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

@@ -105,7 +105,6 @@ public class WxFlowAbleController extends BaseController {
return new ResultData(pageInfo); return new ResultData(pageInfo);
} }



/** /**
* 审批历史 * 审批历史
*/ */


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

@@ -61,6 +61,9 @@ public class WxFlowRecord implements Serializable {
@Transient @Transient
private Integer taskType; private Integer taskType;


//coupon 操作类型
@Transient
private Integer approvalType;


public WxFlowRecord(){} public WxFlowRecord(){}
public WxFlowRecord(Long businessId){ public WxFlowRecord(Long businessId){
@@ -74,4 +77,9 @@ public class WxFlowRecord implements Serializable {
this.businessId = businessId; this.businessId = businessId;
this.tenantId = tenantId; this.tenantId = tenantId;
} }
public WxFlowRecord(Long businessId,String tenantId,Integer approvalType){
this.businessId = businessId;
this.tenantId = tenantId;
this.approvalType = approvalType;
}
} }

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

@@ -49,9 +49,6 @@ public interface WxFlowService {
*/ */
ResultData applyHistory(Long businessId,String tenantId); ResultData applyHistory(Long businessId,String tenantId);



ResultData applyHistoryForCoupon(Long couponId,String tenantId);

/** /**
* 审批 * 审批
* @param params * @param params


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

@@ -549,7 +549,18 @@ public class WxFlowServiceImpl implements WxFlowService {


@Override @Override
public ResultData applyHistory(Long businessId,String tenantId) { public ResultData applyHistory(Long businessId,String tenantId) {
List<WxFlowRecord> result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId));
List<WxFlowRecord> result;
WxCoupon query = new WxCoupon();
query.setTenantId(tenantId);
query.setId(businessId);
List<WxCoupon> couponList = wxCouponMapper.findCouponList(query);
if(CollectionUtils.isNotEmpty(couponList)) {
WxCoupon coupon = couponList.get(0);
result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId,coupon.getApprovalType()));
}else{
result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId));
}

if(CollectionUtils.isNotEmpty(result)){ if(CollectionUtils.isNotEmpty(result)){
String processInstanceId = result.get(0).getProcessInstanceId(); String processInstanceId = result.get(0).getProcessInstanceId();
List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstanceId); List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstanceId);
@@ -570,13 +581,6 @@ public class WxFlowServiceImpl implements WxFlowService {
return new ResultData(result); return new ResultData(result);
} }


@Override
public ResultData applyHistoryForCoupon(Long couponId, String tenantId) {


return null;
}

@Override @Override
public ResultData getTaskStatusList(Long businessId, String tenantId) { public ResultData getTaskStatusList(Long businessId, String tenantId) {
List<WxFlowRecord> resultList = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); List<WxFlowRecord> resultList = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId));


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

@@ -57,6 +57,9 @@
#{idItem} #{idItem}
</foreach> </foreach>
</if> </if>
<if test=" null != approvalType ">
and json_extract(variables,'$.approvalType') = #{approvalType}
</if>
order by create_date desc order by create_date desc
</sql> </sql>


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