水电话费

jialh

1 天以前 dd6687b118561100e1677e88a9c2f5842a54c531

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

@@ -5,28 +5,28 @@
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.entity.audit.AuditUser;
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.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;
@@ -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.*;
@@ -203,10 +202,10 @@
        Assert.hasKeyAndValue(reqJson, "contractType", "请求报文中未包含contractType");
        Assert.hasKeyAndValue(reqJson, "partyA", "请求报文中未包含partyA");
        Assert.hasKeyAndValue(reqJson, "partyB", "请求报文中未包含partyB");
        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
        Assert.hasKeyAndValue(reqJson, "bContacts", "请求报文中未包含bContacts");
        Assert.hasKeyAndValue(reqJson, "bLink", "请求报文中未包含bLink");
//        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
//        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
//        Assert.hasKeyAndValue(reqJson, "bContacts", "请求报文中未包含bContacts");
//        Assert.hasKeyAndValue(reqJson, "bLink", "请求报文中未包含bLink");
        Assert.hasKeyAndValue(reqJson, "operator", "请求报文中未包含operator");
        Assert.hasKeyAndValue(reqJson, "operatorLink", "请求报文中未包含operatorLink");
        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
@@ -216,6 +215,7 @@
        ContractPo contractPo = BeanConvertUtil.covertBean(reqJson, ContractPo.class);
        contractPo.setStoreId(storeId);
        contractPo.setStartUserId(userId);
        contractPo.setCommunityId(reqJson.getString("communityId"));
        if (!reqJson.containsKey("contractParentId") || "-1".equals(reqJson.getString("contractParentId"))) {
            contractPo.setContractParentId("-1");
        }
@@ -249,34 +249,36 @@
    @RequestMapping(value = "/updateContract", method = RequestMethod.POST)
    public ResponseEntity<String> updateContract(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "contractCode", "请求报文中未包含contractCode");
        Assert.hasKeyAndValue(reqJson, "contractName", "请求报文中未包含contractName");
        Assert.hasKeyAndValue(reqJson, "contractType", "请求报文中未包含contractType");
        Assert.hasKeyAndValue(reqJson, "partyA", "请求报文中未包含partyA");
        Assert.hasKeyAndValue(reqJson, "partyB", "请求报文中未包含partyB");
        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
        Assert.hasKeyAndValue(reqJson, "bContacts", "请求报文中未包含bContacts");
        Assert.hasKeyAndValue(reqJson, "bLink", "请求报文中未包含bLink");
        Assert.hasKeyAndValue(reqJson, "operator", "请求报文中未包含operator");
        Assert.hasKeyAndValue(reqJson, "operatorLink", "请求报文中未包含operatorLink");
        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
        Assert.hasKeyAndValue(reqJson, "signingTime", "请求报文中未包含signingTime");
        Assert.hasKeyAndValue(reqJson, "contractId", "contractId不能为空");
//        Assert.hasKeyAndValue(reqJson, "contractCode", "请求报文中未包含contractCode");
//        Assert.hasKeyAndValue(reqJson, "contractName", "请求报文中未包含contractName");
//        Assert.hasKeyAndValue(reqJson, "contractType", "请求报文中未包含contractType");
//        Assert.hasKeyAndValue(reqJson, "partyA", "请求报文中未包含partyA");
//        Assert.hasKeyAndValue(reqJson, "partyB", "请求报文中未包含partyB");
//        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
//        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
//        Assert.hasKeyAndValue(reqJson, "bContacts", "请求报文中未包含bContacts");
//        Assert.hasKeyAndValue(reqJson, "bLink", "请求报文中未包含bLink");
//        Assert.hasKeyAndValue(reqJson, "operator", "请求报文中未包含operator");
//        Assert.hasKeyAndValue(reqJson, "operatorLink", "请求报文中未包含operatorLink");
//        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
//        Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
//        Assert.hasKeyAndValue(reqJson, "signingTime", "请求报文中未包含signingTime");
//        Assert.hasKeyAndValue(reqJson, "contractId", "contractId不能为空");


        ContractPo contractPo = BeanConvertUtil.covertBean(reqJson, ContractPo.class);
        ContractDto contractPo = BeanConvertUtil.covertBean(reqJson, ContractDto.class);

        JSONArray contractFiles = reqJson.getJSONArray("contractFilePo");
        List<ContractFilePo> contractFilePos = new ArrayList<>();
        for (int conFileIndex = 0; conFileIndex < contractFiles.size(); conFileIndex++) {
            JSONObject resourceStore = contractFiles.getJSONObject(conFileIndex);
            ContractFilePo contractFilePo = BeanConvertUtil.covertBean(resourceStore, ContractFilePo.class);
            contractFilePo.setContractFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_contractFileId));
            contractFilePos.add(contractFilePo);
        if (contractFiles != null) {
            for (int conFileIndex = 0; conFileIndex < contractFiles.size(); conFileIndex++) {
                JSONObject resourceStore = contractFiles.getJSONObject(conFileIndex);
                ContractFilePo contractFilePo = BeanConvertUtil.covertBean(resourceStore, ContractFilePo.class);
                contractFilePo.setContractFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_contractFileId));
                contractFilePos.add(contractFilePo);
            }
        }
        contractPo.setContractFilePo(contractFilePos);
//        contractPo.setContractFilePo(contractFilePos);
        return updateContractBMOImpl.update(contractPo, reqJson);
    }

@@ -354,7 +356,7 @@
     */
    @RequestMapping(value = "/deleteContract", method = RequestMethod.POST)
    public ResponseEntity<String> deleteContract(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
//        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");

        Assert.hasKeyAndValue(reqJson, "contractId", "contractId不能为空");

@@ -363,42 +365,6 @@
        return deleteContractBMOImpl.delete(contractPo);
    }


//    /**
//     * 微信删除消息模板
//     *
//     * @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);
//    }

    /**
     * 合同起草待办
@@ -504,10 +470,12 @@

        Assert.hasKeyAndValue(reqJson, "typeName", "请求报文中未包含typeName");
        Assert.hasKeyAndValue(reqJson, "audit", "请求报文中未包含audit");
        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区编号");


        ContractTypePo contractTypePo = BeanConvertUtil.covertBean(reqJson, ContractTypePo.class);
        contractTypePo.setStoreId(storeId);
        contractTypePo.setCommunityId(reqJson.getString("communityId"));
        return saveContractTypeBMOImpl.save(contractTypePo);
    }

@@ -560,12 +528,20 @@
     */
    @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 = "communityId", required = false) String communityId,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row) {
        ContractTypeDto contractTypeDto = new ContractTypeDto();
        contractTypeDto.setPage(page);
        contractTypeDto.setRow(row);
        contractTypeDto.setStoreId(storeId);
        contractTypeDto.setAudit(audit);
        contractTypeDto.setTypeName(typeName);
        contractTypeDto.setContractTypeId(contractTypeId);
        contractTypeDto.setStoreId(null);
        contractTypeDto.setCommunityId(communityId);
        return getContractTypeBMOImpl.get(contractTypeDto);
    }

@@ -651,7 +627,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 +639,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 +844,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 +853,7 @@

        ContractChangePlanDetailPo contractChangePlanDetailPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanDetailPo.class);
        contractChangePlanDetailPo.setStoreId(storeId);
        return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo,contractChangePlanRoomPos,reqJson);
        return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo, contractChangePlanRoomPos, reqJson);
    }

    /**
@@ -929,8 +911,13 @@
                                                          @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 = "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 = "staffNameLike", required = false) String staffNameLike,
                                                          @RequestParam(value = "communityId", required = false) String communityId,
                                                          @RequestParam(value = "planId", required = false) String planId) {
        ContractChangePlanDto contractChangePlanDto = new ContractChangePlanDto();
        contractChangePlanDto.setPage(page);
        contractChangePlanDto.setRow(row);
@@ -938,6 +925,12 @@
        contractChangePlanDto.setContractId(contractId);
        contractChangePlanDto.setContractName(contractName);
        contractChangePlanDto.setPlanId(planId);
        contractChangePlanDto.setContractCode(contractCode);
        contractChangePlanDto.setContractType(contractType);
        contractChangePlanDto.setStartTime(logStartTime);
        contractChangePlanDto.setEndTime(logEndTime);
        contractChangePlanDto.setStaffNameLike(staffNameLike);
        contractChangePlanDto.setCommunityId(communityId);
        return getContractChangePlanBMOImpl.get(contractChangePlanDto);
    }

@@ -984,10 +977,10 @@
        Assert.hasKeyAndValue(reqJson, "contractType", "请求报文中未包含contractType");
        Assert.hasKeyAndValue(reqJson, "partyA", "请求报文中未包含partyA");
        Assert.hasKeyAndValue(reqJson, "partyB", "请求报文中未包含partyB");
        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
        Assert.hasKeyAndValue(reqJson, "bContacts", "请求报文中未包含bContacts");
        Assert.hasKeyAndValue(reqJson, "bLink", "请求报文中未包含bLink");
//        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
//        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
//        Assert.hasKeyAndValue(reqJson, "bContacts", "请求报文中未包含bContacts");
//        Assert.hasKeyAndValue(reqJson, "bLink", "请求报文中未包含bLink");
        Assert.hasKeyAndValue(reqJson, "operator", "请求报文中未包含operator");
        Assert.hasKeyAndValue(reqJson, "operatorLink", "请求报文中未包含operatorLink");
        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
@@ -1016,10 +1009,10 @@
        Assert.hasKeyAndValue(reqJson, "contractType", "请求报文中未包含contractType");
        Assert.hasKeyAndValue(reqJson, "partyA", "请求报文中未包含partyA");
        Assert.hasKeyAndValue(reqJson, "partyB", "请求报文中未包含partyB");
        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
        Assert.hasKeyAndValue(reqJson, "bContacts", "请求报文中未包含bContacts");
        Assert.hasKeyAndValue(reqJson, "bLink", "请求报文中未包含bLink");
//        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
//        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
//        Assert.hasKeyAndValue(reqJson, "bContacts", "请求报文中未包含bContacts");
//        Assert.hasKeyAndValue(reqJson, "bLink", "请求报文中未包含bLink");
        Assert.hasKeyAndValue(reqJson, "operator", "请求报文中未包含operator");
        Assert.hasKeyAndValue(reqJson, "operatorLink", "请求报文中未包含operatorLink");
        Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");