From a4e5cf9180a6111d9037738c78f167ec3efae8a0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 30 五月 2021 14:21:17 +0800
Subject: [PATCH] 优化删除合同校验
---
service-store/src/main/java/com/java110/store/bmo/contract/impl/GetContractBMOImpl.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/bmo/contract/impl/GetContractBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/contract/impl/GetContractBMOImpl.java
old mode 100644
new mode 100755
index e7986f7..44c5779
--- a/service-store/src/main/java/com/java110/store/bmo/contract/impl/GetContractBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/contract/impl/GetContractBMOImpl.java
@@ -1,10 +1,8 @@
package com.java110.store.bmo.contract.impl;
-import com.alibaba.fastjson.JSONObject;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.contractAttr.ContractAttrDto;
import com.java110.dto.contractChangePlan.ContractChangePlanDto;
-import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.entity.audit.AuditUser;
import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
import com.java110.intf.common.IContractChangeUserInnerServiceSMO;
@@ -13,8 +11,6 @@
import com.java110.store.bmo.contract.IGetContractBMO;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
-import com.java110.vo.api.resourceOrder.ApiResourceOrderDataVo;
-import com.java110.vo.api.resourceOrder.ApiResourceOrderVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -37,6 +33,7 @@
@Autowired
private IContractChangeUserInnerServiceSMO contractChangeUserInnerServiceSMO;
+
/**
* @param contractDto
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
@@ -60,19 +57,19 @@
return responseEntity;
}
+
@Override
public ResponseEntity<String> queryContractChangeTask(AuditUser auditUser) {
long count = contractChangeUserInnerServiceSMO.getUserTaskCount(auditUser);
- List<ContractDto> contractDtos = null;
+ List<ContractChangePlanDto> contractChangePlanDtos = null;
if (count > 0) {
- List<ContractChangePlanDto> purchaseApplyDtos = contractChangeUserInnerServiceSMO.getUserTasks(auditUser);
- contractDtos = BeanConvertUtil.covertBeanList(purchaseApplyDtos, ContractDto.class);
+ contractChangePlanDtos = contractChangeUserInnerServiceSMO.getUserTasks(auditUser);
} else {
- contractDtos = new ArrayList<>();
+ contractChangePlanDtos = new ArrayList<>();
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) auditUser.getRow()), new Long(count).intValue(), contractDtos);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) auditUser.getRow()), new Long(count).intValue(), contractChangePlanDtos);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
@@ -84,21 +81,19 @@
long count = contractChangeUserInnerServiceSMO.getUserHistoryTaskCount(auditUser);
- List<ContractDto> contractDtos = null;
+ List<ContractChangePlanDto> contractChangePlanDtos = null;
if (count > 0) {
- List<ContractChangePlanDto> purchaseApplyDtos = contractChangeUserInnerServiceSMO.getUserHistoryTasks(auditUser);
- contractDtos = BeanConvertUtil.covertBeanList(purchaseApplyDtos, ContractDto.class);
+ contractChangePlanDtos = contractChangeUserInnerServiceSMO.getUserHistoryTasks(auditUser);
} else {
- contractDtos = new ArrayList<>();
+ contractChangePlanDtos = new ArrayList<>();
}
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) auditUser.getRow()), new Long(count).intValue(), contractDtos);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) auditUser.getRow()), new Long(count).intValue(), contractChangePlanDtos);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
return responseEntity;
}
-
@Override
--
Gitblit v1.8.0