server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
@@ -151,6 +151,7 @@ @PostMapping("/updateStatusById") @CloudRequiredPermission("business:company:update") public ApiResponse updateStatusById(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ company.setLoginUserInfo(getLoginUser(token)); companyService.updateStatusById(company); return ApiResponse.success(null); } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
@@ -70,7 +70,7 @@ private Date actPayDate; @ApiModelProperty(value = "计划付款日") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") private Date planPayDate; @ApiModelProperty(value = "合同条款编码（关联yw_contract_detail)", example = "1") server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -619,7 +619,7 @@ @Override public void updateStatusById(Company company) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); LoginUserInfo loginUserInfo = company.getLoginUserInfo(); if(loginUserInfo==null){ loginUserInfo = company.getLoginUserInfo(); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1043,6 +1043,7 @@ loginUserInfo = member.getLoginUserInfo(); } Member update = new Member(); update.setId(model.getId()); update.setEditDate(new Date()); update.setEditor(loginUserInfo.getId()); update.setStatus(member.getStatus()); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
@@ -200,6 +200,7 @@ .selectAs(SystemUser::getRealname,Multifile::getUserName) .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator) .eq(Multifile::getObjId,id) .eq(Multifile::getIsdeleted,Constants.ZERO) .eq(Multifile::getObjType,Constants.MultiFile.FN_CONTRACT_BILL_FILE.getKey())); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() @@ -271,25 +272,27 @@ } //楼宇名称 List<YwContractRoom> ywContractRoomList = ywContractBill.getYwContractRoomList(); StringBuilder roomPathName = new StringBuilder(); for (YwContractRoom ywContractRoom:ywContractRoomList) { if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){ roomPathName.append(ywContractRoom.getProjectName()); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){ StringBuilder roomPathName = new StringBuilder(); for (YwContractRoom ywContractRoom:ywContractRoomList) { if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){ roomPathName.append(ywContractRoom.getProjectName()+"/"); } if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){ roomPathName.append(ywContractRoom.getBuildingName()+"/"); } if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){ roomPathName.append(ywContractRoom.getFloorName()+"/"); } if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){ roomPathName.append(ywContractRoom.getRoomName()); } if(StringUtils.isNotBlank(roomPathName)){ roomPathName.append(";"); } } if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){ roomPathName.append(ywContractRoom.getBuildingName()); } if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){ roomPathName.append(ywContractRoom.getFloorName()); } if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){ roomPathName.append(ywContractRoom.getRoomName()); } if(StringUtils.isNotBlank(roomPathName)){ roomPathName.append(";"); } ywContractBill.setRoomPathName(roomPathName.toString()); } ywContractBill.setRoomPathName(roomPathName.toString()); } return PageData.from(iPage); @@ -299,29 +302,56 @@ //查询账单下的楼宇数据 if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractBillList)){ //获取所有数据 List<Integer> billIdList = ywContractBillList.stream().map(i->i.getId()).collect(Collectors.toList()); List<Integer> billIdList = ywContractBillList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getId()).collect(Collectors.toList()); List<Integer> contractIdList = ywContractBillList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).map(i->i.getContractId()).collect(Collectors.toList()); List<YwContractRoom> ywContractRoomList = new ArrayList<>(); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(billIdList)){ List<YwContractRoom> ywContractRoomList = ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>() ywContractRoomList.addAll( ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>() .selectAll(YwContractRoom.class) .selectAs(YwProject::getName,YwRoom::getProjectName) .selectAs(YwFloor::getName,YwRoom::getFloorName) .selectAs(YwBuilding::getName,YwRoom::getBuildingName) .selectAs(YwRoom::getName,YwContractRoom::getRoomName) .selectAs(YwRoom::getCode,YwContractRoom::getRoomName) .leftJoin(YwRoom.class,YwRoom::getId,YwContractRoom::getRoomId) .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor) .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId) .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId) .in(YwContractRoom::getContractId,billIdList) .eq(YwContractRoom::getType,Constants.ONE) ); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){ for (YwContractBill ywContractBill:ywContractBillList) { )); } if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(contractIdList)){ ywContractRoomList.addAll( ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>() .selectAll(YwContractRoom.class) .selectAs(YwProject::getName,YwRoom::getProjectName) .selectAs(YwFloor::getName,YwRoom::getFloorName) .selectAs(YwBuilding::getName,YwRoom::getBuildingName) .selectAs(YwRoom::getCode,YwContractRoom::getRoomName) .leftJoin(YwRoom.class,YwRoom::getId,YwContractRoom::getRoomId) .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor) .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId) .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId) .in(YwContractRoom::getContractId,contractIdList) .eq(YwContractRoom::getType,Constants.ZERO) )); } if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){ for (YwContractBill ywContractBill:ywContractBillList) { if(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO)){ ywContractBill.setYwContractRoomList( ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getContractId(),ywContractBill.getId())).collect(Collectors.toList()) ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)&&Constants.equalsInteger(i.getContractId(),ywContractBill.getContractId())).collect(Collectors.toList()) ); }else{ ywContractBill.setYwContractRoomList( ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getContractId(),ywContractBill.getId())).collect(Collectors.toList()) ); } } } } }
@@ -538,7 +538,7 @@ //如果有租赁条款 if(Constants.formatBigdecimal(model.getZlDeposit()).compareTo(new BigDecimal(0))>0){ //如果有租赁押金 billList1.add(initDepoistBill(Constants.THREE,model)); billList1.add(initDepoistBill(Constants.THREE,model,details)); } if(Constants.equalsInteger(model.getZlPayType(), Constants.ZERO)){ //如果是一次性付清 @@ -559,7 +559,7 @@ //如果物业条款 if(Constants.formatBigdecimal(model.getWyDeposit()).compareTo(new BigDecimal(0))>0){ //如果有租赁押金 billList2.add(initDepoistBill(Constants.FOUR,model)); billList2.add(initDepoistBill(Constants.FOUR,model,details)); } if(Constants.equalsInteger(model.getWyPayType(), Constants.ZERO)){ //如果是一次性付清 @@ -599,7 +599,7 @@ } } private YwContractBill initDepoistBill(int type, YwContract model) { private YwContractBill initDepoistBill(int type, YwContract model, List<YwContractDetail> details) { YwContractBill bill = new YwContractBill(); bill.setCreateDate(model.getEditDate()); bill.setCreator(model.getEditor()); @@ -612,10 +612,18 @@ bill.setEndDate(model.getEndDate()); bill.setType(Constants.ZERO); bill.setCostType(type); YwContractDetail d = details.get(Constants.ZERO); if(Objects.isNull(d)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"条款数据异常"); } Date planPayDate = DateUtil.addDaysToDate(d.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1); bill.setPlanPayDate(planPayDate.getTime()>System.currentTimeMillis()?planPayDate:new Date()); bill.setTotleFee(type==Constants.THREE?model.getZlDeposit():model.getWyDeposit());//押金费用 bill.setReceivableFee(bill.getTotleFee()); bill.setBillType(Constants.ZERO); bill.setPayStatus(Constants.ZERO); bill.setSortnum(0); bill.setCompanyId(model.getCompanyId()); return bill; } @@ -662,12 +670,13 @@ int monthSix = months / 6;//6个月维度数量 int restMonth = months % 6;//剩余的整月 int monthDays = dateCompare.getMonthDays();//不满一个月的天数 Date date = new Date(); List<Date> list = new ArrayList<>(); for (int i = 0; i < monthSix; i++) { list.add(DateUtil.addMonthToDate(startDate,i*6)); list.add(DateUtil.addMonthToDate(date,i*6)); } if(restMonth>0 || monthDays>0){ list.add(DateUtil.addDaysToDate(startDate,monthSix)); list.add(DateUtil.addDaysToDate(date,monthSix)); } return list; } @@ -677,12 +686,13 @@ int monthThree = months / 3;//3个月维度数量 int restMonth = months % 3;//剩余的整月 int monthDays = dateCompare.getMonthDays();//不满一个月的天数 Date date = new Date(); List<Date> list = new ArrayList<>(); for (int i = 0; i < monthThree; i++) { list.add(DateUtil.addMonthToDate(startDate,i*3)); list.add(DateUtil.addMonthToDate(date,i*3)); } if(restMonth>0 || monthDays>0){ list.add(DateUtil.addDaysToDate(startDate,monthThree)); list.add(DateUtil.addDaysToDate(date,monthThree)); } return list; } @@ -716,13 +726,15 @@ YwContractBill bill = initCreateBillModel(model,d ); bill.setStartDate(start);//账单开始 bill.setEndDate(end);//账单结束 bill.setPlanPayDate(DateUtil.addDaysToDate(d.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1)); Date planPayDate = DateUtil.addDaysToDate(d.getStartDate(),Constants.formatIntegerNum(d.getAdvanceDays()) * -1); bill.setPlanPayDate(planPayDate.getTime()>System.currentTimeMillis()?planPayDate:new Date()); BigDecimal totalFee =getTotalFeeByStartEnd(model,d,freeStart,freeEnd); bill.setTotleFee(totalFee); bill.setReceivableFee(totalFee); bill.setBillType(Constants.ZERO); temp++; bill.setCompanyId(model.getCompanyId()); list.add(bill); } } @@ -777,12 +789,13 @@ DateCompare dateCompare = DateCompare.monthYearCompare(startDate, endDate ); int years = dateCompare.getYear(); int yeardays = dateCompare.getYearDays(); Date date = new Date(); List<Date> list = new ArrayList<>(); for (int i = 0; i < years; i++) { list.add(DateUtil.addYearToDate(startDate,i)); list.add(DateUtil.addYearToDate(date,i)); } if(yeardays>0){ list.add(DateUtil.addYearToDate(startDate,years)); list.add(DateUtil.addYearToDate(date,years)); } return list; } @@ -839,8 +852,11 @@ } private void initFiles(YwContract model) { List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda() .eq(Multifile::getObjId, model.getId() ) List<Multifile> multifiles = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>() .selectAll(Multifile.class) .selectAs(SystemUser::getRealname,Multifile::getUserName) .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator) .eq(Multifile::getObjId,model.getId()) .in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.YW_CONTRACT_FILE.getKey()})) .eq(Multifile::getIsdeleted,Constants.ZERO)); if(multifiles!=null){
