From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/api/ContractApi.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 3b3b680..069f207 100755
--- a/service-store/src/main/java/com/java110/store/api/ContractApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -14,19 +14,19 @@
import com.java110.dto.contract.ContractTypeDto;
import com.java110.dto.contract.ContractTypeSpecDto;
import com.java110.dto.contract.ContractTypeTemplateDto;
-import com.java110.entity.audit.AuditUser;
+import com.java110.dto.audit.AuditUser;
import com.java110.po.contract.ContractPo;
-import com.java110.po.contractAttr.ContractAttrPo;
-import com.java110.po.contractChangePlan.ContractChangePlanPo;
-import com.java110.po.contractChangePlanDetail.ContractChangePlanDetailPo;
-import com.java110.po.contractChangePlanDetailAttr.ContractChangePlanDetailAttrPo;
-import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
-import com.java110.po.contractCollectionPlan.ContractCollectionPlanPo;
-import com.java110.po.contractFile.ContractFilePo;
-import com.java110.po.contractRoom.ContractRoomPo;
-import com.java110.po.contractType.ContractTypePo;
-import com.java110.po.contractTypeSpec.ContractTypeSpecPo;
-import com.java110.po.contractTypeTemplate.ContractTypeTemplatePo;
+import com.java110.po.contract.ContractAttrPo;
+import com.java110.po.contract.ContractChangePlanPo;
+import com.java110.po.contract.ContractChangePlanDetailPo;
+import com.java110.po.contract.ContractChangePlanDetailAttrPo;
+import com.java110.po.contract.ContractChangePlanRoomPo;
+import com.java110.po.contract.ContractCollectionPlanPo;
+import com.java110.po.contract.ContractFilePo;
+import com.java110.po.contract.ContractRoomPo;
+import com.java110.po.contract.ContractTypePo;
+import com.java110.po.contract.ContractTypeSpecPo;
+import com.java110.po.contract.ContractTypeTemplatePo;
import com.java110.store.bmo.contract.IDeleteContractBMO;
import com.java110.store.bmo.contract.IGetContractBMO;
import com.java110.store.bmo.contract.ISaveContractBMO;
@@ -907,6 +907,8 @@
@RequestParam(value = "contractName", required = false) String contractName,
@RequestParam(value = "contractCode", required = false) String contractCode,
@RequestParam(value = "contractType", required = false) String contractType,
+ @RequestParam(value = "logStartTime", required = false) String logStartTime,
+ @RequestParam(value = "logEndTime", required = false) String logEndTime,
@RequestParam(value = "planId", required = false) String planId
) {
ContractChangePlanDto contractChangePlanDto = new ContractChangePlanDto();
@@ -918,6 +920,8 @@
contractChangePlanDto.setPlanId(planId);
contractChangePlanDto.setContractCode(contractCode);
contractChangePlanDto.setContractType(contractType);
+ contractChangePlanDto.setStartTime(logStartTime);
+ contractChangePlanDto.setEndTime(logEndTime);
return getContractChangePlanBMOImpl.get(contractChangePlanDto);
}
--
Gitblit v1.8.0