From dd9759eaa3dabd3d55943fc0c741fd5018d2d76e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 31 五月 2023 16:43:29 +0800
Subject: [PATCH] optimize dining
---
service-store/src/main/java/com/java110/store/api/ContractApi.java | 79 +++++++++++++++------------------------
1 files changed, 30 insertions(+), 49 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 ae84700..3b3b680 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
@@ -5,15 +5,15 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.contract.ContractDto;
-import com.java110.dto.contractAttr.ContractAttrDto;
-import com.java110.dto.contractChangePlan.ContractChangePlanDto;
-import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto;
-import com.java110.dto.contractChangePlanDetailAttr.ContractChangePlanDetailAttrDto;
-import com.java110.dto.contractCollectionPlan.ContractCollectionPlanDto;
-import com.java110.dto.contractRoom.ContractRoomDto;
-import com.java110.dto.contractType.ContractTypeDto;
-import com.java110.dto.contractTypeSpec.ContractTypeSpecDto;
-import com.java110.dto.contractTypeTemplate.ContractTypeTemplateDto;
+import com.java110.dto.contract.ContractAttrDto;
+import com.java110.dto.contract.ContractChangePlanDto;
+import com.java110.dto.contract.ContractChangePlanDetailDto;
+import com.java110.dto.contract.ContractChangePlanDetailAttrDto;
+import com.java110.dto.contract.ContractCollectionPlanDto;
+import com.java110.dto.contract.ContractRoomDto;
+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.po.contract.ContractPo;
import com.java110.po.contractAttr.ContractAttrPo;
@@ -66,7 +66,6 @@
import com.java110.store.bmo.contractTypeTemplate.*;
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.*;
@@ -364,41 +363,6 @@
}
- /**
- * 寰俊鍒犻櫎娑堟伅妯℃澘
- *
- * @param storeId 鍟嗘埛ID
- * @param expiration 鍒版湡鍚堝悓鏍囪 1 鍒版湡鍚堝悓
- * @return
- * @serviceCode /contract/queryContract
- * @path /app/contract/queryContract
- */
- @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 = "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) {
- ContractDto contractDto = new ContractDto();
- contractDto.setPage(page);
- contractDto.setRow(row);
- contractDto.setStoreId(storeId);
- contractDto.setState(state);
- 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});
- contractDto.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- }
- return getContractBMOImpl.get(contractDto);
- }
/**
* 鍚堝悓璧疯崏寰呭姙
@@ -560,11 +524,17 @@
*/
@RequestMapping(value = "/queryContractType", method = RequestMethod.GET)
public ResponseEntity<String> queryContractType(@RequestHeader(value = "store-id") String storeId,
+ @RequestParam(value = "audit", required = false) String audit,
+ @RequestParam(value = "typeName", required = false) String typeName,
+ @RequestParam(value = "contractTypeId", required = false) String contractTypeId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ContractTypeDto contractTypeDto = new ContractTypeDto();
contractTypeDto.setPage(page);
contractTypeDto.setRow(row);
+ contractTypeDto.setAudit(audit);
+ contractTypeDto.setTypeName(typeName);
+ contractTypeDto.setContractTypeId(contractTypeId);
contractTypeDto.setStoreId(storeId);
return getContractTypeBMOImpl.get(contractTypeDto);
}
@@ -651,7 +621,10 @@
* @path /app/contract/queryContractTypeSpec
*/
@RequestMapping(value = "/queryContractTypeSpec", method = RequestMethod.GET)
- public ResponseEntity<String> queryContractTypeSpec(@RequestHeader(value = "store-id") String storeId,
+ public ResponseEntity<String> queryContractTypeSpec(@RequestParam(value = "specName", required = false) String specName,
+ @RequestParam(value = "specShow", required = false) String specShow,
+ @RequestParam(value = "specCd", required = false) String specCd,
+ @RequestHeader(value = "store-id") String storeId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row,
@RequestParam(value = "contractTypeId") String contractTypeId) {
@@ -660,6 +633,9 @@
contractTypeSpecDto.setRow(row);
contractTypeSpecDto.setStoreId(storeId);
contractTypeSpecDto.setContractTypeId(contractTypeId);
+ contractTypeSpecDto.setSpecName(specName);
+ contractTypeSpecDto.setSpecShow(specShow);
+ contractTypeSpecDto.setSpecCd(specCd);
return getContractTypeSpecBMOImpl.get(contractTypeSpecDto);
}
@@ -862,8 +838,8 @@
roomInfo = rooms.getJSONObject(roomIndex);
contractChangePlanRoomPo = BeanConvertUtil.covertBean(roomInfo, ContractChangePlanRoomPo.class);
contractChangePlanRoomPo.setRoomName(roomInfo.getString("floorNum")
- +"-"+roomInfo.getString("unitNum")
- +"-"+roomInfo.getString("roomNum"));
+ + "-" + roomInfo.getString("unitNum")
+ + "-" + roomInfo.getString("roomNum"));
contractChangePlanRoomPos.add(contractChangePlanRoomPo);
}
}
@@ -871,7 +847,7 @@
ContractChangePlanDetailPo contractChangePlanDetailPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanDetailPo.class);
contractChangePlanDetailPo.setStoreId(storeId);
- return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo,contractChangePlanRoomPos);
+ return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo, contractChangePlanRoomPos, reqJson);
}
/**
@@ -929,6 +905,8 @@
@RequestParam(value = "row") int row,
@RequestParam(value = "contractId", required = false) String contractId,
@RequestParam(value = "contractName", required = false) String contractName,
+ @RequestParam(value = "contractCode", required = false) String contractCode,
+ @RequestParam(value = "contractType", required = false) String contractType,
@RequestParam(value = "planId", required = false) String planId
) {
ContractChangePlanDto contractChangePlanDto = new ContractChangePlanDto();
@@ -938,6 +916,8 @@
contractChangePlanDto.setContractId(contractId);
contractChangePlanDto.setContractName(contractName);
contractChangePlanDto.setPlanId(planId);
+ contractChangePlanDto.setContractCode(contractCode);
+ contractChangePlanDto.setContractType(contractType);
return getContractChangePlanBMOImpl.get(contractChangePlanDto);
}
@@ -958,6 +938,7 @@
ContractChangePlanDto contractChangePlanDto = new ContractChangePlanDto();
contractChangePlanDto.setTaskId(reqJson.getString("taskId"));
contractChangePlanDto.setPlanId(reqJson.getString("planId"));
+ contractChangePlanDto.setContractId(reqJson.getString("contractId"));
contractChangePlanDto.setStoreId(storeId);
contractChangePlanDto.setAuditCode(reqJson.getString("state"));
contractChangePlanDto.setAuditMessage(reqJson.getString("remark"));
--
Gitblit v1.8.0