From 5ac6a289e66fc02755534a27ca9bc557362f2be1 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sun, 25 May 2025 23:36:48 +0800 Subject: [PATCH] fix --- .../contract/WxAgileContractController.java | 11 ++++++++- .../contract/WxContractBaseController.java | 23 +++++++++---------- .../iformall/domain/po/WxRentContract.java | 5 +++- .../java/com/iformall/enums/EnumFlowKey.java | 17 +++----------- .../service/impl/WxFlowServiceImpl.java | 16 ++----------- 5 files changed, 30 insertions(+), 42 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index 26e7979d2..6a262bd98 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -84,6 +84,7 @@ public class WxAgileContractController extends WxContractBaseController { } PageInfo page = wxAgileContractService.getRentContractList(wxRentContract, pageNum, pageSize); Integer hasFlow = null; + Integer hasFlowValidEdit = null; if (null != page && null != page.getList()) { for (WxRentContract wrc: page.getList()) { if (null == hasFlow) { @@ -94,9 +95,17 @@ public class WxAgileContractController extends WxContractBaseController { } } wrc.setFlowHas(hasFlow); + + if (null == hasFlowValidEdit) { + if(rentContractHasEditValidWorkFlow(wrc)) { + hasFlowValidEdit = 1; + }else { + hasFlowValidEdit = 0; + } + } + wrc.setFlowHasValidEdit(hasFlowValidEdit); } } - return new ResultData(page); } 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 a1015972d..45c32719f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java @@ -89,18 +89,6 @@ public class WxContractBaseController extends BaseController{ } - protected boolean rentPropertyHasWorkFlow(WxRentPropertyContractVo rpvo) { - WxFlowModel wxFlowModel = new WxFlowModel(); - wxFlowModel.setFlowType(EnumFlowKey.NNEW_RENT_CONTRACT.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(); wxFlowModel.setFlowType(EnumFlowKey.NEW_RENT_CONTRACT.getCode()); @@ -112,6 +100,17 @@ public class WxContractBaseController extends BaseController{ return false; } + protected boolean rentContractHasEditValidWorkFlow(WxRentContract wxRentContract) { + WxFlowModel wxFlowModel = new WxFlowModel(); + wxFlowModel.setFlowType(EnumFlowKey.NEW_EDIT_VALID_CONTRACT.getCode()); + wxFlowModel.updateTenantInfo(wxRentContract); + List flows = wxFlowService.getModelBybusiness(wxFlowModel); + if (null != flows && flows.size() > 0) { + return true; + } + return false; + } + public static boolean dateHasIntersection(Date startDate1, Date endDate1, Date startDate2, Date endDate2) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (startDate1.compareTo(endDate2) <= 0 && startDate2.compareTo(endDate1) <= 0) { 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 30981e688..ee84996b7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -225,9 +225,12 @@ public class WxRentContract extends TenantEntity { } } - @io.swagger.annotations.ApiModelProperty(value = "是否有工作流 1:有 0:无", name = "flowHas") + //是否有工作流 1:有 0:无" @TableField(exist = false) private Integer flowHas; + //是否有修改履约中工作流 1:有 0:无" + @TableField(exist = false) + private Integer flowHasValidEdit; //联营扣点跳点设置 @TableField(exist = false) private List revenueJumps; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java index 3404c1c76..69abe38a8 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java @@ -9,10 +9,9 @@ public enum EnumFlowKey { BILL(2, "end_bill_flow"),//账单审批 END_CONTRACT(3, "end_contract_flow"),//终止合同审批 - NEW_RENT_CONTRACT(4, "租金合同签约"), - //NEW_SHOP_CONTRACT(5, "多经点位租金合同签约"), - NEW_RENT_END_CONTRACT(6, "租金合同终止"), - //NEW_SHOP_END_CONTRACT(7, "多经点位租金合同终止"), + NEW_RENT_CONTRACT(4, "合同签约"), + NEW_EDIT_VALID_CONTRACT(5, "履约中合同修改"), + NEW_RENT_END_CONTRACT(6, "合同终止"), NEW_BILL_CHANGE(8, "账单应收金额变更"), @@ -26,16 +25,6 @@ public enum EnumFlowKey { NEW_COUPON_DISTRIBUTION_UPLINE(25,"配送商品审批"), NEW_COUPON_CREDIT_UPLINE(26,"积分券审批"), - NEW_PRO_CONTRACT(13, "物业合同签约"), - NEW_PRO_END(14, "物业合同终止"), - //NEW_PRO_POINT_CONTRACT(15, "多经点位物业合同签约"), - //NEW_PRO_POINT_CONTRACT_END(16, "多经点位物业合同终止"), - - NNEW_RENT_CONTRACT(17, "租金+物业合同签约"), - NEW_RENT_END(18, "租金+物业合同合同终止"), - //NEW_RENT_POINT_CONTRACT(19, "多经点位商铺租金+物业合同签约"), - //NEW_RENT_POINT_CONTRACT_END(20, "多经点位商铺租金+物业合同终止"), - SETTLE(21,"结算单审批"), BILL_FINISH(30,"商户账单完结审批"), 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 515dd0c35..117afcbff 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -177,11 +177,7 @@ public class WxFlowServiceImpl implements WxFlowService { contractType = Integer.parseInt(str); } - if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || - EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) || - EnumFlowKey.NEW_PRO_CONTRACT.getCode().equals(flowType)|| - EnumFlowKey.NNEW_RENT_CONTRACT.getCode().equals(flowType) - ){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType)){ // 1租赁合同 2点位合同 3物业 4点位物业合同 5 合并合同-店铺 6 合并合同-多经点位 if (EnumFlowContractType.RENT.getCode().equals(contractType) || EnumFlowContractType.WHOLE_SHOP.getCode().equals(contractType)) { @@ -239,11 +235,7 @@ public class WxFlowServiceImpl implements WxFlowService { }else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType)){ } - }else if(EnumFlowKey.END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_PRO_END.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END.getCode().equals(flowType) - ){ + }else if(EnumFlowKey.END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType)){ if(EnumFlowContractType.RENT.getCode().equals(contractType) || EnumFlowContractType.WHOLE_SHOP.getCode().equals(contractType)) { WxRentContract rent = new WxRentContract(); @@ -722,10 +714,6 @@ public class WxFlowServiceImpl implements WxFlowService { ||EnumFlowKey.END_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_CONTRACT.getCode().equals(flowType) || EnumFlowKey.NEW_RENT_END_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_PRO_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_PRO_END.getCode().equals(flowType) - || EnumFlowKey.NNEW_RENT_CONTRACT.getCode().equals(flowType) - || EnumFlowKey.NEW_RENT_END.getCode().equals(flowType) ){ return true; }