Kaynağa Gözat

fix

release_toaliyun_real
winter 1 yıl önce
ebeveyn
işleme
5ac6a289e6
5 değiştirilmiş dosya ile 30 ekleme ve 42 silme
  1. +10
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java
  2. +11
    -12
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java
  3. +4
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  4. +3
    -14
      mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java
  5. +2
    -14
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 10
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java Dosyayı Görüntüle

@@ -84,6 +84,7 @@ public class WxAgileContractController extends WxContractBaseController {
}
PageInfo<WxRentContract> 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);
}


+ 11
- 12
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java Dosyayı Görüntüle

@@ -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<WxFlowModel> 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<WxFlowModel> 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) {


+ 4
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Dosyayı Görüntüle

@@ -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<WxRentContractRevenueJump> revenueJumps;


+ 3
- 14
mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java Dosyayı Görüntüle

@@ -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,"商户账单完结审批"),


+ 2
- 14
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Dosyayı Görüntüle

@@ -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;
}


Yükleniyor…
İptal
Kaydet