feat():测试问题修复以及代码优化调整;

master
jiyufei 3 months ago
parent c32383ce5b
commit eb68453c50

@ -3,6 +3,7 @@ package jnpf.service;
import jnpf.model.park.*;
import jnpf.entity.*;
import java.math.BigDecimal;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
@ -60,7 +61,16 @@ public interface ParkService extends IService<ParkEntity> {
/**
*
*
* @return
*/
List<ParkDTO> tree();
/**
*
*
* @param id
* @return
*/
BigDecimal getAreaById(String id);
}

@ -613,7 +613,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
//异步处理空间信息
CompletableFuture.runAsync(() -> parkService.updateStatus(contract.getParkId(), "20"));
//异步处理商户信息
CompletableFuture.runAsync(() -> enterpriseMerchantsService.updateStatus(request.getContractStatus(), contract.getContractName(), contract.getParkId()));
CompletableFuture.runAsync(() -> enterpriseMerchantsService.updateStatus(request.getContractStatus(), contract.getMerchantId(), contract.getParkId()));
}
return "合同确认成功";
}
@ -641,7 +641,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
//异步处理空间信息
CompletableFuture.runAsync(() -> parkService.updateStatus(contract.getParkId(), "10"));
//异步处理商户信息
CompletableFuture.runAsync(() -> enterpriseMerchantsService.updateStatus(request.getContractStatus(), contract.getContractName(), null));
CompletableFuture.runAsync(() -> enterpriseMerchantsService.updateStatus(request.getContractStatus(), contract.getMerchantId(), null));
}
return "合同结束成功";
}

@ -27,6 +27,7 @@ import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -44,6 +45,8 @@ import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
import javax.annotation.Resource;
/**
* EnterpriseMerchants
* V3.5
@ -60,6 +63,9 @@ public class EnterpriseMerchantsServiceImpl extends ServiceImpl<EnterpriseMercha
@Autowired
private UserProvider userProvider;
@Resource
private ParkService parkService;
@Override
public List<EnterpriseMerchantsEntity> getList(EnterpriseMerchantsPagination enterpriseMerchantsPagination) {
return getTypeList(enterpriseMerchantsPagination, enterpriseMerchantsPagination.getDataType());
@ -420,6 +426,10 @@ public class EnterpriseMerchantsServiceImpl extends ServiceImpl<EnterpriseMercha
if (ObjectUtil.isNull(entity)) {
return;
}
String parkName = null;
if (StringUtils.isNoneBlank(parkId)) {
parkName = parkService.findNameById(parkId);
}
//如果是合同确认 并且状态是同意的 驳回不更改状态
if ("20".equals(contractStatus)) {
entity.setEntryStatus("2");
@ -427,6 +437,7 @@ public class EnterpriseMerchantsServiceImpl extends ServiceImpl<EnterpriseMercha
entity.setEntryStatus("1");
}
entity.setParkId(parkId);
entity.setParkName(parkName);
this.updateById(entity);
}

@ -3,6 +3,8 @@ package jnpf.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import java.math.BigDecimal;
import java.util.regex.Pattern;
import jnpf.entity.AreaEntity;
@ -368,6 +370,12 @@ public class ParkServiceImpl extends ServiceImpl<ParkMapper, ParkEntity> impleme
return buildTree(map, root);
}
@Override
public BigDecimal getAreaById(String id) {
ParkEntity entity = this.getById(id);
return entity.getSpaceArea();
}
private List<ParkDTO> buildTree(Map<String, List<ParkDTO>> map, List<ParkDTO> root) {
for (ParkDTO parkDTO : root) {
List<ParkDTO> list = map.get(parkDTO.getId());

@ -84,6 +84,7 @@ public class ParkController {
@Autowired
private AreaService areaService;
/**
*
*
@ -550,4 +551,10 @@ public class ParkController {
public ActionResult tree() {
return ActionResult.success(parkService.tree());
}
@Operation(summary = "获取面积")
@GetMapping("/getAreaById/{id}")
public ActionResult getAreaById(@PathVariable String id) {
return ActionResult.success(parkService.getAreaById(id));
}
}

@ -2,12 +2,12 @@ package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
@ -64,7 +64,7 @@ public class EnterpriseMerchantsEntity {
private BigDecimal fundBalance;
@TableField(value = "ENTRY_STATUS", updateStrategy = FieldStrategy.IGNORED)
private String entryStatus;
@TableField("PARK_ID")
@TableField(value = "PARK_ID", updateStrategy = FieldStrategy.IGNORED)
private String parkId;
@TableField("PARK_NAME")
private String parkName;

@ -411,6 +411,9 @@ export default {
},
//
async initSearchData() {
let date = new Date();
let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
this.query.creationTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
},
initData() {
this.listLoading = true;

@ -3,8 +3,7 @@
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
@ -13,113 +12,94 @@
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="8">
<jnpf-form-tip-item label="合同编号"
prop="contractNumber" >
<jnpf-form-tip-item label="合同编号" prop="contractNumber">
<p>{{ dataForm.contractNumber }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="合同名称"
prop="contractName" >
<jnpf-form-tip-item label="合同名称" prop="contractName">
<p>{{ dataForm.contractName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="计价方式"
prop="pricingMethod" >
<jnpf-form-tip-item label="计价方式" prop="pricingMethod">
<p>{{ dataForm.pricingMethod }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="签订日期"
prop="signingDate" >
<jnpf-form-tip-item label="签订日期" prop="signingDate">
<p>{{ dataForm.signingDate }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="园区名称"
prop="parkId" >
<jnpf-form-tip-item label="园区名称" prop="parkId">
<p>{{ dataForm.parkId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="商户名称"
prop="merchantId" >
<p>{{dataForm.merchantId}}</p>
<jnpf-form-tip-item label="商户名称" prop="merchantName">
<p>{{ dataForm.merchantName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="租金总价"
prop="totalRentalPrice" >
<jnpf-form-tip-item label="租金总价" prop="totalRentalPrice">
<p>{{ dataForm.totalRentalPrice }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="押金总计"
prop="totalDeposit" >
<jnpf-form-tip-item label="押金总计" prop="totalDeposit">
<p>{{ dataForm.totalDeposit }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="支付方式"
prop="payDeposit" >
<jnpf-form-tip-item label="支付方式" prop="payDeposit">
<p>{{ dataForm.payDeposit }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="退还方式"
prop="returnDeposit" >
<jnpf-form-tip-item label="退还方式" prop="returnDeposit">
<p>{{ dataForm.returnDeposit }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="开始时间"
prop="startTime" >
<jnpf-form-tip-item label="开始时间" prop="startTime">
<p>{{ dataForm.startTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="结束时间"
prop="endTime" >
<jnpf-form-tip-item label="结束时间" prop="endTime">
<p>{{ dataForm.endTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="租期"
prop="leaseTerm" >
<jnpf-form-tip-item label="租期" prop="leaseTerm">
<p>{{ dataForm.leaseTerm }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="联系人"
prop="contacts" >
<jnpf-form-tip-item label="联系人" prop="contacts">
<p>{{ dataForm.contacts }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="联系电话"
prop="contactsPhone" >
<jnpf-form-tip-item label="联系电话" prop="contactsPhone">
<p>{{ dataForm.contactsPhone }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="合同状态"
prop="contractStatus" >
<jnpf-form-tip-item label="合同状态" prop="contractStatus">
<p>{{ dataForm.contractStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="合同说明"
prop="contractExplain" >
<jnpf-form-tip-item label="合同说明" prop="contractExplain">
<p>{{ dataForm.contractExplain }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="合同附件"
prop="contractEnclosure" >
<JnpfUploadFile v-model="dataForm.contractEnclosure"
disabled
detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传" >
<jnpf-form-tip-item label="合同附件" prop="contractEnclosure">
<JnpfUploadFile v-model="dataForm.contractEnclosure" disabled detailed :fileSize="10"
sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传">
</JnpfUploadFile>
</jnpf-form-tip-item>
</el-col>

@ -207,14 +207,14 @@
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.spaceId"
@change="changeData('spacecontract-spaceId', scope.$index)"
@change="changeData('spacecontract-spaceId', scope.$index, scope.row)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.spacecontractspaceId" placeholder="请选择空间"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' :field="'spaceId' + scope.$index"
interfaceId="584015452494104389" :pageSize="20"
:columnOptions="spacecontractspaceIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
popupType="dialog" relationField='name'
:field="'spaceId' + scope.$index" interfaceId="584015452494104389"
:pageSize="20" :columnOptions="spacecontractspaceIdcolumnOptions"
clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
@ -225,7 +225,7 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spaceArea"
@change="changeData('spacecontract-spaceArea', scope.$index)"
placeholder="选择空间自动生成" disabled clearable :style='{ "width": "100%" }'>
placeholder="选择空间自动生成" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -467,7 +467,7 @@ export default {
pricingMethodOptions: [{ "fullName": "月付", "id": "1" }, { "fullName": "季付", "id": "2" }, { "fullName": "年付", "id": "3" }],
pricingMethodProps: { "label": "fullName", "value": "id" },
parkIdOptions: [],
parkIdProps: { "label": "name", "value": "code" },
parkIdProps: { "label": "name", "value": "id" },
merchantIdOptions: [],
merchantIdProps: { "label": "cmp_nm", "value": "id" },
payDepositOptions: [{ "fullName": "选项1", "id": "1" }, { "fullName": "选项2", "id": "2" }],
@ -476,7 +476,7 @@ export default {
returnDepositProps: { "label": "fullName", "value": "id" },
contractStatusOptions: [{ "fullName": "待确认", "id": "10" }, { "fullName": "已确认", "id": "20" }, { "fullName": "已结案", "id": "30" }, { "fullName": "合同变更", "id": "21" }],
contractStatusProps: { "label": "fullName", "value": "id" },
spacecontractspaceIdcolumnOptions: [{ "label": "空间名称", "value": "name" }, { "label": "园区名称", "value": "park_name" }, { "label": "区域名称", "value": "area_name" },],
spacecontractspaceIdcolumnOptions: [{ "label": "空间名称", "value": "name" }, { "label": "园区名称", "value": "park_name" }, { "label": "区域名称", "value": "area_name" }, { "label": "空间面积", "value": "space_area" }],
childIndex: -1,
isEdit: false,
interfaceRes: {
@ -555,7 +555,18 @@ export default {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
getRowData(index) {
return this.dataForm[index];
},
changeData(model, index, row) {
if (model == 'spacecontract-spaceId' && (row.spaceId != null || row.spaceId != undefined)) {
request({
url: '/api/example/Park/getAreaById/' + row.spaceId,
method: 'get'
}).then(res => {
this.$set(row, 'spaceArea', res.data);
});
}
if (model == 'startTime' && this.dataForm.endTime != undefined) {
const date1 = new Date(this.dataForm.startTime);
const date2 = new Date(this.dataForm.endTime);

@ -79,8 +79,8 @@
</el-tooltip>
</div>
</div>
<el-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" @row-click="handleRowClick" border>
<el-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"
@row-click="handleRowClick" border>
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<el-table-column width="50" align="center" fixed="left">
<template slot-scope="scope">
@ -466,6 +466,9 @@ export default {
},
//
async initSearchData() {
let date = new Date();
let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
this.query.creationTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
},
initData() {
this.listLoading = true;

@ -380,6 +380,9 @@ export default {
},
//
async initSearchData() {
let date = new Date();
let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
this.query.creationTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
},
initData() {
this.listLoading = true;

@ -391,6 +391,9 @@ export default {
},
//
async initSearchData() {
let date = new Date();
let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
this.query.creationTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
},
initData() {
this.listLoading = true;

@ -369,6 +369,9 @@ export default {
},
//
async initSearchData() {
let date = new Date();
let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
this.query.creationTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
},
initData() {
this.listLoading = true;

Loading…
Cancel
Save