java110-bean/src/main/java/com/java110/dto/contract/ContractDto.java
@@ -42,6 +42,7 @@ private String[] contractIds; private String objId; private String contractName; private String contractNameLike; private String startTime; private String endTime; private String state; @@ -443,4 +444,12 @@ public void setCommunityId(String communityId) { this.communityId = communityId; } public String getContractNameLike() { return contractNameLike; } public void setContractNameLike(String contractNameLike) { this.contractNameLike = contractNameLike; } } java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml
@@ -92,6 +92,9 @@ <if test="contractName !=null and contractName != ''"> and t.contract_name= #{contractName} </if> <if test="contractNameLike !=null and contractNameLike != ''"> and t.contract_name like concat('%',#{contractNameLike},'%') </if> <if test="startTime !=null"> and t.start_time= #{startTime} </if> service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -379,6 +379,7 @@ @RequestParam(value = "expiration", required = false) String expiration, @RequestParam(value = "objId", required = false) String objId, @RequestParam(value = "contractId", required = false) String contractId, @RequestParam(value = "contractNameLike", required = false) String contractNameLike, @RequestParam(value = "contractCode", required = false) String contractCode, @RequestParam(value = "page") int page, @RequestParam(value = "row") int row) { @@ -390,6 +391,7 @@ contractDto.setObjId(objId); contractDto.setContractId(contractId); contractDto.setContractCode(contractCode); contractDto.setContractNameLike(contractNameLike); //如果是到期合同 if ("1".equals(expiration)) { contractDto.setNoStates(new String[]{ContractDto.STATE_COMPLAINT, ContractDto.STATE_FAIL}); service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
@@ -108,12 +108,14 @@ deleteContractFileBMOImpl.delete(contractFilePo); List<ContractFilePo> filePos = contractPo.getContractFilePo(); if(filePos != null) { for (ContractFilePo file: filePos) { if (file.getFileRealName().length() > 0 && file.getFileSaveName().length() > 0){ file.setContractId(contractPo.getContractId()); contractFileInnerServiceSMOImpl.saveContractFile(file); } } } noticeRentUpdateState(contractPo);