优化diamante

service-store/src/main/java/com/java110/store/api/ContractApi.java

@@ -9,6 +9,7 @@ import com.java110.dto.contractChangePlanDetailAttr.ContractChangePlanDetailAttr
 import com.java110.dto.contractType.ContractTypeDto;
 import com.java110.dto.contractTypeSpec.ContractTypeSpecDto;
 import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto;
+import com.java110.entity.audit.AuditUser;
 import com.java110.po.contract.ContractPo;
 import com.java110.po.contractAttr.ContractAttrPo;
 import com.java110.po.contractChangePlan.ContractChangePlanPo;
@@ -54,12 +55,7 @@ import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 @RestController
@@ -181,7 +177,7 @@ public class ContractApi {
         if (!reqJson.containsKey("contractParentId") || "-1".equals(reqJson.getString("contractParentId"))) {
             contractPo.setContractParentId("-1");
         }
-        reqJson.put("userId",userId);
+        reqJson.put("userId", userId);
         return saveContractBMOImpl.save(contractPo, reqJson);
     }
 
@@ -304,6 +300,54 @@ public class ContractApi {
         return getContractBMOImpl.get(contractDto);
     }
 
+    /**
+     * 合同起草待办
+     *
+     * @param storeId    商户ID
+     * @return
+     * @serviceCode /contract/queryContractTask
+     * @path /app/contract/queryContractTask
+     */
+    @RequestMapping(value = "/queryContractTask", method = RequestMethod.GET)
+    public ResponseEntity<String> queryContractTask(@RequestHeader(value = "store-id") String storeId,
+                                                    @RequestHeader(value = "user-id") String userId,
+                                                    @RequestParam(value = "page") int page,
+                                                    @RequestParam(value = "row") int row) {
+        AuditUser auditUser = new AuditUser();
+        auditUser.setUserId(userId);
+        auditUser.setPage(page);
+        auditUser.setRow(row);
+        auditUser.setStoreId(storeId);
+
+        return getContractBMOImpl.queryContractTask(auditUser);
+    }
+
+    /**
+     * 合同起草已办
+     *
+     * @param storeId    商户ID
+     * @return
+     * @serviceCode /contract/queryContractHistoryTask
+     * @path /app/contract/queryContractHistoryTask
+     */
+    @RequestMapping(value = "/queryContractHistoryTask", method = RequestMethod.GET)
+    public ResponseEntity<String> queryContractHistoryTask(@RequestHeader(value = "store-id") String storeId,
+                                                    @RequestHeader(value = "user-id") String userId,
+                                                    @RequestParam(value = "page") int page,
+                                                    @RequestParam(value = "row") int row) {
+
+
+        AuditUser auditUser = new AuditUser();
+        auditUser.setUserId(userId);
+        auditUser.setPage(page);
+        auditUser.setRow(row);
+        auditUser.setStoreId(storeId);
+
+        return getContractBMOImpl.queryContractHistoryTask(auditUser);
+    }
+
+
+
     /**
      * 微信保存消息模板
      *

service-store/src/main/java/com/java110/store/bmo/contract/IGetContractBMO.java

@@ -1,6 +1,7 @@
 package com.java110.store.bmo.contract;
 
 import com.java110.dto.contract.ContractDto;
+import com.java110.entity.audit.AuditUser;
 import org.springframework.http.ResponseEntity;
 
 public interface IGetContractBMO {
@@ -16,4 +17,7 @@ public interface IGetContractBMO {
     ResponseEntity<String> get(ContractDto contractDto);
 
 
+    ResponseEntity<String> queryContractTask(AuditUser auditUser);
+
+    ResponseEntity<String> queryContractHistoryTask(AuditUser auditUser);
 }

service-store/src/main/java/com/java110/store/bmo/contract/impl/GetContractBMOImpl.java

@@ -1,11 +1,18 @@
 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.entity.audit.AuditUser;
+import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
 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;
@@ -23,6 +30,9 @@ public class GetContractBMOImpl implements IGetContractBMO {
     @Autowired
     private IContractAttrInnerServiceSMO contractAttrInnerServiceSMOImpl;
 
+    @Autowired
+    private IContractApplyUserInnerServiceSMO contractApplyUserInnerServiceSMOImpl;
+
     /**
      * @param contractDto
      * @return 订单服务能够接受的报文
@@ -47,6 +57,45 @@ public class GetContractBMOImpl implements IGetContractBMO {
         return responseEntity;
     }
 
+    @Override
+    public ResponseEntity<String> queryContractTask(AuditUser auditUser) {
+        long count = contractApplyUserInnerServiceSMOImpl.getUserTaskCount(auditUser);
+
+        List<ContractDto> contractDtos = null;
+
+        if (count > 0) {
+            List<ContractDto> purchaseApplyDtos = contractApplyUserInnerServiceSMOImpl.getUserTasks(auditUser);
+            contractDtos = BeanConvertUtil.covertBeanList(purchaseApplyDtos, ContractDto.class);
+        } else {
+            contractDtos = new ArrayList<>();
+        }
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) auditUser.getRow()), new Long(count).intValue(), contractDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+    @Override
+    public ResponseEntity<String> queryContractHistoryTask(AuditUser auditUser) {
+
+        long count = contractApplyUserInnerServiceSMOImpl.getUserHistoryTaskCount(auditUser);
+
+        List<ContractDto> contractDtos = null;
+
+        if (count > 0) {
+            List<ContractDto> purchaseApplyDtos = contractApplyUserInnerServiceSMOImpl.getUserHistoryTasks(auditUser);
+            contractDtos = BeanConvertUtil.covertBeanList(purchaseApplyDtos, ContractDto.class);
+        } else {
+            contractDtos = new ArrayList<>();
+        }
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) auditUser.getRow()), new Long(count).intValue(), contractDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
     /**
      * 属性属性
      *