From a14366e2f6cf2a08c3d7ea7c722e6d6d09e51cab Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 04 八月 2021 16:23:52 +0800
Subject: [PATCH] 优化代码

---
 service-store/src/main/java/com/java110/store/bmo/contract/impl/GetContractBMOImpl.java |   47 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 43 insertions(+), 4 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 7a98b92..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,18 +1,16 @@
 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.purchaseApply.PurchaseApplyDto;
+import com.java110.dto.contractChangePlan.ContractChangePlanDto;
 import com.java110.entity.audit.AuditUser;
 import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
+import com.java110.intf.common.IContractChangeUserInnerServiceSMO;
 import com.java110.intf.store.IContractAttrInnerServiceSMO;
 import com.java110.intf.store.IContractInnerServiceSMO;
 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;
@@ -32,6 +30,9 @@
 
     @Autowired
     private IContractApplyUserInnerServiceSMO contractApplyUserInnerServiceSMOImpl;
+
+    @Autowired
+    private IContractChangeUserInnerServiceSMO contractChangeUserInnerServiceSMO;
 
     /**
      * @param contractDto
@@ -58,6 +59,44 @@
     }
 
     @Override
+    public ResponseEntity<String> queryContractChangeTask(AuditUser auditUser) {
+        long count = contractChangeUserInnerServiceSMO.getUserTaskCount(auditUser);
+
+        List<ContractChangePlanDto> contractChangePlanDtos = null;
+
+        if (count > 0) {
+            contractChangePlanDtos = contractChangeUserInnerServiceSMO.getUserTasks(auditUser);
+        } else {
+            contractChangePlanDtos = new ArrayList<>();
+        }
+        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
+    public ResponseEntity<String> queryContractChangeHistoryTask(AuditUser auditUser) {
+
+        long count = contractChangeUserInnerServiceSMO.getUserHistoryTaskCount(auditUser);
+
+        List<ContractChangePlanDto> contractChangePlanDtos = null;
+
+        if (count > 0) {
+            contractChangePlanDtos = contractChangeUserInnerServiceSMO.getUserHistoryTasks(auditUser);
+        } else {
+            contractChangePlanDtos = new ArrayList<>();
+        }
+        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
     public ResponseEntity<String> queryContractTask(AuditUser auditUser) {
         long count = contractApplyUserInnerServiceSMOImpl.getUserTaskCount(auditUser);
 

--
Gitblit v1.8.0