feat(contract):设备租赁前后端代码提交;

master
jiyufei 3 months ago
parent 9d658102b8
commit 1f7291f950

@ -0,0 +1,16 @@
package jnpf.mapper;
import jnpf.entity.EquipmentRentalRecordsEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* EquipmentRentalRecords
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-07-17
*/
public interface EquipmentRentalRecordsMapper extends BaseMapper<EquipmentRentalRecordsEntity> {
}

@ -0,0 +1,37 @@
package jnpf.service;
import jnpf.model.equipmentrentalrecords.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* EquipmentRentalRecords
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-07-17
*/
public interface EquipmentRentalRecordsService extends IService<EquipmentRentalRecordsEntity> {
List<EquipmentRentalRecordsEntity> getList(EquipmentRentalRecordsPagination equipmentRentalRecordsPagination);
List<EquipmentRentalRecordsEntity> getTypeList(EquipmentRentalRecordsPagination equipmentRentalRecordsPagination, String dataType);
EquipmentRentalRecordsEntity getInfo(String id);
void delete(EquipmentRentalRecordsEntity entity);
void create(EquipmentRentalRecordsEntity entity);
String update(String id, EquipmentRentalRecordsEntity entity);
//子表方法
//副表数据方法
String checkForm(EquipmentRentalRecordsForm form, int i);
void saveOrUpdate(EquipmentRentalRecordsForm equipmentRentalRecordsForm, String id, boolean isSave) throws Exception;
}

@ -2,7 +2,9 @@ package jnpf.service;
import jnpf.model.equipment.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
public interface EquipmentService extends IService<EquipmentEntity> {
List<EquipmentEntity> getList(EquipmentPagination equipmentPagination);
List<EquipmentEntity> getTypeList(EquipmentPagination equipmentPagination,String dataType);
List<EquipmentEntity> getTypeList(EquipmentPagination equipmentPagination, String dataType);
EquipmentEntity getInfo(String id);
@ -28,8 +30,15 @@ public interface EquipmentService extends IService<EquipmentEntity> {
//子表方法
//副表数据方法
String checkForm(EquipmentForm form,int i);
String checkForm(EquipmentForm form, int i);
void saveOrUpdate(EquipmentForm equipmentForm,String id, boolean isSave) throws Exception;
void saveOrUpdate(EquipmentForm equipmentForm, String id, boolean isSave) throws Exception;
/**
*
*
* @param equipmentId id
* @param status
*/
void updateStatus(String equipmentId, String status);
}

@ -57,6 +57,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
@Resource
private EnterpriseMerchantsService enterpriseMerchantsService;
@Override
public List<ContractEntity> getList(ContractPagination contractPagination) {
return getTypeList(contractPagination, contractPagination.getDataType());
@ -393,7 +394,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
@Override
public void create(ContractEntity entity) {
entity.setCreateBy(userProvider.get().getUserId());
this.save(entity);
}
@ -507,6 +507,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
contractForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(ContractConstant.getFormData(), contractForm), ContractForm.class);
ContractEntity entity = JsonUtil.getJsonToBean(contractForm, ContractEntity.class);
//todo 设置园区名称
if (isSave) {
//获取当前年月日
@ -514,6 +516,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
entity.setCreationTime(DateUtil.getNowDate());
entity.setContractNumber(currentDate + RandomUtil.uuId().substring(0, 6));
entity.setId(RandomUtil.uuId());
entity.setCreateBy(userProvider.get().getUserId());
entity.setVersion(0);
} else {
entity.setCreationTime(DateUtil.getNowDate());

@ -0,0 +1,405 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.EquipmentRentalRecordsMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.equipmentrentalrecords.*;
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 java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.concurrent.CompletableFuture;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
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 jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
import javax.annotation.Resource;
/**
* EquipmentRentalRecords
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-07-17
*/
@Service
public class EquipmentRentalRecordsServiceImpl extends ServiceImpl<EquipmentRentalRecordsMapper, EquipmentRentalRecordsEntity> implements EquipmentRentalRecordsService {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Resource
private EquipmentService equipmentService;
@Override
public List<EquipmentRentalRecordsEntity> getList(EquipmentRentalRecordsPagination equipmentRentalRecordsPagination) {
return getTypeList(equipmentRentalRecordsPagination, equipmentRentalRecordsPagination.getDataType());
}
/**
*
*/
@Override
public List<EquipmentRentalRecordsEntity> getTypeList(EquipmentRentalRecordsPagination equipmentRentalRecordsPagination, String dataType) {
String userId = userProvider.get().getUserId();
List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList = new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? EquipmentRentalRecordsConstant.getAppColumnData() : EquipmentRentalRecordsConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total = 0;
int equipmentRentalRecordsNum = 0;
QueryWrapper<EquipmentRentalRecordsEntity> equipmentRentalRecordsQueryWrapper = new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp = "";
if (ObjectUtil.isNotEmpty(equipmentRentalRecordsPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = equipmentRentalRecordsPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<EquipmentRentalRecordsEntity> equipmentRentalRecordsSuperWrapper = new QueryWrapper<>();
equipmentRentalRecordsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(equipmentRentalRecordsSuperWrapper, EquipmentRentalRecordsEntity.class, queryJson, "0"));
int equipmentRentalRecordsNum1 = equipmentRentalRecordsSuperWrapper.getExpression().getNormal().size();
if (equipmentRentalRecordsNum1 > 0) {
List<String> equipmentRentalRecordsList = this.list(equipmentRentalRecordsSuperWrapper).stream().map(EquipmentRentalRecordsEntity::getId).collect(Collectors.toList());
allSuperList.addAll(equipmentRentalRecordsList);
intersectionSuperList.add(equipmentRentalRecordsList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
} else {
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<EquipmentRentalRecordsEntity> equipmentRentalRecordsSuperWrapper = new QueryWrapper<>();
equipmentRentalRecordsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(equipmentRentalRecordsSuperWrapper, EquipmentRentalRecordsEntity.class, ruleJson, "0"));
int equipmentRentalRecordsNum1 = equipmentRentalRecordsSuperWrapper.getExpression().getNormal().size();
if (equipmentRentalRecordsNum1 > 0) {
List<String> equipmentRentalRecordsList = this.list(equipmentRentalRecordsSuperWrapper).stream().map(EquipmentRentalRecordsEntity::getId).collect(Collectors.toList());
allRuleList.addAll(equipmentRentalRecordsList);
intersectionRuleList.add(equipmentRentalRecordsList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
} else {
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean appPermission = false;
if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object equipmentRentalRecordsObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(equipmentRentalRecordsQueryWrapper, EquipmentRentalRecordsEntity.class, equipmentRentalRecordsPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(equipmentRentalRecordsObj)) {
return new ArrayList<>();
} else {
equipmentRentalRecordsQueryWrapper = (QueryWrapper<EquipmentRentalRecordsEntity>) equipmentRentalRecordsObj;
if (equipmentRentalRecordsQueryWrapper.getExpression().getNormal().size() > 0) {
equipmentRentalRecordsNum++;
}
}
}
}
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object equipmentRentalRecordsObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(equipmentRentalRecordsQueryWrapper, EquipmentRentalRecordsEntity.class, equipmentRentalRecordsPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(equipmentRentalRecordsObj)) {
return new ArrayList<>();
} else {
equipmentRentalRecordsQueryWrapper = (QueryWrapper<EquipmentRentalRecordsEntity>) equipmentRentalRecordsObj;
if (equipmentRentalRecordsQueryWrapper.getExpression().getNormal().size() > 0) {
equipmentRentalRecordsNum++;
}
}
}
}
if (isPc) {
if (ObjectUtil.isNotEmpty(equipmentRentalRecordsPagination.getCreationTime())) {
equipmentRentalRecordsNum++;
List CreationTimeList = JsonUtil.getJsonToList(equipmentRentalRecordsPagination.getCreationTime(), String.class);
Long fir = Long.valueOf(String.valueOf(CreationTimeList.get(0)));
Long sec = Long.valueOf(String.valueOf(CreationTimeList.get(1)));
equipmentRentalRecordsQueryWrapper.lambda().ge(EquipmentRentalRecordsEntity::getCreationTime, new Date(fir))
.le(EquipmentRentalRecordsEntity::getCreationTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if (ObjectUtil.isNotEmpty(equipmentRentalRecordsPagination.getMerchantName())) {
equipmentRentalRecordsNum++;
String value = equipmentRentalRecordsPagination.getMerchantName() instanceof List ?
JsonUtil.getObjectToString(equipmentRentalRecordsPagination.getMerchantName()) :
String.valueOf(equipmentRentalRecordsPagination.getMerchantName());
equipmentRentalRecordsQueryWrapper.lambda().like(EquipmentRentalRecordsEntity::getMerchantName, value);
}
if (ObjectUtil.isNotEmpty(equipmentRentalRecordsPagination.getEquipmentCoding())) {
equipmentRentalRecordsNum++;
String value = equipmentRentalRecordsPagination.getEquipmentCoding() instanceof List ?
JsonUtil.getObjectToString(equipmentRentalRecordsPagination.getEquipmentCoding()) :
String.valueOf(equipmentRentalRecordsPagination.getEquipmentCoding());
equipmentRentalRecordsQueryWrapper.lambda().like(EquipmentRentalRecordsEntity::getEquipmentCoding, value);
}
if (ObjectUtil.isNotEmpty(equipmentRentalRecordsPagination.getEquipmentName())) {
equipmentRentalRecordsNum++;
String value = equipmentRentalRecordsPagination.getEquipmentName() instanceof List ?
JsonUtil.getObjectToString(equipmentRentalRecordsPagination.getEquipmentName()) :
String.valueOf(equipmentRentalRecordsPagination.getEquipmentName());
equipmentRentalRecordsQueryWrapper.lambda().like(EquipmentRentalRecordsEntity::getEquipmentName, value);
}
if (ObjectUtil.isNotEmpty(equipmentRentalRecordsPagination.getLeaseStatus())) {
equipmentRentalRecordsNum++;
List<String> idList = new ArrayList<>();
try {
String[][] leaseStatus = JsonUtil.getJsonToBean(equipmentRentalRecordsPagination.getLeaseStatus(), String[][].class);
for (int i = 0; i < leaseStatus.length; i++) {
if (leaseStatus[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(leaseStatus[i])));
}
}
} catch (Exception e1) {
try {
List<String> leaseStatus = JsonUtil.getJsonToList(equipmentRentalRecordsPagination.getLeaseStatus(), String.class);
if (leaseStatus.size() > 0) {
idList.addAll(leaseStatus);
}
} catch (Exception e2) {
idList.add(String.valueOf(equipmentRentalRecordsPagination.getLeaseStatus()));
}
}
equipmentRentalRecordsQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(EquipmentRentalRecordsEntity::getLeaseStatus, tt).or();
});
});
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total > 0) {
if (intersection.size() == 0) {
intersection.add("jnpfNullList");
}
equipmentRentalRecordsQueryWrapper.lambda().in(EquipmentRentalRecordsEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
equipmentRentalRecordsQueryWrapper.lambda().and(t -> t.in(EquipmentRentalRecordsEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
equipmentRentalRecordsQueryWrapper.lambda().and(t -> t.in(EquipmentRentalRecordsEntity::getId, finalAllRuleIDlist));
}
//假删除标志
equipmentRentalRecordsQueryWrapper.lambda().isNull(EquipmentRentalRecordsEntity::getDeleteMark);
//排序
if (StringUtil.isEmpty(equipmentRentalRecordsPagination.getSidx())) {
equipmentRentalRecordsQueryWrapper.lambda().orderByDesc(EquipmentRentalRecordsEntity::getId);
} else {
try {
String sidx = equipmentRentalRecordsPagination.getSidx();
String[] strs = sidx.split("_name");
EquipmentRentalRecordsEntity equipmentRentalRecordsEntity = new EquipmentRentalRecordsEntity();
Field declaredField = equipmentRentalRecordsEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
equipmentRentalRecordsQueryWrapper = "asc".equals(equipmentRentalRecordsPagination.getSort().toLowerCase()) ? equipmentRentalRecordsQueryWrapper.orderByAsc(value) : equipmentRentalRecordsQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<EquipmentRentalRecordsEntity> page = new Page<>(equipmentRentalRecordsPagination.getCurrentPage(), equipmentRentalRecordsPagination.getPageSize());
IPage<EquipmentRentalRecordsEntity> userIPage = this.page(page, equipmentRentalRecordsQueryWrapper);
return equipmentRentalRecordsPagination.setData(userIPage.getRecords(), userIPage.getTotal());
} else {
List<EquipmentRentalRecordsEntity> list = new ArrayList();
return equipmentRentalRecordsPagination.setData(list, list.size());
}
} else {
return this.list(equipmentRentalRecordsQueryWrapper);
}
}
@Override
public EquipmentRentalRecordsEntity getInfo(String id) {
QueryWrapper<EquipmentRentalRecordsEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(EquipmentRentalRecordsEntity::getId, id);
return this.getOne(queryWrapper);
}
@Override
public void create(EquipmentRentalRecordsEntity entity) {
this.save(entity);
}
@Override
public String update(String id, EquipmentRentalRecordsEntity entity) {
//判断设备是否是可用状态
EquipmentEntity equipment = equipmentService.getById(entity.getEquipmentId());
if ("1".equals(equipment.getStatus())){
return "该设备未归还,不可删除!";
}
//异步更改状态
CompletableFuture.runAsync(() -> equipmentService.updateStatus(entity.getEquipmentId(), "1"));
this.updateById(entity);
return "删除成功";
}
@Override
public void delete(EquipmentRentalRecordsEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
}
}
/**
* i-0-1
*/
@Override
public String checkForm(EquipmentRentalRecordsForm form, int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id = "";
String countRecover = "";
if (isUp) {
id = form.getId();
}
//主表字段验证
if (StringUtil.isNotEmpty(form.getTotalLeasePrice())) {
if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getTotalLeasePrice())).matches()) {
return "请输入正确的金额";
}
}
if (StringUtil.isNotEmpty(form.getLeaseDeposit())) {
if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getLeaseDeposit())).matches()) {
return "请输入正确的金额";
}
}
if (StringUtil.isNotEmpty(form.getContactsPhone())) {
if (!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getContactsPhone())).matches()) {
return "请输入正确的联系方式";
}
}
return countRecover;
}
/**
* ()
*
* @param id
* @param equipmentRentalRecordsForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(EquipmentRentalRecordsForm equipmentRentalRecordsForm, String id, boolean isSave) throws Exception {
UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
equipmentRentalRecordsForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(EquipmentRentalRecordsConstant.getFormData(), equipmentRentalRecordsForm), EquipmentRentalRecordsForm.class);
EquipmentRentalRecordsEntity entity = JsonUtil.getJsonToBean(equipmentRentalRecordsForm, EquipmentRentalRecordsEntity.class);
if (isSave) {
//查询设备
EquipmentEntity equipment = equipmentService.getById(equipmentRentalRecordsForm.getEquipmentId());
if (ObjectUtil.isNotNull(equipment)){
entity.setEquipmentCoding(equipment.getCode());
entity.setEquipmentName(equipment.getName());
}
String mainId = RandomUtil.uuId();
entity.setCreationTime(DateUtil.getNowDate());
entity.setId(mainId);
entity.setLeaseNumber(RandomUtil.uuId());
entity.setCreateBy(userProvider.get().getUserId());
entity.setSubmitter(userProvider.get().getUserId());
entity.setSubmissionTime(DateUtil.getNowDate());
entity.setVersion(0);
} else {
entity.setCreationTime(DateUtil.getNowDate());
}
boolean result = this.saveOrUpdate(entity);
if (result) {
String status;
if ("1".equals(entity.getLeaseStatus())) {
status = "2";
} else {
status = "1";
}
//异步更新设备表状态
CompletableFuture.runAsync(() -> equipmentService.updateStatus(entity.getEquipmentId(), status));
}
}
}

@ -5,19 +5,28 @@ import jnpf.mapper.EquipmentMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.equipment.*;
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 java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -25,13 +34,17 @@ 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 jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* Equipment
* V3.5
* https://www.jnpfsoft.com
@ -39,7 +52,8 @@ import jnpf.permission.entity.UserEntity;
* 2024-07-15
*/
@Service
public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, EquipmentEntity> implements EquipmentService{
@Slf4j
public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, EquipmentEntity> implements EquipmentService {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@ -47,95 +61,98 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
private UserProvider userProvider;
@Override
public List<EquipmentEntity> getList(EquipmentPagination equipmentPagination){
return getTypeList(equipmentPagination,equipmentPagination.getDataType());
public List<EquipmentEntity> getList(EquipmentPagination equipmentPagination) {
return getTypeList(equipmentPagination, equipmentPagination.getDataType());
}
/** 列表查询 */
/**
*
*/
@Override
public List<EquipmentEntity> getTypeList(EquipmentPagination equipmentPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
public List<EquipmentEntity> getTypeList(EquipmentPagination equipmentPagination, String dataType) {
String userId = userProvider.get().getUserId();
List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList = new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? EquipmentConstant.getAppColumnData() : EquipmentConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int equipmentNum =0;
QueryWrapper<EquipmentEntity> equipmentQueryWrapper=new QueryWrapper<>();
int total = 0;
int equipmentNum = 0;
QueryWrapper<EquipmentEntity> equipmentQueryWrapper = new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(equipmentPagination.getSuperQueryJson())){
String superOp = "";
if (ObjectUtil.isNotEmpty(equipmentPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = equipmentPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<EquipmentEntity> equipmentSuperWrapper = new QueryWrapper<>();
equipmentSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(equipmentSuperWrapper,EquipmentEntity.class,queryJson,"0"));
equipmentSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(equipmentSuperWrapper, EquipmentEntity.class, queryJson, "0"));
int equipmentNum1 = equipmentSuperWrapper.getExpression().getNormal().size();
if (equipmentNum1>0){
List<String> equipmentList =this.list(equipmentSuperWrapper).stream().map(EquipmentEntity::getId).collect(Collectors.toList());
if (equipmentNum1 > 0) {
List<String> equipmentList = this.list(equipmentSuperWrapper).stream().map(EquipmentEntity::getId).collect(Collectors.toList());
allSuperList.addAll(equipmentList);
intersectionSuperList.add(equipmentList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if(superOp.equalsIgnoreCase("and")){
if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{
} else {
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<EquipmentEntity> equipmentSuperWrapper = new QueryWrapper<>();
equipmentSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(equipmentSuperWrapper,EquipmentEntity.class,ruleJson,"0"));
equipmentSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(equipmentSuperWrapper, EquipmentEntity.class, ruleJson, "0"));
int equipmentNum1 = equipmentSuperWrapper.getExpression().getNormal().size();
if (equipmentNum1>0){
List<String> equipmentList =this.list(equipmentSuperWrapper).stream().map(EquipmentEntity::getId).collect(Collectors.toList());
if (equipmentNum1 > 0) {
List<String> equipmentList = this.list(equipmentSuperWrapper).stream().map(EquipmentEntity::getId).collect(Collectors.toList());
allRuleList.addAll(equipmentList);
intersectionRuleList.add(equipmentList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
} else {
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object equipmentObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(equipmentQueryWrapper,EquipmentEntity.class,equipmentPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(equipmentObj)){
if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object equipmentObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(equipmentQueryWrapper, EquipmentEntity.class, equipmentPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(equipmentObj)) {
return new ArrayList<>();
} else {
equipmentQueryWrapper = (QueryWrapper<EquipmentEntity>)equipmentObj;
if( equipmentQueryWrapper.getExpression().getNormal().size()>0){
equipmentQueryWrapper = (QueryWrapper<EquipmentEntity>) equipmentObj;
if (equipmentQueryWrapper.getExpression().getNormal().size() > 0) {
equipmentNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object equipmentObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(equipmentQueryWrapper,EquipmentEntity.class,equipmentPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(equipmentObj)){
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object equipmentObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(equipmentQueryWrapper, EquipmentEntity.class, equipmentPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(equipmentObj)) {
return new ArrayList<>();
} else {
equipmentQueryWrapper = (QueryWrapper<EquipmentEntity>)equipmentObj;
if( equipmentQueryWrapper.getExpression().getNormal().size()>0){
equipmentQueryWrapper = (QueryWrapper<EquipmentEntity>) equipmentObj;
if (equipmentQueryWrapper.getExpression().getNormal().size() > 0) {
equipmentNum++;
}
}
@ -143,205 +160,227 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(equipmentPagination.getType())){
if (isPc) {
if (ObjectUtil.isNotEmpty(equipmentPagination.getType())) {
equipmentNum++;
List<String> idList = new ArrayList<>();
try {
String[][] type = JsonUtil.getJsonToBean(equipmentPagination.getType(),String[][].class);
for(int i=0;i<type.length;i++){
if(type[i].length>0){
String[][] type = JsonUtil.getJsonToBean(equipmentPagination.getType(), String[][].class);
for (int i = 0; i < type.length; i++) {
if (type[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(type[i])));
}
}
}catch (Exception e1){
} catch (Exception e1) {
try {
List<String> type = JsonUtil.getJsonToList(equipmentPagination.getType(),String.class);
if(type.size()>0){
List<String> type = JsonUtil.getJsonToList(equipmentPagination.getType(), String.class);
if (type.size() > 0) {
idList.addAll(type);
}
}catch (Exception e2){
} catch (Exception e2) {
idList.add(String.valueOf(equipmentPagination.getType()));
}
}
equipmentQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
equipmentQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(EquipmentEntity::getType, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(equipmentPagination.getBrand())){
if (ObjectUtil.isNotEmpty(equipmentPagination.getBrand())) {
equipmentNum++;
String value = equipmentPagination.getBrand() instanceof List ?
JsonUtil.getObjectToString(equipmentPagination.getBrand()) :
String.valueOf(equipmentPagination.getBrand());
equipmentQueryWrapper.lambda().like(EquipmentEntity::getBrand,value);
equipmentQueryWrapper.lambda().like(EquipmentEntity::getBrand, value);
}
if(ObjectUtil.isNotEmpty(equipmentPagination.getName())){
if (ObjectUtil.isNotEmpty(equipmentPagination.getName())) {
equipmentNum++;
String value = equipmentPagination.getName() instanceof List ?
JsonUtil.getObjectToString(equipmentPagination.getName()) :
String.valueOf(equipmentPagination.getName());
equipmentQueryWrapper.lambda().like(EquipmentEntity::getName,value);
equipmentQueryWrapper.lambda().like(EquipmentEntity::getName, value);
}
if(ObjectUtil.isNotEmpty(equipmentPagination.getCode())){
if (ObjectUtil.isNotEmpty(equipmentPagination.getCode())) {
equipmentNum++;
String value = equipmentPagination.getCode() instanceof List ?
JsonUtil.getObjectToString(equipmentPagination.getCode()) :
String.valueOf(equipmentPagination.getCode());
equipmentQueryWrapper.lambda().like(EquipmentEntity::getCode,value);
equipmentQueryWrapper.lambda().like(EquipmentEntity::getCode, value);
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
if (total > 0) {
if (intersection.size() == 0) {
intersection.add("jnpfNullList");
}
equipmentQueryWrapper.lambda().in(EquipmentEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
equipmentQueryWrapper.lambda().and(t->t.in(EquipmentEntity::getId, finalAllSuperIDlist));
equipmentQueryWrapper.lambda().and(t -> t.in(EquipmentEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
equipmentQueryWrapper.lambda().and(t->t.in(EquipmentEntity::getId, finalAllRuleIDlist));
equipmentQueryWrapper.lambda().and(t -> t.in(EquipmentEntity::getId, finalAllRuleIDlist));
}
//假删除标志
equipmentQueryWrapper.lambda().isNull(EquipmentEntity::getDeleteMark);
//排序
if(StringUtil.isEmpty(equipmentPagination.getSidx())){
if (StringUtil.isEmpty(equipmentPagination.getSidx())) {
equipmentQueryWrapper.lambda().orderByDesc(EquipmentEntity::getId);
}else{
} else {
try {
String sidx = equipmentPagination.getSidx();
String[] strs= sidx.split("_name");
String[] strs = sidx.split("_name");
EquipmentEntity equipmentEntity = new EquipmentEntity();
Field declaredField = equipmentEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
equipmentQueryWrapper="asc".equals(equipmentPagination.getSort().toLowerCase())?equipmentQueryWrapper.orderByAsc(value):equipmentQueryWrapper.orderByDesc(value);
equipmentQueryWrapper = "asc".equals(equipmentPagination.getSort().toLowerCase()) ? equipmentQueryWrapper.orderByAsc(value) : equipmentQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<EquipmentEntity> page=new Page<>(equipmentPagination.getCurrentPage(), equipmentPagination.getPageSize());
IPage<EquipmentEntity> userIPage=this.page(page, equipmentQueryWrapper);
return equipmentPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<EquipmentEntity> page = new Page<>(equipmentPagination.getCurrentPage(), equipmentPagination.getPageSize());
IPage<EquipmentEntity> userIPage = this.page(page, equipmentQueryWrapper);
return equipmentPagination.setData(userIPage.getRecords(), userIPage.getTotal());
} else {
List<EquipmentEntity> list = new ArrayList();
return equipmentPagination.setData(list, list.size());
}
}else{
} else {
return this.list(equipmentQueryWrapper);
}
}
@Override
public EquipmentEntity getInfo(String id){
QueryWrapper<EquipmentEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(EquipmentEntity::getId,id);
public EquipmentEntity getInfo(String id) {
QueryWrapper<EquipmentEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(EquipmentEntity::getId, id);
return this.getOne(queryWrapper);
}
@Override
public void create(EquipmentEntity entity){
public void create(EquipmentEntity entity) {
this.save(entity);
}
@Override
public boolean update(String id, EquipmentEntity entity){
public boolean update(String id, EquipmentEntity entity) {
return this.updateById(entity);
}
@Override
public void delete(EquipmentEntity entity){
if(entity!=null){
public void delete(EquipmentEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
/**
* i-0-1
*/
@Override
public String checkForm(EquipmentForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
public String checkForm(EquipmentForm form, int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id = "";
String countRecover = "";
if (isUp){
if (isUp) {
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getBrand())){
if (StringUtil.isEmpty(form.getBrand())) {
return "设备品牌不能为空";
}
if(StringUtil.isEmpty(form.getModel())){
if (StringUtil.isEmpty(form.getModel())) {
return "设备型号不能为空";
}
if(StringUtil.isEmpty(form.getBatchNumber())){
if (StringUtil.isEmpty(form.getBatchNumber())) {
return "批次号不能为空";
}
if(StringUtil.isEmpty(form.getSupplier())){
if (StringUtil.isEmpty(form.getSupplier())) {
return "供应商不能为空";
}
if(StringUtil.isEmpty(form.getSupplierPhone())){
if (StringUtil.isEmpty(form.getSupplierPhone())) {
return "供应商联系电话不能为空";
}
if(StringUtil.isNotEmpty(form.getSupplierPhone())){
if(!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getSupplierPhone())).matches()){
if (StringUtil.isNotEmpty(form.getSupplierPhone())) {
if (!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getSupplierPhone())).matches()) {
return "请输入正确的联系方式";
}
}
if(StringUtil.isEmpty(form.getDefectsLiabilityPeriod())){
if (StringUtil.isEmpty(form.getDefectsLiabilityPeriod())) {
return "保修期不能为空";
}
if(StringUtil.isNotEmpty(form.getDefectsLiabilityPeriod())){
if(!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getDefectsLiabilityPeriod())).matches()){
if (StringUtil.isNotEmpty(form.getDefectsLiabilityPeriod())) {
if (!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getDefectsLiabilityPeriod())).matches()) {
return "请输入正确的数字";
}
}
return countRecover;
}
/**
* ()
*
* @param id
* @param equipmentForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(EquipmentForm equipmentForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
public void saveOrUpdate(EquipmentForm equipmentForm, String id, boolean isSave) throws Exception {
UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
equipmentForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(EquipmentConstant.getFormData(),equipmentForm),EquipmentForm.class);
generaterSwapUtil.swapDatetime(EquipmentConstant.getFormData(), equipmentForm), EquipmentForm.class);
EquipmentEntity entity = JsonUtil.getJsonToBean(equipmentForm, EquipmentEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
if (isSave) {
String mainId = RandomUtil.uuId();
entity.setId(mainId);
entity.setVersion(0);
}else{
} else {
}
this.saveOrUpdate(entity);
}
@Override
public void updateStatus(String equipmentId, String status) {
log.info("更新设备状态设备id{},更新状态:{}", equipmentId, status);
EquipmentEntity entity = this.getById(equipmentId);
if (ObjectUtil.isNull(equipmentId)) {
return;
}
entity.setStatus(status);
entity.setLastModifyUserId(userProvider.get().getUserId());
entity.setLastModifyTime(DateUtil.getNowDate());
this.updateById(entity);
}
}

@ -0,0 +1,373 @@
package jnpf.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.xuyanwu.spring.file.storage.FileInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import jnpf.base.vo.DownloadVO;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.config.ConfigValueUtil;
import jnpf.entity.EquipmentRentalRecordsEntity;
import jnpf.model.equipmentrentalrecords.EquipmentRentalRecordsConstant;
import jnpf.model.equipmentrentalrecords.EquipmentRentalRecordsForm;
import jnpf.model.equipmentrentalrecords.EquipmentRentalRecordsPagination;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.service.EquipmentRentalRecordsService;
import jnpf.util.*;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import java.io.IOException;
import java.util.*;
/**
* EquipmentRentalRecords
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-17
*/
@Slf4j
@RestController
@Tag(name = "EquipmentRentalRecords", description = "example")
@RequestMapping("/api/example/EquipmentRentalRecords")
public class EquipmentRentalRecordsController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private EquipmentRentalRecordsService equipmentRentalRecordsService;
@Autowired
private ConfigValueUtil configValueUtil;
/**
*
*
* @param equipmentRentalRecordsPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody EquipmentRentalRecordsPagination equipmentRentalRecordsPagination) throws IOException {
List<EquipmentRentalRecordsEntity> list = equipmentRentalRecordsService.getList(equipmentRentalRecordsPagination);
List<Map<String, Object>> realList = new ArrayList<>();
for (EquipmentRentalRecordsEntity entity : list) {
Map<String, Object> equipmentRentalRecordsMap = JsonUtil.entityToMap(entity);
equipmentRentalRecordsMap.put("id", equipmentRentalRecordsMap.get("id"));
//副表数据
//子表数据
realList.add(equipmentRentalRecordsMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, EquipmentRentalRecordsConstant.getFormData(), EquipmentRentalRecordsConstant.getColumnData(), equipmentRentalRecordsPagination.getModuleId(), false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(equipmentRentalRecordsPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param equipmentRentalRecordsForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid EquipmentRentalRecordsForm equipmentRentalRecordsForm) {
String b = equipmentRentalRecordsService.checkForm(equipmentRentalRecordsForm, 0);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
try {
equipmentRentalRecordsService.saveOrUpdate(equipmentRentalRecordsForm, null, true);
} catch (Exception e) {
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* Excel
*
* @return
*/
@Operation(summary = "导出Excel")
@PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody EquipmentRentalRecordsPagination equipmentRentalRecordsPagination) throws IOException {
if (StringUtil.isEmpty(equipmentRentalRecordsPagination.getSelectKey())) {
return ActionResult.fail("请选择导出字段");
}
List<EquipmentRentalRecordsEntity> list = equipmentRentalRecordsService.getList(equipmentRentalRecordsPagination);
List<Map<String, Object>> realList = new ArrayList<>();
for (EquipmentRentalRecordsEntity entity : list) {
Map<String, Object> equipmentRentalRecordsMap = JsonUtil.entityToMap(entity);
equipmentRentalRecordsMap.put("id", equipmentRentalRecordsMap.get("id"));
//副表数据
//子表数据
realList.add(equipmentRentalRecordsMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, EquipmentRentalRecordsConstant.getFormData(), EquipmentRentalRecordsConstant.getColumnData(), equipmentRentalRecordsPagination.getModuleId(), false);
String[] keys = !StringUtil.isEmpty(equipmentRentalRecordsPagination.getSelectKey()) ? equipmentRentalRecordsPagination.getSelectKey() : new String[0];
UserInfo userInfo = userProvider.get();
DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), realList, keys, userInfo);
return ActionResult.success(vo);
}
/**
*
*/
public DownloadVO creatModelExcel(String path, List<Map<String, Object>> list, String[] keys, UserInfo userInfo) {
DownloadVO vo = DownloadVO.builder().build();
List<ExcelExportEntity> entitys = new ArrayList<>();
if (keys.length > 0) {
for (String key : keys) {
switch (key) {
case "leaseNumber":
entitys.add(new ExcelExportEntity("租赁单号", "leaseNumber"));
break;
case "startTime":
entitys.add(new ExcelExportEntity("开始时间", "startTime"));
break;
case "endTime":
entitys.add(new ExcelExportEntity("结束时间", "endTime"));
break;
case "equipmentId":
entitys.add(new ExcelExportEntity("设备名称", "equipmentId"));
break;
case "totalLeasePrice":
entitys.add(new ExcelExportEntity("租赁总价", "totalLeasePrice"));
break;
case "leaseDeposit":
entitys.add(new ExcelExportEntity("租赁押金", "leaseDeposit"));
break;
case "merchantId":
entitys.add(new ExcelExportEntity("商户名称", "merchantId"));
break;
case "contacts":
entitys.add(new ExcelExportEntity("联系人", "contacts"));
break;
case "contactsPhone":
entitys.add(new ExcelExportEntity("联系电话", "contactsPhone"));
break;
case "leaseStatus":
entitys.add(new ExcelExportEntity("租赁状态", "leaseStatus"));
break;
case "enclosure":
entitys.add(new ExcelExportEntity("附件", "enclosure"));
break;
case "equipmentCoding":
entitys.add(new ExcelExportEntity("设备编码", "equipmentCoding"));
break;
case "returnedBy":
entitys.add(new ExcelExportEntity("归还人", "returnedBy"));
break;
case "returnTime":
entitys.add(new ExcelExportEntity("归还时间", "returnTime"));
break;
case "returnStatus":
entitys.add(new ExcelExportEntity("归还状态", "returnStatus"));
break;
case "remarks":
entitys.add(new ExcelExportEntity("归还说明", "remarks"));
break;
case "creationTime":
entitys.add(new ExcelExportEntity("创建时间", "creationTime"));
break;
case "equipmentName":
entitys.add(new ExcelExportEntity("设备名称", "equipmentName"));
break;
case "merchantName":
entitys.add(new ExcelExportEntity("商户名称", "merchantName"));
break;
default:
break;
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try {
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size() > 0) {
if (list.size() == 0) {
list.add(new HashMap<>());
}
//去除空数据
List<Map<String, Object>> dataList = new ArrayList<>();
for (Map<String, Object> map : list) {
int i = 0;
for (String key : keys) {
//子表
if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-"));
String field = key.substring(key.indexOf("-") + 1);
Object o = map.get(tableField);
if (o != null) {
List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
for (Map<String, Object> childMap : childList) {
if (childMap.get(field) != null) {
i++;
}
}
}
} else {
Object o = map.get(key);
if (o != null) {
i++;
}
}
}
if (i > 0) {
dataList.add(map);
}
}
//复杂表头-表头和数据处理
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(EquipmentRentalRecordsConstant.getColumnData(), ColumnDataModel.class);
List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
}
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
}
String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
String temporaryFilePath = configValueUtil.getTemporaryFilePath();
FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
vo.setName(fileInfo.getFilename());
vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
} catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return vo;
}
/**
*
*
* @param id
* @param equipmentRentalRecordsForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid EquipmentRentalRecordsForm equipmentRentalRecordsForm,
@RequestParam(value = "isImport", required = false) boolean isImport) {
equipmentRentalRecordsForm.setId(id);
if (!isImport) {
String b = equipmentRentalRecordsService.checkForm(equipmentRentalRecordsForm, 1);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
}
EquipmentRentalRecordsEntity entity = equipmentRentalRecordsService.getInfo(id);
if (entity != null) {
try {
equipmentRentalRecordsService.saveOrUpdate(equipmentRentalRecordsForm, id, false);
} catch (Exception e) {
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
} else {
return ActionResult.fail("更新失败,数据不存在");
}
}
/**
*
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id) {
EquipmentRentalRecordsEntity entity = equipmentRentalRecordsService.getInfo(id);
String result = null;
if (entity != null) {
//假删除
entity.setDeleteMark(1);
result = equipmentRentalRecordsService.update(id, entity);
}
if (result != null && result.contains("成功")) {
return ActionResult.success(result);
}
return ActionResult.fail(result);
}
/**
* ()
* 使-
*
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id) {
EquipmentRentalRecordsEntity entity = equipmentRentalRecordsService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> equipmentRentalRecordsMap = JsonUtil.entityToMap(entity);
equipmentRentalRecordsMap.put("id", equipmentRentalRecordsMap.get("id"));
//副表数据
//子表数据
equipmentRentalRecordsMap = generaterSwapUtil.swapDataDetail(equipmentRentalRecordsMap, EquipmentRentalRecordsConstant.getFormData(), "583211716402217477", false);
return ActionResult.success(equipmentRentalRecordsMap);
}
/**
* ()
* 使-
*
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id) {
EquipmentRentalRecordsEntity entity = equipmentRentalRecordsService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> equipmentRentalRecordsMap = JsonUtil.entityToMap(entity);
equipmentRentalRecordsMap.put("id", equipmentRentalRecordsMap.get("id"));
//副表数据
//子表数据
equipmentRentalRecordsMap = generaterSwapUtil.swapDataForm(equipmentRentalRecordsMap, EquipmentRentalRecordsConstant.getFormData(), EquipmentRentalRecordsConstant.TABLEFIELDKEY, EquipmentRentalRecordsConstant.TABLERENAMES);
return ActionResult.success(equipmentRentalRecordsMap);
}
}

@ -0,0 +1,85 @@
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
* @ 2024-07-17
*/
@Data
@TableName("yq_equipment_rental_records")
public class EquipmentRentalRecordsEntity {
@TableId(value ="ID" )
private String id;
@TableField("CREATE_BY")
private String createBy;
@TableField("CREATION_TIME")
private Date creationTime;
@TableField("UPDATE_BY")
private String updateBy;
@TableField("UPDATE_TIME")
private Date updateTime;
@TableField(value = "LEASE_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
private String leaseNumber;
@TableField(value = "EQUIPMENT_NAME" , updateStrategy = FieldStrategy.IGNORED)
private String equipmentName;
@TableField(value = "EQUIPMENT_ID" , updateStrategy = FieldStrategy.IGNORED)
private String equipmentId;
@TableField(value = "EQUIPMENT_CODING" , updateStrategy = FieldStrategy.IGNORED)
private String equipmentCoding;
@TableField(value = "MERCHANT_ID" , updateStrategy = FieldStrategy.IGNORED)
private String merchantId;
@TableField(value = "MERCHANT_NAME" , updateStrategy = FieldStrategy.IGNORED)
private String merchantName;
@TableField(value = "CONTACTS" , updateStrategy = FieldStrategy.IGNORED)
private String contacts;
@TableField(value = "CONTACTS_PHONE" , updateStrategy = FieldStrategy.IGNORED)
private String contactsPhone;
@TableField(value = "TOTAL_LEASE_PRICE" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal totalLeasePrice;
@TableField(value = "LEASE_DEPOSIT" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal leaseDeposit;
@TableField(value = "START_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date startTime;
@TableField(value = "END_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date endTime;
@TableField(value = "LEASE_STATUS" , updateStrategy = FieldStrategy.IGNORED)
private String leaseStatus;
@TableField(value = "RETURNED_BY" , updateStrategy = FieldStrategy.IGNORED)
private String returnedBy;
@TableField(value = "RETURN_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date returnTime;
@TableField(value = "RETURN_STATUS" , updateStrategy = FieldStrategy.IGNORED)
private String returnStatus;
@TableField(value = "ENCLOSURE" , updateStrategy = FieldStrategy.IGNORED)
private String enclosure;
@TableField("SUBMITTER")
private String submitter;
@TableField("SUBMISSION_TIME")
private Date submissionTime;
@TableField(value = "REMARKS" , updateStrategy = FieldStrategy.IGNORED)
private String remarks;
@TableField("OPTIMISTIC_LOCK")
private Integer optimisticLock;
@TableField("CELETE_TAGS")
private Integer celeteTags;
@TableField("COMPANY")
private String company;
@TableField("DEPARTMENT")
private String department;
@TableField("ORGANIZATION")
private String organization;
@TableField("F_FLOW_ID")
private String flowId;
@TableField("F_DELETE_MARK")
private Integer deleteMark;
@TableField("F_VERSION")
private Integer version;
}

@ -0,0 +1,80 @@
package jnpf.model.equipmentrentalrecords;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* EquipmentRentalRecords
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-17
*/
@Data
public class EquipmentRentalRecordsForm {
/** 主键 */
private String id;
/** 乐观锁 **/
@JsonProperty("version")
private Integer version;
/** 租赁单号 **/
@JsonProperty("leaseNumber")
private String leaseNumber;
/** 开始时间 **/
@JsonProperty("startTime")
private String startTime;
/** 结束时间 **/
@JsonProperty("endTime")
private String endTime;
/** 设备名称 **/
@JsonProperty("equipmentId")
private String equipmentId;
/** 租赁总价 **/
@JsonProperty("totalLeasePrice")
private String totalLeasePrice;
/** 租赁押金 **/
@JsonProperty("leaseDeposit")
private String leaseDeposit;
/** 商户名称 **/
@JsonProperty("merchantId")
private String merchantId;
/** 联系人 **/
@JsonProperty("contacts")
private String contacts;
/** 联系电话 **/
@JsonProperty("contactsPhone")
private String contactsPhone;
/** 租赁状态 **/
@JsonProperty("leaseStatus")
private Object leaseStatus;
/** 附件 **/
@JsonProperty("enclosure")
private Object enclosure;
/** 设备编码 **/
@JsonProperty("equipmentCoding")
private String equipmentCoding;
/** 归还人 **/
@JsonProperty("returnedBy")
private String returnedBy;
/** 归还时间 **/
@JsonProperty("returnTime")
private String returnTime;
/** 归还状态 **/
@JsonProperty("returnStatus")
private Object returnStatus;
/** 归还说明 **/
@JsonProperty("remarks")
private String remarks;
/** 创建时间 **/
@JsonProperty("creationTime")
private String creationTime;
/** 设备名称 **/
@JsonProperty("equipmentName")
private String equipmentName;
/** 商户名称 **/
@JsonProperty("merchantName")
private String merchantName;
}

@ -0,0 +1,45 @@
package jnpf.model.equipmentrentalrecords;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
/**
*
* EquipmentRentalRecords
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-17
*/
@Data
public class EquipmentRentalRecordsPagination extends Pagination {
/** 查询key */
private String[] selectKey;
/** json */
private String json;
/** 数据类型 0-当前页1-全部数据 */
private String dataType;
/** 高级查询 */
private String superQueryJson;
/** 功能id */
private String moduleId;
/** 菜单id */
private String menuId;
/** 提交时间 */
@JsonProperty("creationTime")
private Object creationTime;
/** 商户名称 */
@JsonProperty("merchantName")
private Object merchantName;
/** 设备编码 */
@JsonProperty("equipmentCoding")
private Object equipmentCoding;
/** 设备名称 */
@JsonProperty("equipmentName")
private Object equipmentName;
/** 租赁状态 */
@JsonProperty("leaseStatus")
private Object leaseStatus;
}

@ -1,136 +1,116 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<transition name="el-zoom-in-center">
<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>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<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" >
<p>{{dataForm.contractNumber}}</p>
<el-col :span="8">
<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" >
<p>{{dataForm.contractName}}</p>
<el-col :span="8">
<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" >
<el-col :span="8">
<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" >
<p>{{dataForm.signingDate}}</p>
<el-col :span="8">
<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" >
<p>{{dataForm.parkId}}</p>
<el-col :span="8">
<jnpf-form-tip-item label="园区名称" prop="parkId">
<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>
<el-col :span="8">
<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" >
<p>{{dataForm.totalRentalPrice}}</p>
<el-col :span="8">
<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" >
<p>{{dataForm.totalDeposit}}</p>
<el-col :span="8">
<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" >
<el-col :span="8">
<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" >
<el-col :span="8">
<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" >
<p>{{dataForm.startTime}}</p>
<el-col :span="8">
<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" >
<p>{{dataForm.endTime}}</p>
<el-col :span="8">
<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" >
<p>{{dataForm.leaseTerm}}</p>
<el-col :span="8">
<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" >
<p>{{dataForm.contacts}}</p>
<el-col :span="8">
<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" >
<p>{{dataForm.contactsPhone}}</p>
<el-col :span="8">
<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" >
<el-col :span="8">
<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" >
<p>{{dataForm.contractExplain}}</p>
<el-col :span="24">
<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="点击上传" >
<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="点击上传">
</JnpfUploadFile>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>空间列表</h2>
</div>
<el-table :data="dataForm.tableField130" size='mini' >
<el-table :data="dataForm.tableField130" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="contractLineNumber" label="合同行号" >
<el-table-column prop="contractLineNumber" label="合同行号">
<template slot="header">
合同行号
<span slot="label">
@ -140,42 +120,42 @@
</span>
</template>
<template slot-scope="scope">
<p>{{scope.row.contractLineNumber}}</p>
<p>{{ scope.row.contractLineNumber }}</p>
</template>
</el-table-column>
<el-table-column prop="spaceName" label="空间名称" >
<el-table-column prop="spaceName" label="空间名称">
<template slot-scope="scope">
<p>{{scope.row.spaceName}}</p>
<p>{{ scope.row.spaceName }}</p>
</template>
</el-table-column>
<el-table-column prop="spaceArea" label="空间面积" >
<el-table-column prop="spaceArea" label="空间面积">
<template slot-scope="scope">
<p>{{scope.row.spaceArea}}</p>
<p>{{ scope.row.spaceArea }}</p>
</template>
</el-table-column>
<el-table-column prop="totalRentalPrice" label="租金总价" >
<el-table-column prop="totalRentalPrice" label="租金总价">
<template slot-scope="scope">
<p>{{scope.row.totalRentalPrice}}</p>
<p>{{ scope.row.totalRentalPrice }}</p>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-form>
</el-row>
</div>
</transition>
</transition>
</template>
<script>
import request from '@/utils/request'
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail },
props: [],
data() {
return {
@ -184,38 +164,38 @@
loading: false,
dataForm: {
id :'',
contractNumber : '',
contractName : '',
pricingMethod : "",
signingDate : '',
parkId : "",
merchantName : "",
totalRentalPrice : "",
totalDeposit : '',
payDeposit : "",
returnDeposit : "",
startTime : '',
endTime : '',
leaseTerm : '',
contacts : '',
contactsPhone : '',
contractStatus : "10",
creationTime : "",
contractExplain : '',
contractEnclosure : [],
spacecontractList:[],
id: '',
contractNumber: '',
contractName: '',
pricingMethod: "",
signingDate: '',
parkId: "",
merchantName: "",
totalRentalPrice: "",
totalDeposit: '',
payDeposit: "",
returnDeposit: "",
startTime: '',
endTime: '',
leaseTerm: '',
contacts: '',
contactsPhone: '',
contractStatus: "10",
creationTime: "",
contractExplain: '',
contractEnclosure: [],
spacecontractList: [],
},
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" },
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" },
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" },
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" },
}
},
@ -224,7 +204,7 @@
created() {
},
mounted() {},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -238,8 +218,8 @@
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
@ -250,10 +230,10 @@
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/Contract/detail/'+this.dataForm.id,
url: '/api/example/Contract/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -264,6 +244,6 @@
})
},
},
}
}
</script>

@ -443,8 +443,8 @@ export default {
],
contactsPhone: [
{
required: true,
message: '请输入联系电话',
pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
message: '请输入正确的联系方式',
trigger: 'blur'
},
],
@ -466,7 +466,7 @@ 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" },
parkIdProps: { "label": "name", "value": "id" },
merchantNameOptions: [],
merchantNameProps: { "label": "cmp_nm", "value": "id" },
payDepositOptions: [{ "fullName": "选项1", "id": "1" }, { "fullName": "选项2", "id": "2" }],

@ -65,7 +65,7 @@
</el-button>
<el-button type="warning" icon="icon-ym icon-ym-btn-download" @click="showDialog = true"">合同确认
</el-button>
<el-button type=" success" icon="icon-ym icon-ym-btn-download" @click="showEndDialog = true"">合同结束
<el-button type="success" icon="icon-ym icon-ym-btn-download" @click="showEndDialog = true"">合同结束
</el-button>
</div>
<div class=" JNPF-common-head-right">
@ -96,7 +96,7 @@
{{ scope.row.contractStatus }}
</template>
</el-table-column>
<el-table-column prop="parkId" label="园区名称" align="left">
<el-table-column prop="parkName" label="园区名称" align="left">
</el-table-column>
<el-table-column prop="merchantName" label="商户名称" align="left">
</el-table-column>

@ -0,0 +1,200 @@
<template>
<el-dialog title="详情"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1100px">
<el-row :gutter="15" class="">
<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="leaseNumber" >
<p>{{dataForm.leaseNumber}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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" >
<p>{{dataForm.endTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备名称"
prop="equipmentId" >
<p>{{dataForm.equipmentName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="租赁总价"
prop="totalLeasePrice" >
<p>{{dataForm.totalLeasePrice}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="租赁押金"
prop="leaseDeposit" >
<p>{{dataForm.leaseDeposit}}</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>
</el-col>
<el-col :span="8" >
<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" >
<p>{{dataForm.contactsPhone}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="租赁状态"
prop="leaseStatus" >
<p>{{ dataForm.leaseStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="附件"
prop="enclosure" >
<JnpfUploadFile v-model="dataForm.enclosure"
disabled
detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传" >
</JnpfUploadFile>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="归还人"
prop="returnedBy" >
<p>{{dataForm.returnedBy}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="归还时间"
prop="returnTime" >
<p>{{dataForm.returnTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="归还状态"
prop="returnStatus" >
<p>{{ dataForm.returnStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="归还说明"
prop="remarks" >
<p>{{dataForm.remarks}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id :'',
leaseNumber : '',
startTime : '',
endTime : '',
equipmentId : "",
totalLeasePrice : '',
leaseDeposit : '',
merchantId : "",
contacts : '',
contactsPhone : '',
leaseStatus : "1",
enclosure : [],
equipmentCoding : '',
returnedBy : '',
returnTime : '',
returnStatus : "",
remarks : '',
creationTime : "",
equipmentName : '',
merchantName : '',
},
leaseStatusOptions:[{"fullName":"已租","id":"1"},{"fullName":"归还","id":"2"}],
leaseStatusProps:{"label":"fullName","value":"id" },
returnStatusOptions:[{"fullName":"正常","id":"1"},{"fullName":"异常","id":"2"}],
returnStatusProps:{"label":"fullName","value":"id" },
}
},
computed: {},
watch: {},
created() {
},
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/EquipmentRentalRecords/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script>

File diff suppressed because one or more lines are too long

@ -0,0 +1,610 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1100px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item label="租赁单号" prop="leaseNumber">
<JnpfInput v-model="dataForm.leaseNumber" @change="changeData('leaseNumber', -1)"
placeholder="自动生成" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="开始时间" prop="startTime">
<JnpfDatePicker v-model="dataForm.startTime" @change="changeData('startTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择开始时间" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="结束时间" prop="endTime">
<JnpfDatePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择结束时间" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备名称" prop="equipmentId">
<JnpfPopupSelect v-model="dataForm.equipmentId" @change="changeData('equipmentId', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.equipmentId"
placeholder="请选择设备" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据设备"
popupType="dialog" relationField='name' field='equipmentId'
interfaceId="583213983499026949" :pageSize="20"
:columnOptions="equipmentIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="租赁总价" prop="totalLeasePrice">
<JnpfInput v-model="dataForm.totalLeasePrice" @change="changeData('totalLeasePrice', -1)"
placeholder="请输入" addonAfter="元" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="租赁押金" prop="leaseDeposit">
<JnpfInput v-model="dataForm.leaseDeposit" @change="changeData('leaseDeposit', -1)"
placeholder="请输入" addonAfter="元" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="商户名称" prop="merchantId">
<JnpfPopupSelect v-model="dataForm.merchantId" @change="changeData('merchantId', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.merchantId"
placeholder="请选择商户" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='cmp_nm' field='merchantId'
interfaceId="583216109528809989" :pageSize="20" :columnOptions="merchantIdcolumnOptions"
clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="联系人" prop="contacts">
<JnpfInput v-model="dataForm.contacts" @change="changeData('contacts', -1)"
placeholder="请输入联系人" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="联系电话" prop="contactsPhone">
<JnpfInput v-model="dataForm.contactsPhone" @change="changeData('contactsPhone', -1)"
placeholder="请输入联系电话" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="租赁状态" prop="leaseStatus">
<JnpfSelect v-model="dataForm.leaseStatus" :disabled="!changeId" @change="changeData('leaseStatus', -1)"
placeholder="请选择" clearable :style='{ "width": "100%" }' :options="leaseStatusOptions"
:props="leaseStatusProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="附件" prop="enclosure">
<JnpfUploadFile v-model="dataForm.enclosure" @change="changeData('enclosure', -1)"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0"
buttonText="点击上传">
</JnpfUploadFile>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="归还人" prop="returnedBy">
<JnpfInput v-model="dataForm.returnedBy" :disabled="!leaseStatus"
@change="changeData('returnedBy', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="归还时间" prop="returnTime">
<JnpfDatePicker v-model="dataForm.returnTime" :disabled="!leaseStatus" @change="changeData('returnTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择归还时间" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="归还状态" prop="returnStatus">
<JnpfSelect v-model="dataForm.returnStatus" :disabled="!leaseStatus" @change="changeData('returnStatus', -1)"
placeholder="请选择归还状态" clearable :style='{ "width": "100%" }'
:options="returnStatusOptions" :props="returnStatusProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="归还说明" prop="remarks">
<JnpfTextarea v-model="dataForm.remarks" :disabled="!leaseStatus" @change="changeData('remarks', -1)"
placeholder="请输入归还说明" :style='{ "width": "100%" }' true type="textarea"
:autosize='{ "minRows": 4, "maxRows": 4 }'>
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{ '上一条' }}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{ '下一条' }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: {
},
props: [],
data() {
return {
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
prevDis: false,
nextDis: false,
allList: [],
visible: false,
loading: false,
btnLoading: false,
formRef: 'formRef',
setting: {},
eventType: '',
userBoxVisible: false,
selectDialogVisible: false,
currTableConf: {},
dataValueAll: {},
addTableConf: {
},
//
ableAll: {
},
tableRows: {
},
Vmodel: "",
currVmodel: "",
dataForm: {
leaseNumber: undefined,
startTime: undefined,
endTime: undefined,
equipmentId: undefined,
totalLeasePrice: undefined,
leaseDeposit: undefined,
merchantId: undefined,
contacts: undefined,
contactsPhone: undefined,
leaseStatus: "1",
enclosure: [],
equipmentCoding: undefined,
returnedBy: undefined,
returnTime: undefined,
returnStatus: undefined,
remarks: undefined,
creationTime: undefined,
equipmentName: undefined,
merchantName: undefined,
version: 0,
},
tableRequiredData: {},
dataRule:
{
startTime: [
{
required: true,
message: '请选择开始时间',
trigger: 'change'
},
],
endTime: [
{
required: true,
message: '请选择结束时间',
trigger: 'change'
},
],
equipmentId: [
{
required: true,
message: '请选择设备',
trigger: 'change'
},
],
totalLeasePrice: [
{
pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
message: '请输入正确的金额',
trigger: 'blur'
},
],
leaseDeposit: [
{
pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
message: '请输入正确的金额',
trigger: 'blur'
},
],
merchantId: [
{
required: true,
message: '请选择商户',
trigger: 'change'
},
],
contactsPhone: [
{
pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
message: '请输入正确的联系方式',
trigger: 'blur'
},
],
leaseStatus: [
{
required: true,
message: '请至少选择一个',
trigger: 'change'
},
],
},
equipmentIdcolumnOptions: [{ "label": "设备编码", "value": "code" }, { "label": "设备名称", "value": "name" }, { "label": "设备品牌", "value": "brand" }, { "label": "设备型号", "value": "model" }, { "label": "供应商", "value": "supplier" },],
merchantIdcolumnOptions: [{ "label": "公司名称", "value": "cmp_nm" }, { "label": "公司类型", "value": "comp_type" }, { "label": "成立日期", "value": "incorporation_date" }, { "label": "办公地址", "value": "office_address" },],
leaseStatusOptions: [{ "fullName": "已租", "id": "1" }, { "fullName": "归还", "id": "2" }],
leaseStatusProps: { "label": "fullName", "value": "id" },
returnStatusOptions: [{ "fullName": "正常", "id": "1" }, { "fullName": "异常", "id": "2" }],
returnStatusProps: { "label": "fullName", "value": "id" },
childIndex: -1,
isEdit: false,
interfaceRes: {
leaseNumber: [],
startTime: [],
endTime: [],
equipmentId: [],
totalLeasePrice: [],
leaseDeposit: [],
merchantId: [],
contacts: [],
contactsPhone: [],
leaseStatus: [],
enclosure: [],
equipmentCoding: [],
returnedBy: [],
returnTime: [],
returnStatus: [],
remarks: [],
creationTime: [],
equipmentName: [],
merchantName: [],
},
}
},
computed: {
leaseStatus() {
return this.dataForm.leaseStatus === '2';
},
changeId(){
return this.dataForm.id;
},
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
next() {
this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/EquipmentRentalRecords/' + id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if (this[options]) {
this[options]()
}
this.changeData(key, index)
}
}
}
}
},
changeDataFormData(type, data, model, index, defaultValue) {
if (!this.isEdit) {
if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) {
this.dataForm[data][i][model] = defaultValue
} else if (index == i) {
this.dataForm[data][i][model] = defaultValue
}
}
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
}
} else {
this.prevDis = true
this.nextDis = true
}
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/EquipmentRentalRecords/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
} else {
this.clearData()
this.initDefaultData()
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data = this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/EquipmentRentalRecords',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
} else {
request({
url: '/api/example/EquipmentRentalRecords/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf = this.addTableConf[key]
this.currVmodel = key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
}
}
},
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null;
let timeValue = Number(timeValueData)
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = new Date().getTime()
} else if (timeType == 4) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
}
} else if (timeType == 5) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getLaterData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
}
}
}
return timeDataValue;
},
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
let timeDataValue = null
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue || '00:00:00'
if (timeDataValue.split(':').length == 3) {
timeDataValue = timeDataValue
} else {
timeDataValue = timeDataValue + ':00'
}
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
}
}
return timeDataValue;
},
dataList() {
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex = -1
},
},
}
</script>

@ -0,0 +1,502 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="提交时间">
<JnpfDateRangePicker v-model="query.creationTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商户名称">
<el-input v-model="query.merchantName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="设备编码">
<el-input v-model="query.equipmentCoding" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="设备名称">
<el-input v-model="query.equipmentName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="租赁状态">
<JnpfSelect v-model="query.leaseStatus" placeholder="请选择" clearable
:options="leaseStatusOptions" :props="leaseStatusProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
</el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">
</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>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod">
<el-table-column prop="leaseNumber" label="租赁单号" align="left">
</el-table-column>
<el-table-column prop="equipmentCoding" label="设备编码" align="left">
</el-table-column>
<el-table-column prop="equipmentName" label="设备名称" align="left">
</el-table-column>
<el-table-column label="租赁状态" prop="leaseStatus" algin="left">
<template slot-scope="scope">
{{ scope.row.leaseStatus }}
</template>
</el-table-column>
<el-table-column prop="merchantId" label="商户名称" align="left">
</el-table-column>
<el-table-column prop="contacts" label="联系人" align="left">
</el-table-column>
<el-table-column prop="contactsPhone" label="联系电话" align="left">
</el-table-column>
<el-table-column prop="totalLeasePrice" label="租赁总价" align="left">
</el-table-column>
<el-table-column prop="leaseDeposit" label="租赁押金" align="left">
</el-table-column>
<el-table-column prop="startTime" label="开始时间" align="left">
</el-table-column>
<el-table-column prop="endTime" label="结束时间" align="left">
</el-table-column>
<el-table-column prop="returnedBy" label="归还人" align="left">
</el-table-column>
<el-table-column prop="returnTime" label="归还时间" align="left">
</el-table-column>
<el-table-column label="归还状态" prop="returnStatus" algin="left">
<template slot-scope="scope">
{{ scope.row.returnStatus }}
</template>
</el-table-column>
<el-table-column prop="remarks" label="归还说明" align="left">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" v-show="scope.row.leaseStatus === '已租'" @click="addOrUpdateHandle(scope.row)">
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form'
import Detail from './Detail'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
components: {
JNPFForm,
Detail,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
showAll: false,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
creationTime: undefined,
merchantName: undefined,
equipmentCoding: undefined,
equipmentName: undefined,
leaseStatus: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
leaseStatusOptions: [{ "fullName": "已租", "id": "1" }, { "fullName": "归还", "id": "2" }],
leaseStatusProps: { "label": "fullName", "value": "id" },
returnStatusOptions: [{ "fullName": "正常", "id": "1" }, { "fullName": "异常", "id": "2" }],
returnStatusProps: { "label": "fullName", "value": "id" },
interfaceRes: {
equipmentId: [],
merchantId: [],
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
}
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list))
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
}
})
},
getExportList(list) {
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j])
}
} else {
exportList.push(list[i])
}
}
this.exportList = exportList
},
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '583211716402217477',
type: 1,
};
request({
url: `/api/example/EquipmentRentalRecords/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/EquipmentRentalRecords/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "example/EquipmentRentalRecords")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
})
},
superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson
this.listQuery.currentPage = 1
this.initData()
},
addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/example/EquipmentRentalRecords/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
}
}
</script>

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