瀏覽代碼

fix

release_toaliyun_real
winter 1 年之前
父節點
當前提交
0779db007f
共有 3 個檔案被更改,包括 13 行新增5 行删除
  1. +9
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java
  2. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  3. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java

+ 9
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java 查看文件

@@ -8,6 +8,7 @@ import com.iformall.domain.vo.WxRentPropertyContractVo;
import com.iformall.enums.EnumContractOperationType; import com.iformall.enums.EnumContractOperationType;
import com.iformall.enums.EnumFlowContractType; import com.iformall.enums.EnumFlowContractType;
import com.iformall.enums.EnumFlowKey; import com.iformall.enums.EnumFlowKey;
import com.iformall.enums.EnumRentAgileType;
import com.iformall.enums.EnumRentShopType; import com.iformall.enums.EnumRentShopType;
import com.iformall.service.WxFlowService; import com.iformall.service.WxFlowService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,7 @@ public class WxContractBaseController extends BaseController{
@Autowired @Autowired
private WxFlowService wxFlowService; private WxFlowService wxFlowService;
protected Map<String,Object> generateFlowParams(EnumFlowKey flowType,EnumFlowContractType contractType,String remark,Long contractId,Long wholeProperyId) {
protected Map<String,Object> generateFlowParams(EnumFlowKey flowType,EnumFlowContractType contractType,EnumRentAgileType agileType,String remark,Long contractId,Long wholeProperyId) {
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
map.put("businessType", flowType.getCode()); map.put("businessType", flowType.getCode());
map.put("remark", remark); map.put("remark", remark);
@@ -52,6 +53,13 @@ public class WxContractBaseController extends BaseController{
} }
variablesList.add(contractNumberMap); variablesList.add(contractNumberMap);
if (null != agileType) {
Map agileTypeMap = new HashMap<String,Object>();
agileTypeMap.put("key","agileType");
agileTypeMap.put("value",String.valueOf(agileType.getCode()));
variablesList.add(agileTypeMap);
}
map.put("variables", variablesList); map.put("variables", variablesList);
return map; return map;
} }


+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java 查看文件

@@ -484,9 +484,9 @@ public class WxPropertyContractController extends WxContractBaseController {
remark = (String) map.get("remark"); remark = (String) map.get("remark");
} }
if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) { if(contract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()) {
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY, remark, contract.getId(),null));
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.PROPERTY,null, remark, contract.getId(),null));
}else { }else {
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.WHOLE_SHOP, remark, contract.getId(),null));
contract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_PRO_CONTRACT, EnumFlowContractType.WHOLE_SHOP,null, remark, contract.getId(),null));
} }
return wxPropertyContractService.apply(contract,user); return wxPropertyContractService.apply(contract,user);
} }


+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java 查看文件

@@ -660,9 +660,9 @@ public class WxRentContractController extends WxContractBaseController {
if(rentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue() || if(rentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue() ||
rentContract.getOperationType().intValue() == EnumContractOperationType.JINMAO.getCode().intValue()) { rentContract.getOperationType().intValue() == EnumContractOperationType.JINMAO.getCode().intValue()) {
rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_RENT_CONTRACT, EnumFlowContractType.RENT, wxRentContract.getRemark(), wxRentContract.getId(),null));
rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_RENT_CONTRACT, EnumFlowContractType.RENT,EnumRentAgileType.getEnum(rentContract.getAgileType()), wxRentContract.getRemark(), wxRentContract.getId(),null));
}else if(rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()){ }else if(rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()){
rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NNEW_RENT_CONTRACT, EnumFlowContractType.WHOLE_SHOP, wxRentContract.getRemark(), wxRentContract.getId(),wxRentContract.getPropertyId()));
rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NNEW_RENT_CONTRACT, EnumFlowContractType.WHOLE_SHOP, EnumRentAgileType.getEnum(rentContract.getAgileType()),wxRentContract.getRemark(), wxRentContract.getId(),wxRentContract.getPropertyId()));
}else { }else {
return new ResultData(Result.ERROR,"合同操作类型非法。"); return new ResultData(Result.ERROR,"合同操作类型非法。");
} }


Loading…
取消
儲存