From b8c4ec8075c48fd4c682a0ccec16ef70fad40a09 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 25 Aug 2020 11:50:50 +0800 Subject: [PATCH 1/4] fix contract --- .../contract/WxPropertyContractController.java | 16 +++++++++++++++- .../contract/WxRentContractController.java | 13 ++++++++++++- .../iformall/domain/po/WxPropertyContract.java | 4 ++++ .../com/iformall/domain/po/WxRentContract.java | 5 +++++ .../service/WxPropertyContractService.java | 3 ++- .../impl/WxPropertyContractServiceImpl.java | 10 +++++----- 6 files changed, 43 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index cdb409c38..c3d0c8a96 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -1,5 +1,6 @@ package com.iformall.controller.contract; +import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.UserDataRuleAnnotation; import com.iformall.common.ErrorCode; @@ -36,6 +37,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,7 +69,19 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract = new WxPropertyContract(); } wxPropertyContract.updateTenantInfo(getTenantInfo()); - Map result = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); + Map result = new HashMap<>(); + PageInfo pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); + if (null != pageInfo && null != pageInfo.getList()) { + for (WxPropertyContract wpc : pageInfo.getList()) { + if(propertyContractHasWorkFlow(wpc)) { + wpc.setFlowHas(1); + }else { + wpc.setFlowHas(0); + } + } + } + + result.put("pageInfo", pageInfo); return new ResultData(result); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 48c2d8270..bfe181def 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -87,7 +87,18 @@ public class WxRentContractController extends WxContractBaseController { wxRentContract.updateTenantInfo(getTenantInfo()); wxRentContract.setSortColumns(SortField.Createtime_DESC); //Map result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize); - return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); + PageInfo page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); + if (null != page && null != page.getList()) { + for (WxRentContract wrc: page.getList()) { + if(rentContractHasWorkFlow(wrc)) { + wrc.setFlowHas(1); + }else { + wrc.setFlowHas(0); + } + } + } + + return new ResultData(page); } /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index c90a3968e..6671792dd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -183,6 +183,10 @@ public class WxPropertyContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "审批备注", name = "remark") private String remark; + @io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas") + @TableField(exist = false) + private Integer flowHas; + // public Integer getAdjustPeriod() { // if(EnumPriceUnit.D.getCode().equals(this.getPriceUnit()) && EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode().equals(adjustPeriod)){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 56af850fc..9b06f769b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -250,6 +250,11 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "查询店铺", name = "queryShopId") @TableField(exist = false) private Long queryShopId; + + @io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas") + @TableField(exist = false) + private Integer flowHas; + public void setAdjustPeriodHandle() { if(EnumPriceUnit.D.getCode().equals(this.getPriceUnit()) && EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode().equals(adjustPeriod)){ diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index f49a29a64..b3aed8cf8 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -1,5 +1,6 @@ package com.iformall.service; +import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; @@ -28,7 +29,7 @@ public interface WxPropertyContractService { * @param pageSize * @return */ - Map listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 5ed628465..72dc4ba4d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -77,15 +77,15 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService WxPayAccountBillService wxPayAccountBillService; @Override - public Map listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { + public PageInfo listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { //Object rentContractStatusInfo = getRentContractStatusInfo(record); //PageHelper.startPage(pageIndex, pageSize); //List> rentContractData = wxPropertyContractMapper.queryPropertyContractData(record); - Map result = new HashMap<>(); - PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); + //Map result = new HashMap<>(); + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); //result.put("rentContractStatusInfo", rentContractStatusInfo); - result.put("pageInfo", pageInfo); - return result; + //result.put("pageInfo", pageInfo); + return pageInfo; } @Override From b073fd1275a3bb17a6968283a6d90a2623a04c1e Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 25 Aug 2020 11:59:30 +0800 Subject: [PATCH 2/4] fix contract --- .../contract/WxContractBaseController.java | 17 +++++++++++++++++ .../WxRentPropertyContractController.java | 12 +++++++++++- .../domain/vo/WxRentPropertyContractVo.java | 4 ++++ .../resources/mapper/WxRentContractMapper.xml | 4 +++- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java index d5dfee682..6116698c2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -12,6 +12,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.vo.WxRentPropertyContractVo; import com.iformall.enums.EnumContractOperationType; import com.iformall.enums.EnumFlowContractType; import com.iformall.enums.EnumFlowKey; @@ -48,6 +49,22 @@ public class WxContractBaseController extends BaseController{ return map; } + protected boolean rentPropertyHasWorkFlow(WxRentPropertyContractVo rpvo) { + WxFlowModel wxFlowModel = new WxFlowModel(); + if (rpvo.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_SHOP.getCode()); + }else if (rpvo.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { + wxFlowModel.setFlowType(EnumFlowContractType.WHOLE_POINT.getCode()); + } + wxFlowModel.updateTenantInfo(rpvo); + List flows = wxFlowService.getModelBybusiness(wxFlowModel); + if (null != flows && flows.size() > 0) { + return true; + } + return false; + + } + protected boolean rentContractHasWorkFlow(WxRentContract wxRentContract) { WxFlowModel wxFlowModel = new WxFlowModel(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index bbcebeea6..c8eb9e245 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -39,7 +39,17 @@ public class WxRentPropertyContractController extends WxContractBaseController { wxRentPropertyContractVo = new WxRentPropertyContractVo(); } wxRentPropertyContractVo.updateTenantInfo(getTenantInfo()); - final PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); + PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); + if (null != page && null != page.getList()) { + for (WxRentPropertyContractVo wrc: page.getList()) { + if(rentPropertyHasWorkFlow(wrc)) { + wrc.setFlowHas(1); + }else { + wrc.setFlowHas(0); + } + } + } + return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index ddccc227a..a4ee35a22 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -1,5 +1,6 @@ package com.iformall.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -80,5 +81,8 @@ public class WxRentPropertyContractVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "联营扣点-时间范围 1年2月3周期", name = "busDiscountTime") private Integer busDiscountTime; + + @io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas") + private Integer flowHas; } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index ea85c90ae..8a0d3835e 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -516,6 +516,8 @@ + + @@ -540,7 +542,7 @@