yangshiqiang
/
NX-zhihui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(front):自测问题修改;

Browse Source
master
jiyufei 3 months ago
parent d607fd5320
commit 1546b8e769
15 changed files with 162 additions and 116 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ContractMapper.java
Unescape View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-07-16
* 日期： 2024-07-19
*/
public interface ContractMapper extends BaseMapper<ContractEntity> {

21
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ContractService.java
Unescape View File

@ -1,12 +1,13 @@
package jnpf.service;
import jnpf.model.contract.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jnpf.entity.ContractEntity;
import jnpf.entity.SpacecontractEntity;
import jnpf.model.contract.ContractForm;
import jnpf.model.contract.ContractPagination;
import jnpf.model.contract.ContractRequest;
import java.util.List;
/**
* Contract
@ -18,7 +19,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
public interface ContractService extends IService<ContractEntity> {
List<ContractEntity> getList(ContractPagination contractPagination);
List<ContractEntity> getTypeList(ContractPagination contractPagination, String dataType);
List<ContractEntity> getTypeList(ContractPagination contractPagination,String dataType);
ContractEntity getInfo(String id);
@ -29,14 +30,14 @@ public interface ContractService extends IService<ContractEntity> {
boolean update(String id, ContractEntity entity);
//子表方法
List<SpacecontractEntity> getSpacecontractList(String id, ContractPagination contractPagination);
List<SpacecontractEntity> getSpacecontractList(String id,ContractPagination contractPagination);
List<SpacecontractEntity> getSpacecontractList(String id);
//副表数据方法
String checkForm(ContractForm form, int i);
String checkForm(ContractForm form,int i);
void saveOrUpdate(ContractForm contractForm, String id, boolean isSave) throws Exception;
void saveOrUpdate(ContractForm contractForm,String id, boolean isSave) throws Exception;
/**
* 合同确认

7
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/SpacecontractService.java
Unescape View File

@ -25,4 +25,11 @@ public interface SpacecontractService extends IService<SpacecontractEntity> {
List<String> findByNums(String contractNumber);
QueryWrapper<SpacecontractEntity> getChild(ContractPagination pagination, QueryWrapper<SpacecontractEntity> spacecontractQueryWrapper);
/**
* 根据合同编号删除绑定空间
*
* @param contractNumber 合同编号
*/
void delData(String contractNumber);
}

11
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ContractServiceImpl.java
Unescape View File

@ -410,7 +410,10 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
@Override
public void delete(ContractEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
boolean result = this.removeById(entity.getId());
if (result) {
CompletableFuture.runAsync(() -> spacecontractService.delData(entity.getContractNumber()));
}
}
}
@ -426,7 +429,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
QueryWrapper<SpacecontractEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = spacecontractService.getChild(contractPagination, queryWrapper);
queryWrapper.lambda().eq(SpacecontractEntity::getContractNumber, id);
queryWrapper.lambda().isNull(SpacecontractEntity::getCeleteTags);
generaterSwapUtil.wrapperHandle(ContractConstant.getColumnData(), ContractConstant.getAppColumnData(), queryWrapper, SpacecontractEntity.class, "sub", tableName);
return spacecontractService.list(queryWrapper);
}
@ -515,7 +517,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
//园区名称
String parkName = parkService.findNameById(contractForm.getParkId().toString());
//商户名称
String merchantName = enterpriseMerchantsService.findNameById(contractForm.getMerchantName().toString());
String merchantName = enterpriseMerchantsService.findNameById(contractForm.getMerchantId().toString());
if (isSave) {
//获取当前年月日
String currentDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
@ -528,8 +530,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
entity.setCreationTime(DateUtil.getNowDate());
}
entity.setParkName(parkName);
//字段设置错误 由于代码已经修改极大部分 所以将商户id以及name反过来使用
entity.setMerchantId(merchantName);
entity.setMerchantName(merchantName);
this.saveOrUpdate(entity);
//Spacecontract子表数据新增修改

52
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/SpacecontractServiceImpl.java
Unescape View File

@ -1,42 +1,25 @@
package jnpf.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import jnpf.entity.*;
import jnpf.mapper.SpacecontractMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.contract.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import jnpf.entity.SpacecontractEntity;
import jnpf.mapper.SpacecontractMapper;
import jnpf.model.contract.ContractConstant;
import jnpf.model.contract.ContractPagination;
import jnpf.service.SpacecontractService;
import jnpf.util.GeneraterSwapUtil;
import jnpf.util.JsonUtil;
import jnpf.util.ServletUtil;
import jnpf.util.UserProvider;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import org.springframework.stereotype.Service;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
/**
* Contract
@ -78,4 +61,11 @@ public class SpacecontractServiceImpl extends ServiceImpl<SpacecontractMapper, S
}
return spacecontractQueryWrapper;
}
@Override
public void delData(String contractNumber) {
QueryWrapper<SpacecontractEntity> SpacecontractqueryWrapper = new QueryWrapper<>();
SpacecontractqueryWrapper.lambda().eq(SpacecontractEntity::getContractNumber, contractNumber);
this.remove(SpacecontractqueryWrapper);
}
}

10
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ContractController.java
Unescape View File

@ -138,7 +138,7 @@ public class ContractController {
contractMap.put("id", contractMap.get("id"));
//副表数据
//子表数据
List<SpacecontractEntity> spacecontractList = contractService.getSpacecontractList(entity.getId(), contractPagination);
List<SpacecontractEntity> spacecontractList = contractService.getSpacecontractList(entity.getContractNumber(), contractPagination);
contractMap.put("tableField130", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(spacecontractList)));
realList.add(contractMap);
}
@ -176,8 +176,8 @@ public class ContractController {
case "parkId":
entitys.add(new ExcelExportEntity("园区名称", "parkId"));
break;
case "merchantName":
entitys.add(new ExcelExportEntity("商户名称", "merchantName"));
case "merchantId":
entitys.add(new ExcelExportEntity("商户名称", "merchantId"));
break;
case "totalRentalPrice":
entitys.add(new ExcelExportEntity("租金总价", "totalRentalPrice"));
@ -221,8 +221,8 @@ public class ContractController {
case "tableField130-contractLineNumber":
tableField130List.add(new ExcelExportEntity("合同行号", "contractLineNumber"));
break;
case "tableField130-spaceName":
tableField130List.add(new ExcelExportEntity("空间名称", "spaceName"));
case "tableField130-spaceId":
tableField130List.add(new ExcelExportEntity("空间名称", "spaceId"));
break;
case "tableField130-spaceArea":
tableField130List.add(new ExcelExportEntity("空间面积", "spaceArea"));

6
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ContractEntity.java
Unescape View File

@ -11,7 +11,7 @@ import java.math.BigDecimal;
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-07-16
* @日期： 2024-07-19
*/
@Data
@TableName("yq_contract")
@ -34,9 +34,9 @@ public class ContractEntity {
private Date signingDate;
@TableField(value = "LEASE_TERM" , updateStrategy = FieldStrategy.IGNORED)
private String leaseTerm;
@TableField("MERCHANT_ID")
@TableField(value = "MERCHANT_ID" , updateStrategy = FieldStrategy.IGNORED)
private String merchantId;
@TableField(value = "MERCHANT_NAME" , updateStrategy = FieldStrategy.IGNORED)
@TableField("MERCHANT_NAME")
private String merchantName;
@TableField(value = "PARK_ID" , updateStrategy = FieldStrategy.IGNORED)
private String parkId;

4
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/SpacecontractEntity.java
Unescape View File

@ -34,9 +34,9 @@ public class SpacecontractEntity {
private String contractName;
@TableField(value = "TOTAL_RENTAL_PRICE" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal totalRentalPrice;
@TableField("SPACE_ID")
@TableField(value = "SPACE_ID" , updateStrategy = FieldStrategy.IGNORED)
private String spaceId;
@TableField(value = "SPACE_NAME" , updateStrategy = FieldStrategy.IGNORED)
@TableField("SPACE_NAME")
private String spaceName;
@TableField(value = "SPACE_AREA" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal spaceArea;

10
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/contract/ContractConstant.java
View File

File diff suppressed because one or more lines are too long

97
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/contract/ContractForm.java
Unescape View File

@ -7,77 +7,122 @@ import java.util.List;
/**
* Contract
*
* @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组
* @日期： 2024-07-16
* @日期： 2024-07-19
*/
@Data
public class ContractForm {
/** 主键 */
public class ContractForm {
/**
* 主键
*/
private String id;
/** 子表数据 **/
/**
* 子表数据
**/
@JsonProperty("spacecontractList")
private List<SpacecontractModel> spacecontractList;
/** 乐观锁 **/
/**
* 乐观锁
**/
@JsonProperty("version")
private Integer version;
/** 合同编号 **/
/**
* 合同编号
**/
@JsonProperty("contractNumber")
private String contractNumber;
/** 合同名称 **/
/**
* 合同名称
**/
@JsonProperty("contractName")
private String contractName;
/** 计价方式 **/
/**
* 计价方式
**/
@JsonProperty("pricingMethod")
private Object pricingMethod;
/** 签订日期 **/
/**
* 签订日期
**/
@JsonProperty("signingDate")
private String signingDate;
/** 园区名称 **/
/**
* 园区名称
**/
@JsonProperty("parkId")
private Object parkId;
/** 商户名称 **/
@JsonProperty("merchantName")
private Object merchantName;
/** 租金总价 **/
/**
* 商户名称
**/
@JsonProperty("merchantId")
private Object merchantId;
/**
* 租金总价
**/
@JsonProperty("totalRentalPrice")
private String totalRentalPrice;
/** 押金总计 **/
/**
* 押金总计
**/
@JsonProperty("totalDeposit")
private String totalDeposit;
/** 支付方式 **/
/**
* 支付方式
**/
@JsonProperty("payDeposit")
private Object payDeposit;
/** 退还方式 **/
/**
* 退还方式
**/
@JsonProperty("returnDeposit")
private Object returnDeposit;
/** 开始时间 **/
/**
* 开始时间
**/
@JsonProperty("startTime")
private String startTime;
/** 结束时间 **/
/**
* 结束时间
**/
@JsonProperty("endTime")
private String endTime;
/** 租期 **/
/**
* 租期
**/
@JsonProperty("leaseTerm")
private String leaseTerm;
/** 联系人 **/
/**
* 联系人
**/
@JsonProperty("contacts")
private String contacts;
/** 联系电话 **/
/**
* 联系电话
**/
@JsonProperty("contactsPhone")
private String contactsPhone;
/** 合同状态 **/
/**
* 合同状态
**/
@JsonProperty("contractStatus")
private Object contractStatus;
/** 创建时间 **/
/**
* 创建时间
**/
@JsonProperty("creationTime")
private String creationTime;
/** 合同说明 **/
/**
* 合同说明
**/
@JsonProperty("contractExplain")
private String contractExplain;
/** 合同附件 **/
/**
* 合同附件
**/
@JsonProperty("contractEnclosure")
private Object contractEnclosure;
}

7
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/contract/SpacecontractModel.java
Unescape View File

@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* 版本： V3.5
* 版权: 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-07-16
* 日期： 2024-07-19
*/
@Data
public class SpacecontractModel {
@ -22,8 +22,9 @@ public class SpacecontractModel {
@JSONField(name = "contractLineNumber")
private String contractLineNumber;
/** 空间名称 **/
@JSONField(name = "spaceName")
private String spaceName;
@JSONField(name = "spaceId")
private Object spaceId;
/** 空间面积 **/
@JSONField(name = "spaceArea")
private String spaceArea;

19
jnpf-java-boot/jnpf-web/src/views/scm/contract/Detail.vue
Unescape View File

@ -32,13 +32,13 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="园区名称" prop="parkId">
<jnpf-form-tip-item label="园区名称" prop="parkName">
<p>{{ dataForm.parkName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="商户名称" prop="merchantName">
<p>{{ dataForm.merchantName }}</p>
<jnpf-form-tip-item label="商户名称" prop="merchantId">
<p>{{ dataForm.merchantId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
@ -123,9 +123,9 @@
<p>{{ scope.row.contractLineNumber }}</p>
</template>
</el-table-column>
<el-table-column prop="spaceName" label="空间名称">
<el-table-column prop="spaceId" label="空间名称">
<template slot-scope="scope">
<p>{{ scope.row.spaceName }}</p>
<p>{{ scope.row.spaceId }}</p>
</template>
</el-table-column>
<el-table-column prop="spaceArea" label="空间面积">
@ -170,7 +170,7 @@ export default {
pricingMethod: "",
signingDate: '',
parkId: "",
merchantName: "",
merchantId: "",
totalRentalPrice: "",
totalDeposit: '',
payDeposit: "",
@ -188,15 +188,16 @@ export default {
},
pricingMethodOptions: [{ "fullName": "月付", "id": "1" }, { "fullName": "季付", "id": "2" }, { "fullName": "年付", "id": "3" }],
pricingMethodProps: { "label": "fullName", "value": "id" },
parkIdProps: { "label": "park_name", "value": "park_number" },
merchantNameProps: { "label": "cmp_nm", "value": "id" },
parkIdProps: { "label": "name", "value": "code" },
merchantIdProps: { "label": "cmp_nm", "value": "id" },
payDepositOptions: [{ "fullName": "选项1", "id": "1" }, { "fullName": "选项2", "id": "2" }],
payDepositProps: { "label": "fullName", "value": "id" },
returnDepositOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
returnDepositProps: { "label": "fullName", "value": "id" },
contractStatusOptions: [{ "fullName": "待确认", "id": "10" }, { "fullName": "已确认", "id": "20" }, { "fullName": "已结案", "id": "30" }, { "fullName": "待确认", "id": "21" }],
contractStatusOptions: [{ "fullName": "待确认", "id": "10" }, { "fullName": "已确认", "id": "20" }, { "fullName": "已结案", "id": "30" }, { "fullName": "合同变更", "id": "21" }],
contractStatusProps: { "label": "fullName", "value": "id" },
spaceIdProps: { "label": "name", "value": "id", "children": "children" },
}
},
computed: {},

2
jnpf-java-boot/jnpf-web/src/views/scm/contract/columnList.js
View File

File diff suppressed because one or more lines are too long

28
jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
Unescape View File

@ -68,15 +68,15 @@
<el-button type="success" icon="icon-ym icon-ym-btn-download" @click="showEndDialog = true"">合同结束
</el-button>
</div>
<div class=" JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
@ -253,18 +253,18 @@ export default {
pricingMethodOptions: [{ "fullName": "月付", "id": "1" }, { "fullName": "季付", "id": "2" }, { "fullName": "年付", "id": "3" }],
pricingMethodProps: { "label": "fullName", "value": "id" },
parkIdOptions: [],
parkIdProps: { "label": "park_name", "value": "park_number" },
merchantNameOptions: [],
merchantNameProps: { "label": "cmp_nm", "value": "id" },
parkIdProps: { "label": "name", "value": "id" },
merchantIdOptions: [],
merchantIdProps: { "label": "cmp_nm", "value": "id" },
payDepositOptions: [{ "fullName": "选项1", "id": "1" }, { "fullName": "选项2", "id": "2" }],
payDepositProps: { "label": "fullName", "value": "id" },
returnDepositOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
returnDepositProps: { "label": "fullName", "value": "id" },
contractStatusOptions: [{ "fullName": "待确认", "id": "10" }, { "fullName": "已确认", "id": "20" }, { "fullName": "已结案", "id": "30" }, { "fullName": "合同变更", "id": "21" }],
contractStatusProps: { "label": "fullName", "value": "id" },
tableField130_spaceNamecolumnOptions: [{ "label": "园区编码", "value": "code" }, { "label": "园区名称", "value": "name" },],
tableField130_spaceIdOptions: [],
tableField130_spaceIdProps: { "label": "name", "value": "id", "children": "children" },
interfaceRes: {
tableField130_spaceName: [],
},
}
},

2
jnpf-java-boot/jnpf-web/src/views/scm/contract/superQueryJson.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save