From 83c1b8423486da7d446bb4c1cf1fbe53a9bf7092 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 31 三月 2021 11:53:30 +0800
Subject: [PATCH] 到期合同查询
---
service-store/src/main/java/com/java110/store/api/ContractApi.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/api/ContractApi.java b/service-store/src/main/java/com/java110/store/api/ContractApi.java
index 9fabcc4..1e1e9d2 100644
--- a/service-store/src/main/java/com/java110/store/api/ContractApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -51,14 +51,10 @@
import com.java110.store.bmo.contractTypeTemplate.IUpdateContractTypeTemplateBMO;
import com.java110.utils.util.Assert;
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
@@ -251,7 +247,8 @@
/**
* 寰俊鍒犻櫎娑堟伅妯℃澘
*
- * @param storeId 鍟嗘埛ID
+ * @param storeId 鍟嗘埛ID
+ * @param expiration 鍒版湡鍚堝悓鏍囪 1 鍒版湡鍚堝悓
* @return
* @serviceCode /contract/queryContract
* @path /app/contract/queryContract
@@ -259,6 +256,7 @@
@RequestMapping(value = "/queryContract", method = RequestMethod.GET)
public ResponseEntity<String> queryContract(@RequestHeader(value = "store-id") String storeId,
@RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "expiration", required = false) String expiration,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ContractDto contractDto = new ContractDto();
@@ -266,6 +264,11 @@
contractDto.setRow(row);
contractDto.setStoreId(storeId);
contractDto.setState(state);
+ //濡傛灉鏄埌鏈熷悎鍚�
+ if ("1".equals(expiration)) {
+ contractDto.setNoStates(new String[]{ContractDto.STATE_COMPLAINT, ContractDto.STATE_FAIL});
+ contractDto.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ }
return getContractBMOImpl.get(contractDto);
}
@@ -628,9 +631,9 @@
contractChangePlanPo.setState(ContractChangePlanDto.STATE_W);
contractChangePlanPo.setRemark(reqJson.getString("changeRemark"));
- ContractChangePlanDetailPo contractChangePlanDetailPo = BeanConvertUtil.covertBean(reqJson,ContractChangePlanDetailPo.class);
+ ContractChangePlanDetailPo contractChangePlanDetailPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanDetailPo.class);
contractChangePlanDetailPo.setStoreId(storeId);
- return saveContractChangePlanBMOImpl.save(contractChangePlanPo,contractChangePlanDetailPo);
+ return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo);
}
/**
@@ -686,9 +689,9 @@
public ResponseEntity<String> queryContractChangePlan(@RequestHeader(value = "store-id") String storeId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row,
- @RequestParam(value = "contractId",required = false) String contractId,
- @RequestParam(value = "contractName",required = false) String contractName,
- @RequestParam(value = "planId",required = false) String planId
+ @RequestParam(value = "contractId", required = false) String contractId,
+ @RequestParam(value = "contractName", required = false) String contractName,
+ @RequestParam(value = "planId", required = false) String planId
) {
ContractChangePlanDto contractChangePlanDto = new ContractChangePlanDto();
contractChangePlanDto.setPage(page);
@@ -795,8 +798,8 @@
*/
@RequestMapping(value = "/queryContractChangePlanDetail", method = RequestMethod.GET)
public ResponseEntity<String> queryContractChangePlanDetail(@RequestHeader(value = "store-id") String storeId,
- @RequestParam(value = "planId",required = false) String planId,
- @RequestParam(value = "contractId",required = false) String contractId,
+ @RequestParam(value = "planId", required = false) String planId,
+ @RequestParam(value = "contractId", required = false) String contractId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ContractChangePlanDetailDto contractChangePlanDetailDto = new ContractChangePlanDetailDto();
--
Gitblit v1.8.0