java110
2022-03-31 aadd9096f633c3f1a9c1fc895a68d2ada586de85
service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
@@ -24,7 +24,6 @@
import com.java110.po.contract.ContractPo;
import com.java110.po.contractAttr.ContractAttrPo;
import com.java110.po.contractChangePlan.ContractChangePlanPo;
import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
import com.java110.po.contractFile.ContractFilePo;
import com.java110.po.contractRoom.ContractRoomPo;
import com.java110.po.owner.OwnerRoomRelPo;
@@ -37,7 +36,6 @@
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.apache.http.annotation.Contract;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -108,10 +106,12 @@
        deleteContractFileBMOImpl.delete(contractFilePo);
        List<ContractFilePo> filePos = contractPo.getContractFilePo();
        for (ContractFilePo file: filePos) {
            if (file.getFileRealName().length() > 0 && file.getFileSaveName().length() > 0){
                file.setContractId(contractPo.getContractId());
                contractFileInnerServiceSMOImpl.saveContractFile(file);
        if (filePos != null) {
            for (ContractFilePo file : filePos) {
                if (file.getFileRealName().length() > 0 && file.getFileSaveName().length() > 0) {
                    file.setContractId(contractPo.getContractId());
                    contractFileInnerServiceSMOImpl.saveContractFile(file);
                }
            }
        }
@@ -146,6 +146,7 @@
        List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(tmpContractDto);
        Assert.listOnlyOne(contractDtos, "合同不存在");
        contractDto.setStartUserId(contractDtos.get(0).getStartUserId());
        contractDto.setNextUserId(reqJson.getString("nextUserId"));
        boolean isLastTask = contractApplyUserInnerServiceSMOImpl.completeTask(contractDto);
        if (isLastTask) {
@@ -158,6 +159,9 @@
            ContractPo contractPo = new ContractPo();
            contractPo.setContractId(contractDto.getContractId());
            contractPo.setState(ContractDto.STATE_AUDIT_DOING);
            if ("1200".equals(reqJson.getString("state"))) {
                contractPo.setState(ContractDto.STATE_FAIL);
            }
            contractPo.setStatusCd(StatusConstant.STATUS_CD_VALID);
            contractInnerServiceSMOImpl.updateContract(contractPo);
        }
@@ -201,7 +205,7 @@
            ContractPo contractPo = BeanConvertUtil.covertBean(contractChangePlanDetailDtos.get(0), ContractPo.class);
            contractInnerServiceSMOImpl.updateContract(contractPo);
            dealContractChangePlanRoom(contractChangePlanDto,contractDtos.get(0));
            dealContractChangePlanRoom(contractChangePlanDto, contractDtos.get(0));
        } else { //修改为审核中
            ContractChangePlanPo contractChangePlanPo = new ContractChangePlanPo();
@@ -387,6 +391,7 @@
        return false;
    }
    private void updateContractAttr(JSONObject jsonObject, ContractPo contractPo) {
        ContractAttrDto contractAttrDto = new ContractAttrDto();
        contractAttrDto.setContractId(contractPo.getContractId());