提交“回收站、钱包管理”模块生成代码文件

dev-jingling
jingling 9 months ago
parent ff69e199d2
commit 878bcebb04

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.EnterpriseRecycleStationMapper">
<mapper namespace="jnpf.mapper.EnterpriseAccountBillMapper">

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.RecycleStationPriceHistoryMapper">
<mapper namespace="jnpf.mapper.EnterpriserecyclestationMapper">

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.EecycleStationHousingEstateMapper">
<mapper namespace="jnpf.mapper.RecyclestationhousingestateMapper">

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.RecycleStationPriceMapper">
<mapper namespace="jnpf.mapper.RecyclestationpriceMapper">

@ -1,16 +1,16 @@
package jnpf.mapper;
import jnpf.entity.EnterpriseRecycleStationEntity;
import jnpf.entity.EnterpriseAccountBillEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* EnterpriseRecycleStation
* EnterpriseAccountBill
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
public interface EnterpriseRecycleStationMapper extends BaseMapper<EnterpriseRecycleStationEntity> {
public interface EnterpriseAccountBillMapper extends BaseMapper<EnterpriseAccountBillEntity> {
}

@ -1,16 +1,16 @@
package jnpf.mapper;
import jnpf.entity.RecycleStationPriceHistoryEntity;
import jnpf.entity.EnterpriserecyclestationEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* EnterpriseRecycleStation
* Enterpriserecyclestation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
public interface RecycleStationPriceHistoryMapper extends BaseMapper<RecycleStationPriceHistoryEntity> {
public interface EnterpriserecyclestationMapper extends BaseMapper<EnterpriserecyclestationEntity> {
}

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
public interface RecycleStationStaffMapper extends BaseMapper<RecycleStationStaffEntity> {

@ -1,16 +1,16 @@
package jnpf.mapper;
import jnpf.entity.EecycleStationHousingEstateEntity;
import jnpf.entity.RecyclestationhousingestateEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* EnterpriseRecycleStation
* Enterpriserecyclestation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
public interface EecycleStationHousingEstateMapper extends BaseMapper<EecycleStationHousingEstateEntity> {
public interface RecyclestationhousingestateMapper extends BaseMapper<RecyclestationhousingestateEntity> {
}

@ -1,16 +1,16 @@
package jnpf.mapper;
import jnpf.entity.RecycleStationPriceEntity;
import jnpf.entity.RecyclestationpriceEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* EnterpriseRecycleStation
* Enterpriserecyclestation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
public interface RecycleStationPriceMapper extends BaseMapper<RecycleStationPriceEntity> {
public interface RecyclestationpriceMapper extends BaseMapper<RecyclestationpriceEntity> {
}

@ -0,0 +1,35 @@
package jnpf.service;
import jnpf.model.enterpriseaccountbill.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* EnterpriseAccountBill
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-29
*/
public interface EnterpriseAccountBillService extends IService<EnterpriseAccountBillEntity> {
List<EnterpriseAccountBillEntity> getList(EnterpriseAccountBillPagination enterpriseAccountBillPagination);
List<EnterpriseAccountBillEntity> getTypeList(EnterpriseAccountBillPagination enterpriseAccountBillPagination,String dataType);
EnterpriseAccountBillEntity getInfo(String id);
void delete(EnterpriseAccountBillEntity entity);
void create(EnterpriseAccountBillEntity entity);
boolean update(String id, EnterpriseAccountBillEntity entity);
//子表方法
//副表数据方法
String checkForm(EnterpriseAccountBillForm form,int i);
void saveOrUpdate(EnterpriseAccountBillForm enterpriseAccountBillForm,String id, boolean isSave) throws Exception;
}

@ -1,43 +0,0 @@
package jnpf.service;
import jnpf.model.enterpriserecyclestation.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* EnterpriseRecycleStation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
*/
public interface EnterpriseRecycleStationService extends IService<EnterpriseRecycleStationEntity> {
List<EnterpriseRecycleStationEntity> getList(EnterpriseRecycleStationPagination enterpriseRecycleStationPagination);
List<EnterpriseRecycleStationEntity> getTypeList(EnterpriseRecycleStationPagination enterpriseRecycleStationPagination,String dataType);
EnterpriseRecycleStationEntity getInfo(String id);
void delete(EnterpriseRecycleStationEntity entity);
void create(EnterpriseRecycleStationEntity entity);
boolean update(String id, EnterpriseRecycleStationEntity entity);
//子表方法
List<RecycleStationPriceEntity> getRecycleStationPriceList(String id,EnterpriseRecycleStationPagination enterpriseRecycleStationPagination);
List<RecycleStationPriceEntity> getRecycleStationPriceList(String id);
List<EecycleStationHousingEstateEntity> getEecycleStationHousingEstateList(String id,EnterpriseRecycleStationPagination enterpriseRecycleStationPagination);
List<EecycleStationHousingEstateEntity> getEecycleStationHousingEstateList(String id);
//副表数据方法
String checkForm(EnterpriseRecycleStationForm form,int i);
void saveOrUpdate(EnterpriseRecycleStationForm enterpriseRecycleStationForm,String id, boolean isSave) throws Exception;
}

@ -0,0 +1,43 @@
package jnpf.service;
import jnpf.model.enterpriserecyclestation.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* Enterpriserecyclestation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-29
*/
public interface EnterpriserecyclestationService extends IService<EnterpriserecyclestationEntity> {
List<EnterpriserecyclestationEntity> getList(EnterpriserecyclestationPagination enterpriserecyclestationPagination);
List<EnterpriserecyclestationEntity> getTypeList(EnterpriserecyclestationPagination enterpriserecyclestationPagination,String dataType);
EnterpriserecyclestationEntity getInfo(String id);
void delete(EnterpriserecyclestationEntity entity);
void create(EnterpriserecyclestationEntity entity);
boolean update(String id, EnterpriserecyclestationEntity entity);
//子表方法
List<RecyclestationpriceEntity> getRecyclestationpriceList(String id,EnterpriserecyclestationPagination enterpriserecyclestationPagination);
List<RecyclestationpriceEntity> getRecyclestationpriceList(String id);
List<RecyclestationhousingestateEntity> getRecyclestationhousingestateList(String id,EnterpriserecyclestationPagination enterpriserecyclestationPagination);
List<RecyclestationhousingestateEntity> getRecyclestationhousingestateList(String id);
//副表数据方法
String checkForm(EnterpriserecyclestationForm form,int i);
void saveOrUpdate(EnterpriserecyclestationForm enterpriserecyclestationForm,String id, boolean isSave) throws Exception;
}

@ -1,18 +0,0 @@
package jnpf.service;
import jnpf.model.enterpriserecyclestation.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* EnterpriseRecycleStation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
*/
public interface RecycleStationPriceHistoryService extends IService<RecycleStationPriceHistoryEntity> {
QueryWrapper<RecycleStationPriceHistoryEntity> getChild(EnterpriseRecycleStationPagination pagination,QueryWrapper<RecycleStationPriceHistoryEntity> recycleStationPriceHistoryQueryWrapper);
}

@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
public interface RecycleStationStaffService extends IService<RecycleStationStaffEntity> {
List<RecycleStationStaffEntity> getList(RecycleStationStaffPagination recycleStationStaffPagination);

@ -7,12 +7,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* EnterpriseRecycleStation
* Enterpriserecyclestation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
public interface EecycleStationHousingEstateService extends IService<EecycleStationHousingEstateEntity> {
QueryWrapper<EecycleStationHousingEstateEntity> getChild(EnterpriseRecycleStationPagination pagination,QueryWrapper<EecycleStationHousingEstateEntity> eecycleStationHousingEstateQueryWrapper);
public interface RecyclestationhousingestateService extends IService<RecyclestationhousingestateEntity> {
QueryWrapper<RecyclestationhousingestateEntity> getChild(EnterpriserecyclestationPagination pagination,QueryWrapper<RecyclestationhousingestateEntity> recyclestationhousingestateQueryWrapper);
}

@ -7,12 +7,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* EnterpriseRecycleStation
* Enterpriserecyclestation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
public interface RecycleStationPriceService extends IService<RecycleStationPriceEntity> {
QueryWrapper<RecycleStationPriceEntity> getChild(EnterpriseRecycleStationPagination pagination,QueryWrapper<RecycleStationPriceEntity> recycleStationPriceQueryWrapper);
public interface RecyclestationpriceService extends IService<RecyclestationpriceEntity> {
QueryWrapper<RecyclestationpriceEntity> getChild(EnterpriserecyclestationPagination pagination,QueryWrapper<RecyclestationpriceEntity> recyclestationpriceQueryWrapper);
}

@ -0,0 +1,345 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.EnterpriseAccountBillMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.enterpriseaccountbill.*;
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 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;
/**
*
* EnterpriseAccountBill
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-29
*/
@Service
public class EnterpriseAccountBillServiceImpl extends ServiceImpl<EnterpriseAccountBillMapper, EnterpriseAccountBillEntity> implements EnterpriseAccountBillService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Override
public List<EnterpriseAccountBillEntity> getList(EnterpriseAccountBillPagination enterpriseAccountBillPagination){
return getTypeList(enterpriseAccountBillPagination,enterpriseAccountBillPagination.getDataType());
}
/** 列表查询 */
@Override
public List<EnterpriseAccountBillEntity> getTypeList(EnterpriseAccountBillPagination enterpriseAccountBillPagination,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 ? EnterpriseAccountBillConstant.getAppColumnData() : EnterpriseAccountBillConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int enterpriseAccountBillNum =0;
QueryWrapper<EnterpriseAccountBillEntity> enterpriseAccountBillQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(enterpriseAccountBillPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = enterpriseAccountBillPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<EnterpriseAccountBillEntity> enterpriseAccountBillSuperWrapper = new QueryWrapper<>();
enterpriseAccountBillSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriseAccountBillSuperWrapper,EnterpriseAccountBillEntity.class,queryJson,"0"));
int enterpriseAccountBillNum1 = enterpriseAccountBillSuperWrapper.getExpression().getNormal().size();
if (enterpriseAccountBillNum1>0){
List<String> enterpriseAccountBillList =this.list(enterpriseAccountBillSuperWrapper).stream().map(EnterpriseAccountBillEntity::getId).collect(Collectors.toList());
allSuperList.addAll(enterpriseAccountBillList);
intersectionSuperList.add(enterpriseAccountBillList);
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<EnterpriseAccountBillEntity> enterpriseAccountBillSuperWrapper = new QueryWrapper<>();
enterpriseAccountBillSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriseAccountBillSuperWrapper,EnterpriseAccountBillEntity.class,ruleJson,"0"));
int enterpriseAccountBillNum1 = enterpriseAccountBillSuperWrapper.getExpression().getNormal().size();
if (enterpriseAccountBillNum1>0){
List<String> enterpriseAccountBillList =this.list(enterpriseAccountBillSuperWrapper).stream().map(EnterpriseAccountBillEntity::getId).collect(Collectors.toList());
allRuleList.addAll(enterpriseAccountBillList);
intersectionRuleList.add(enterpriseAccountBillList);
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 enterpriseAccountBillObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriseAccountBillQueryWrapper,EnterpriseAccountBillEntity.class,enterpriseAccountBillPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(enterpriseAccountBillObj)){
return new ArrayList<>();
} else {
enterpriseAccountBillQueryWrapper = (QueryWrapper<EnterpriseAccountBillEntity>)enterpriseAccountBillObj;
if( enterpriseAccountBillQueryWrapper.getExpression().getNormal().size()>0){
enterpriseAccountBillNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object enterpriseAccountBillObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriseAccountBillQueryWrapper,EnterpriseAccountBillEntity.class,enterpriseAccountBillPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(enterpriseAccountBillObj)){
return new ArrayList<>();
} else {
enterpriseAccountBillQueryWrapper = (QueryWrapper<EnterpriseAccountBillEntity>)enterpriseAccountBillObj;
if( enterpriseAccountBillQueryWrapper.getExpression().getNormal().size()>0){
enterpriseAccountBillNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(enterpriseAccountBillPagination.getBillNumber())){
enterpriseAccountBillNum++;
String value = enterpriseAccountBillPagination.getBillNumber() instanceof List ?
JsonUtil.getObjectToString(enterpriseAccountBillPagination.getBillNumber()) :
String.valueOf(enterpriseAccountBillPagination.getBillNumber());
enterpriseAccountBillQueryWrapper.lambda().like(EnterpriseAccountBillEntity::getBillNumber,value);
}
if(ObjectUtil.isNotEmpty(enterpriseAccountBillPagination.getOrderNumber())){
enterpriseAccountBillNum++;
String value = enterpriseAccountBillPagination.getOrderNumber() instanceof List ?
JsonUtil.getObjectToString(enterpriseAccountBillPagination.getOrderNumber()) :
String.valueOf(enterpriseAccountBillPagination.getOrderNumber());
enterpriseAccountBillQueryWrapper.lambda().like(EnterpriseAccountBillEntity::getOrderNumber,value);
}
if(ObjectUtil.isNotEmpty(enterpriseAccountBillPagination.getOrderTypeId())){
enterpriseAccountBillNum++;
List<String> idList = new ArrayList<>();
try {
String[][] orderTypeId = JsonUtil.getJsonToBean(enterpriseAccountBillPagination.getOrderTypeId(),String[][].class);
for(int i=0;i<orderTypeId.length;i++){
if(orderTypeId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(orderTypeId[i])));
}
}
}catch (Exception e1){
try {
List<String> orderTypeId = JsonUtil.getJsonToList(enterpriseAccountBillPagination.getOrderTypeId(),String.class);
if(orderTypeId.size()>0){
idList.addAll(orderTypeId);
}
}catch (Exception e2){
idList.add(String.valueOf(enterpriseAccountBillPagination.getOrderTypeId()));
}
}
enterpriseAccountBillQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(EnterpriseAccountBillEntity::getOrderTypeId, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(enterpriseAccountBillPagination.getBillStatusId())){
enterpriseAccountBillNum++;
List<String> idList = new ArrayList<>();
try {
String[][] billStatusId = JsonUtil.getJsonToBean(enterpriseAccountBillPagination.getBillStatusId(),String[][].class);
for(int i=0;i<billStatusId.length;i++){
if(billStatusId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(billStatusId[i])));
}
}
}catch (Exception e1){
try {
List<String> billStatusId = JsonUtil.getJsonToList(enterpriseAccountBillPagination.getBillStatusId(),String.class);
if(billStatusId.size()>0){
idList.addAll(billStatusId);
}
}catch (Exception e2){
idList.add(String.valueOf(enterpriseAccountBillPagination.getBillStatusId()));
}
}
enterpriseAccountBillQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(EnterpriseAccountBillEntity::getBillStatusId, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(enterpriseAccountBillPagination.getRemark())){
enterpriseAccountBillNum++;
String value = enterpriseAccountBillPagination.getRemark() instanceof List ?
JsonUtil.getObjectToString(enterpriseAccountBillPagination.getRemark()) :
String.valueOf(enterpriseAccountBillPagination.getRemark());
enterpriseAccountBillQueryWrapper.lambda().like(EnterpriseAccountBillEntity::getRemark,value);
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
enterpriseAccountBillQueryWrapper.lambda().in(EnterpriseAccountBillEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
enterpriseAccountBillQueryWrapper.lambda().and(t->t.in(EnterpriseAccountBillEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
enterpriseAccountBillQueryWrapper.lambda().and(t->t.in(EnterpriseAccountBillEntity::getId, finalAllRuleIDlist));
}
//排序
if(StringUtil.isEmpty(enterpriseAccountBillPagination.getSidx())){
enterpriseAccountBillQueryWrapper.lambda().orderByDesc(EnterpriseAccountBillEntity::getId);
}else{
try {
String sidx = enterpriseAccountBillPagination.getSidx();
String[] strs= sidx.split("_name");
EnterpriseAccountBillEntity enterpriseAccountBillEntity = new EnterpriseAccountBillEntity();
Field declaredField = enterpriseAccountBillEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
enterpriseAccountBillQueryWrapper="asc".equals(enterpriseAccountBillPagination.getSort().toLowerCase())?enterpriseAccountBillQueryWrapper.orderByAsc(value):enterpriseAccountBillQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<EnterpriseAccountBillEntity> page=new Page<>(enterpriseAccountBillPagination.getCurrentPage(), enterpriseAccountBillPagination.getPageSize());
IPage<EnterpriseAccountBillEntity> userIPage=this.page(page, enterpriseAccountBillQueryWrapper);
return enterpriseAccountBillPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<EnterpriseAccountBillEntity> list = new ArrayList();
return enterpriseAccountBillPagination.setData(list, list.size());
}
}else{
return this.list(enterpriseAccountBillQueryWrapper);
}
}
@Override
public EnterpriseAccountBillEntity getInfo(String id){
QueryWrapper<EnterpriseAccountBillEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(EnterpriseAccountBillEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(EnterpriseAccountBillEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, EnterpriseAccountBillEntity entity){
return this.updateById(entity);
}
@Override
public void delete(EnterpriseAccountBillEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(EnterpriseAccountBillForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";
if (isUp){
id = form.getId();
}
//主表字段验证
return countRecover;
}
/**
* ()
* @param id
* @param enterpriseAccountBillForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(EnterpriseAccountBillForm enterpriseAccountBillForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
enterpriseAccountBillForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(EnterpriseAccountBillConstant.getFormData(),enterpriseAccountBillForm),EnterpriseAccountBillForm.class);
EnterpriseAccountBillEntity entity = JsonUtil.getJsonToBean(enterpriseAccountBillForm, EnterpriseAccountBillEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setId(mainId);
}else{
}
this.saveOrUpdate(entity);
}
}

@ -1,687 +0,0 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.EnterpriseRecycleStationMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.enterpriserecyclestation.*;
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 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;
/**
*
* EnterpriseRecycleStation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
*/
@Service
public class EnterpriseRecycleStationServiceImpl extends ServiceImpl<EnterpriseRecycleStationMapper, EnterpriseRecycleStationEntity> implements EnterpriseRecycleStationService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private RecycleStationPriceService recycleStationPriceService;
@Autowired
private EecycleStationHousingEstateService eecycleStationHousingEstateService;
@Autowired
private RecycleStationPriceHistoryService recycleStationPriceHistoryService;
@Override
public List<EnterpriseRecycleStationEntity> getList(EnterpriseRecycleStationPagination enterpriseRecycleStationPagination){
return getTypeList(enterpriseRecycleStationPagination,enterpriseRecycleStationPagination.getDataType());
}
/** 列表查询 */
@Override
public List<EnterpriseRecycleStationEntity> getTypeList(EnterpriseRecycleStationPagination enterpriseRecycleStationPagination,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 ? EnterpriseRecycleStationConstant.getAppColumnData() : EnterpriseRecycleStationConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int enterpriseRecycleStationNum =0;
QueryWrapper<EnterpriseRecycleStationEntity> enterpriseRecycleStationQueryWrapper=new QueryWrapper<>();
int eecycleStationHousingEstateNum =0;
QueryWrapper<EecycleStationHousingEstateEntity> eecycleStationHousingEstateQueryWrapper=new QueryWrapper<>();
int recycleStationPriceNum =0;
QueryWrapper<RecycleStationPriceEntity> recycleStationPriceQueryWrapper=new QueryWrapper<>();
int recycleStationPriceHistoryNum =0;
QueryWrapper<RecycleStationPriceHistoryEntity> recycleStationPriceHistoryQueryWrapper=new QueryWrapper<>();
long eecycleStationHousingEstatecount = eecycleStationHousingEstateService.count();
long recycleStationPricecount = recycleStationPriceService.count();
long recycleStationPriceHistorycount = recycleStationPriceHistoryService.count();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(enterpriseRecycleStationPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = enterpriseRecycleStationPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<EnterpriseRecycleStationEntity> enterpriseRecycleStationSuperWrapper = new QueryWrapper<>();
enterpriseRecycleStationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriseRecycleStationSuperWrapper,EnterpriseRecycleStationEntity.class,queryJson,"0"));
int enterpriseRecycleStationNum1 = enterpriseRecycleStationSuperWrapper.getExpression().getNormal().size();
if (enterpriseRecycleStationNum1>0){
List<String> enterpriseRecycleStationList =this.list(enterpriseRecycleStationSuperWrapper).stream().map(EnterpriseRecycleStationEntity::getId).collect(Collectors.toList());
allSuperList.addAll(enterpriseRecycleStationList);
intersectionSuperList.add(enterpriseRecycleStationList);
superNum++;
}
String EecycleStationHousingEstateTable = "nx_recycle_station_housing_estate";
boolean EecycleStationHousingEstateHasSql = queryJson.contains(EecycleStationHousingEstateTable);
List<String> eecycleStationHousingEstateList = generaterSwapUtil.selectIdsByChildCondition(EnterpriseRecycleStationConstant.getTableList(), EecycleStationHousingEstateTable , queryJson, null);
if (EecycleStationHousingEstateHasSql){
allSuperList.addAll(eecycleStationHousingEstateList);
intersectionSuperList.add(eecycleStationHousingEstateList);
superNum++;
}
String RecycleStationPriceTable = "nx_recycle_station_price";
boolean RecycleStationPriceHasSql = queryJson.contains(RecycleStationPriceTable);
List<String> recycleStationPriceList = generaterSwapUtil.selectIdsByChildCondition(EnterpriseRecycleStationConstant.getTableList(), RecycleStationPriceTable , queryJson, null);
if (RecycleStationPriceHasSql){
allSuperList.addAll(recycleStationPriceList);
intersectionSuperList.add(recycleStationPriceList);
superNum++;
}
String RecycleStationPriceHistoryTable = "nx_recycle_station_price_history";
boolean RecycleStationPriceHistoryHasSql = queryJson.contains(RecycleStationPriceHistoryTable);
List<String> recycleStationPriceHistoryList = generaterSwapUtil.selectIdsByChildCondition(EnterpriseRecycleStationConstant.getTableList(), RecycleStationPriceHistoryTable , queryJson, null);
if (RecycleStationPriceHistoryHasSql){
allSuperList.addAll(recycleStationPriceHistoryList);
intersectionSuperList.add(recycleStationPriceHistoryList);
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<EnterpriseRecycleStationEntity> enterpriseRecycleStationSuperWrapper = new QueryWrapper<>();
enterpriseRecycleStationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriseRecycleStationSuperWrapper,EnterpriseRecycleStationEntity.class,ruleJson,"0"));
int enterpriseRecycleStationNum1 = enterpriseRecycleStationSuperWrapper.getExpression().getNormal().size();
if (enterpriseRecycleStationNum1>0){
List<String> enterpriseRecycleStationList =this.list(enterpriseRecycleStationSuperWrapper).stream().map(EnterpriseRecycleStationEntity::getId).collect(Collectors.toList());
allRuleList.addAll(enterpriseRecycleStationList);
intersectionRuleList.add(enterpriseRecycleStationList);
ruleNum++;
}
String EecycleStationHousingEstateTable = "nx_recycle_station_housing_estate";
boolean EecycleStationHousingEstateHasSql = ruleJson.contains(EecycleStationHousingEstateTable);
List<String> eecycleStationHousingEstateList = generaterSwapUtil.selectIdsByChildCondition(EnterpriseRecycleStationConstant.getTableList(), EecycleStationHousingEstateTable , ruleJson, null);
if (EecycleStationHousingEstateHasSql){
allRuleList.addAll(eecycleStationHousingEstateList);
intersectionRuleList.add(eecycleStationHousingEstateList);
ruleNum++;
}
String RecycleStationPriceTable = "nx_recycle_station_price";
boolean RecycleStationPriceHasSql = ruleJson.contains(RecycleStationPriceTable);
List<String> recycleStationPriceList = generaterSwapUtil.selectIdsByChildCondition(EnterpriseRecycleStationConstant.getTableList(), RecycleStationPriceTable , ruleJson, null);
if (RecycleStationPriceHasSql){
allRuleList.addAll(recycleStationPriceList);
intersectionRuleList.add(recycleStationPriceList);
ruleNum++;
}
String RecycleStationPriceHistoryTable = "nx_recycle_station_price_history";
boolean RecycleStationPriceHistoryHasSql = ruleJson.contains(RecycleStationPriceHistoryTable);
List<String> recycleStationPriceHistoryList = generaterSwapUtil.selectIdsByChildCondition(EnterpriseRecycleStationConstant.getTableList(), RecycleStationPriceHistoryTable , ruleJson, null);
if (RecycleStationPriceHistoryHasSql){
allRuleList.addAll(recycleStationPriceHistoryList);
intersectionRuleList.add(recycleStationPriceHistoryList);
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 enterpriseRecycleStationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriseRecycleStationQueryWrapper,EnterpriseRecycleStationEntity.class,enterpriseRecycleStationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(enterpriseRecycleStationObj)){
return new ArrayList<>();
} else {
enterpriseRecycleStationQueryWrapper = (QueryWrapper<EnterpriseRecycleStationEntity>)enterpriseRecycleStationObj;
if( enterpriseRecycleStationQueryWrapper.getExpression().getNormal().size()>0){
enterpriseRecycleStationNum++;
}
}
Object eecycleStationHousingEstateObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(eecycleStationHousingEstateQueryWrapper,EecycleStationHousingEstateEntity.class,enterpriseRecycleStationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(eecycleStationHousingEstateObj)){
return new ArrayList<>();
} else {
eecycleStationHousingEstateQueryWrapper = (QueryWrapper<EecycleStationHousingEstateEntity>)eecycleStationHousingEstateObj;
if( eecycleStationHousingEstateQueryWrapper.getExpression().getNormal().size()>0){
eecycleStationHousingEstateNum++;
}
}
Object recycleStationPriceObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleStationPriceQueryWrapper,RecycleStationPriceEntity.class,enterpriseRecycleStationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recycleStationPriceObj)){
return new ArrayList<>();
} else {
recycleStationPriceQueryWrapper = (QueryWrapper<RecycleStationPriceEntity>)recycleStationPriceObj;
if( recycleStationPriceQueryWrapper.getExpression().getNormal().size()>0){
recycleStationPriceNum++;
}
}
Object recycleStationPriceHistoryObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleStationPriceHistoryQueryWrapper,RecycleStationPriceHistoryEntity.class,enterpriseRecycleStationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recycleStationPriceHistoryObj)){
return new ArrayList<>();
} else {
recycleStationPriceHistoryQueryWrapper = (QueryWrapper<RecycleStationPriceHistoryEntity>)recycleStationPriceHistoryObj;
if( recycleStationPriceHistoryQueryWrapper.getExpression().getNormal().size()>0){
recycleStationPriceHistoryNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object enterpriseRecycleStationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriseRecycleStationQueryWrapper,EnterpriseRecycleStationEntity.class,enterpriseRecycleStationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(enterpriseRecycleStationObj)){
return new ArrayList<>();
} else {
enterpriseRecycleStationQueryWrapper = (QueryWrapper<EnterpriseRecycleStationEntity>)enterpriseRecycleStationObj;
if( enterpriseRecycleStationQueryWrapper.getExpression().getNormal().size()>0){
enterpriseRecycleStationNum++;
}
}
Object eecycleStationHousingEstateObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(eecycleStationHousingEstateQueryWrapper,EecycleStationHousingEstateEntity.class,enterpriseRecycleStationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(eecycleStationHousingEstateObj)){
return new ArrayList<>();
} else {
eecycleStationHousingEstateQueryWrapper = (QueryWrapper<EecycleStationHousingEstateEntity>)eecycleStationHousingEstateObj;
if( eecycleStationHousingEstateQueryWrapper.getExpression().getNormal().size()>0){
eecycleStationHousingEstateNum++;
}
}
Object recycleStationPriceObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleStationPriceQueryWrapper,RecycleStationPriceEntity.class,enterpriseRecycleStationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recycleStationPriceObj)){
return new ArrayList<>();
} else {
recycleStationPriceQueryWrapper = (QueryWrapper<RecycleStationPriceEntity>)recycleStationPriceObj;
if( recycleStationPriceQueryWrapper.getExpression().getNormal().size()>0){
recycleStationPriceNum++;
}
}
Object recycleStationPriceHistoryObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleStationPriceHistoryQueryWrapper,RecycleStationPriceHistoryEntity.class,enterpriseRecycleStationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recycleStationPriceHistoryObj)){
return new ArrayList<>();
} else {
recycleStationPriceHistoryQueryWrapper = (QueryWrapper<RecycleStationPriceHistoryEntity>)recycleStationPriceHistoryObj;
if( recycleStationPriceHistoryQueryWrapper.getExpression().getNormal().size()>0){
recycleStationPriceHistoryNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(enterpriseRecycleStationPagination.getTableField135_recycleTypeName())){
recycleStationPriceNum++;
List<String> idList = new ArrayList<>();
try {
String[][] recycleTypeName = JsonUtil.getJsonToBean(enterpriseRecycleStationPagination.getTableField135_recycleTypeName(),String[][].class);
for(int i=0;i<recycleTypeName.length;i++){
if(recycleTypeName[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleTypeName[i])));
}
}
}catch (Exception e1){
try {
List<String> recycleTypeName = JsonUtil.getJsonToList(enterpriseRecycleStationPagination.getTableField135_recycleTypeName(),String.class);
if(recycleTypeName.size()>0){
idList.addAll(recycleTypeName);
}
}catch (Exception e2){
idList.add(String.valueOf(enterpriseRecycleStationPagination.getTableField135_recycleTypeName()));
}
}
recycleStationPriceQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(RecycleStationPriceEntity::getRecycleTypeName, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(enterpriseRecycleStationPagination.getTableField119_housingEstateName())){
eecycleStationHousingEstateNum++;
String value = enterpriseRecycleStationPagination.getTableField119_housingEstateName() instanceof List ?
JsonUtil.getObjectToString(enterpriseRecycleStationPagination.getTableField119_housingEstateName()) :
String.valueOf(enterpriseRecycleStationPagination.getTableField119_housingEstateName());
eecycleStationHousingEstateQueryWrapper.lambda().like(EecycleStationHousingEstateEntity::getHousingEstateName,value);
}
if(ObjectUtil.isNotEmpty(enterpriseRecycleStationPagination.getStationCode())){
enterpriseRecycleStationNum++;
String value = enterpriseRecycleStationPagination.getStationCode() instanceof List ?
JsonUtil.getObjectToString(enterpriseRecycleStationPagination.getStationCode()) :
String.valueOf(enterpriseRecycleStationPagination.getStationCode());
enterpriseRecycleStationQueryWrapper.lambda().like(EnterpriseRecycleStationEntity::getStationCode,value);
}
if(ObjectUtil.isNotEmpty(enterpriseRecycleStationPagination.getStationName())){
enterpriseRecycleStationNum++;
String value = enterpriseRecycleStationPagination.getStationName() instanceof List ?
JsonUtil.getObjectToString(enterpriseRecycleStationPagination.getStationName()) :
String.valueOf(enterpriseRecycleStationPagination.getStationName());
enterpriseRecycleStationQueryWrapper.lambda().like(EnterpriseRecycleStationEntity::getStationName,value);
}
if(ObjectUtil.isNotEmpty(enterpriseRecycleStationPagination.getManagementModel())){
enterpriseRecycleStationNum++;
List<String> idList = new ArrayList<>();
try {
String[][] managementModel = JsonUtil.getJsonToBean(enterpriseRecycleStationPagination.getManagementModel(),String[][].class);
for(int i=0;i<managementModel.length;i++){
if(managementModel[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(managementModel[i])));
}
}
}catch (Exception e1){
try {
List<String> managementModel = JsonUtil.getJsonToList(enterpriseRecycleStationPagination.getManagementModel(),String.class);
if(managementModel.size()>0){
idList.addAll(managementModel);
}
}catch (Exception e2){
idList.add(String.valueOf(enterpriseRecycleStationPagination.getManagementModel()));
}
}
enterpriseRecycleStationQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(EnterpriseRecycleStationEntity::getManagementModel, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(enterpriseRecycleStationPagination.getCity())){
enterpriseRecycleStationNum++;
List<String> idList = new ArrayList<>();
try {
String[][] city = JsonUtil.getJsonToBean(enterpriseRecycleStationPagination.getCity(),String[][].class);
for(int i=0;i<city.length;i++){
if(city[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(city[i])));
}
}
}catch (Exception e1){
try {
List<String> city = JsonUtil.getJsonToList(enterpriseRecycleStationPagination.getCity(),String.class);
if(city.size()>0){
idList.add(JsonUtil.getObjectToString(city));
}
}catch (Exception e2){
idList.add(String.valueOf(enterpriseRecycleStationPagination.getCity()));
}
}
enterpriseRecycleStationQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(EnterpriseRecycleStationEntity::getCity, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(enterpriseRecycleStationPagination.getRecycleTypeIds())){
enterpriseRecycleStationNum++;
List<String> idList = new ArrayList<>();
try {
String[][] recycleTypeIds = JsonUtil.getJsonToBean(enterpriseRecycleStationPagination.getRecycleTypeIds(),String[][].class);
for(int i=0;i<recycleTypeIds.length;i++){
if(recycleTypeIds[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleTypeIds[i])));
}
}
}catch (Exception e1){
try {
List<String> recycleTypeIds = JsonUtil.getJsonToList(enterpriseRecycleStationPagination.getRecycleTypeIds(),String.class);
if(recycleTypeIds.size()>0){
idList.addAll(recycleTypeIds);
}
}catch (Exception e2){
idList.add(String.valueOf(enterpriseRecycleStationPagination.getRecycleTypeIds()));
}
}
enterpriseRecycleStationQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(EnterpriseRecycleStationEntity::getRecycleTypeIds, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(enterpriseRecycleStationPagination.getFirstContactPerson())){
enterpriseRecycleStationNum++;
String value = enterpriseRecycleStationPagination.getFirstContactPerson() instanceof List ?
JsonUtil.getObjectToString(enterpriseRecycleStationPagination.getFirstContactPerson()) :
String.valueOf(enterpriseRecycleStationPagination.getFirstContactPerson());
enterpriseRecycleStationQueryWrapper.lambda().like(EnterpriseRecycleStationEntity::getFirstContactPerson,value);
}
if(ObjectUtil.isNotEmpty(enterpriseRecycleStationPagination.getShortName())){
enterpriseRecycleStationNum++;
String value = enterpriseRecycleStationPagination.getShortName() instanceof List ?
JsonUtil.getObjectToString(enterpriseRecycleStationPagination.getShortName()) :
String.valueOf(enterpriseRecycleStationPagination.getShortName());
enterpriseRecycleStationQueryWrapper.lambda().like(EnterpriseRecycleStationEntity::getShortName,value);
}
}
if(eecycleStationHousingEstateNum>0){
List<String> eecycleStationHousingEstateIdList = eecycleStationHousingEstateService.list(eecycleStationHousingEstateQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getStationId())).map(t->t.getStationId()).collect(Collectors.toList());
long count = eecycleStationHousingEstateService.count();
if (count>0){
intersectionList.add(eecycleStationHousingEstateIdList);
}
AllIdList.addAll(eecycleStationHousingEstateIdList);
}
total+=eecycleStationHousingEstateNum;
if(recycleStationPriceNum>0){
List<String> recycleStationPriceIdList = recycleStationPriceService.list(recycleStationPriceQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getStationId())).map(t->t.getStationId()).collect(Collectors.toList());
long count = recycleStationPriceService.count();
if (count>0){
intersectionList.add(recycleStationPriceIdList);
}
AllIdList.addAll(recycleStationPriceIdList);
}
total+=recycleStationPriceNum;
if(recycleStationPriceHistoryNum>0){
List<String> recycleStationPriceHistoryIdList = recycleStationPriceHistoryService.list(recycleStationPriceHistoryQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getStationId())).map(t->t.getStationId()).collect(Collectors.toList());
long count = recycleStationPriceHistoryService.count();
if (count>0){
intersectionList.add(recycleStationPriceHistoryIdList);
}
AllIdList.addAll(recycleStationPriceHistoryIdList);
}
total+=recycleStationPriceHistoryNum;
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
enterpriseRecycleStationQueryWrapper.lambda().in(EnterpriseRecycleStationEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
enterpriseRecycleStationQueryWrapper.lambda().and(t->t.in(EnterpriseRecycleStationEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
enterpriseRecycleStationQueryWrapper.lambda().and(t->t.in(EnterpriseRecycleStationEntity::getId, finalAllRuleIDlist));
}
//排序
if(StringUtil.isEmpty(enterpriseRecycleStationPagination.getSidx())){
enterpriseRecycleStationQueryWrapper.lambda().orderByDesc(EnterpriseRecycleStationEntity::getId);
}else{
try {
String sidx = enterpriseRecycleStationPagination.getSidx();
String[] strs= sidx.split("_name");
EnterpriseRecycleStationEntity enterpriseRecycleStationEntity = new EnterpriseRecycleStationEntity();
Field declaredField = enterpriseRecycleStationEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
enterpriseRecycleStationQueryWrapper="asc".equals(enterpriseRecycleStationPagination.getSort().toLowerCase())?enterpriseRecycleStationQueryWrapper.orderByAsc(value):enterpriseRecycleStationQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<EnterpriseRecycleStationEntity> page=new Page<>(enterpriseRecycleStationPagination.getCurrentPage(), enterpriseRecycleStationPagination.getPageSize());
IPage<EnterpriseRecycleStationEntity> userIPage=this.page(page, enterpriseRecycleStationQueryWrapper);
return enterpriseRecycleStationPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<EnterpriseRecycleStationEntity> list = new ArrayList();
return enterpriseRecycleStationPagination.setData(list, list.size());
}
}else{
return this.list(enterpriseRecycleStationQueryWrapper);
}
}
@Override
public EnterpriseRecycleStationEntity getInfo(String id){
QueryWrapper<EnterpriseRecycleStationEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(EnterpriseRecycleStationEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(EnterpriseRecycleStationEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, EnterpriseRecycleStationEntity entity){
return this.updateById(entity);
}
@Override
public void delete(EnterpriseRecycleStationEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/** RecycleStationPrice子表方法 */
@Override
public List<RecycleStationPriceEntity> getRecycleStationPriceList(String id,EnterpriseRecycleStationPagination enterpriseRecycleStationPagination){
Map<String, Object> newtabMap=EnterpriseRecycleStationConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="recycleStationPrice";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<RecycleStationPriceEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = recycleStationPriceService.getChild(enterpriseRecycleStationPagination,queryWrapper);
queryWrapper.lambda().eq(RecycleStationPriceEntity::getStationId, id);
generaterSwapUtil.wrapperHandle(EnterpriseRecycleStationConstant.getColumnData(), EnterpriseRecycleStationConstant.getAppColumnData(), queryWrapper,RecycleStationPriceEntity.class,"sub",tableName);
return recycleStationPriceService.list(queryWrapper);
}
/** RecycleStationPrice子表方法 */
@Override
public List<RecycleStationPriceEntity> getRecycleStationPriceList(String id){
QueryWrapper<RecycleStationPriceEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(RecycleStationPriceEntity::getStationId, id);
return recycleStationPriceService.list(queryWrapper);
}
/** EecycleStationHousingEstate子表方法 */
@Override
public List<EecycleStationHousingEstateEntity> getEecycleStationHousingEstateList(String id,EnterpriseRecycleStationPagination enterpriseRecycleStationPagination){
Map<String, Object> newtabMap=EnterpriseRecycleStationConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="eecycleStationHousingEstate";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<EecycleStationHousingEstateEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = eecycleStationHousingEstateService.getChild(enterpriseRecycleStationPagination,queryWrapper);
queryWrapper.lambda().eq(EecycleStationHousingEstateEntity::getStationId, id);
generaterSwapUtil.wrapperHandle(EnterpriseRecycleStationConstant.getColumnData(), EnterpriseRecycleStationConstant.getAppColumnData(), queryWrapper,EecycleStationHousingEstateEntity.class,"sub",tableName);
return eecycleStationHousingEstateService.list(queryWrapper);
}
/** EecycleStationHousingEstate子表方法 */
@Override
public List<EecycleStationHousingEstateEntity> getEecycleStationHousingEstateList(String id){
QueryWrapper<EecycleStationHousingEstateEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(EecycleStationHousingEstateEntity::getStationId, id);
return eecycleStationHousingEstateService.list(queryWrapper);
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(EnterpriseRecycleStationForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";
if (isUp){
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getStationCode())){
return "回收站编号不能为空";
}
if(StringUtil.isEmpty(form.getStationName())){
return "回收站名称不能为空";
}
if(StringUtil.isEmpty(form.getFirstContactPerson())){
return "首联系人不能为空";
}
if(StringUtil.isEmpty(form.getFirstContactPersonTel())){
return "手机号码不能为空";
}
if(StringUtil.isEmpty(form.getAddress())){
return "详细地址不能为空";
}
if(StringUtil.isEmpty(form.getRecycleTel())){
return "回收电话不能为空";
}
if(StringUtil.isNotEmpty(form.getRecycleTel())){
if(!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getRecycleTel())).matches()){
return "请输入正确的联系方式";
}
}
//子表字段验证
if (form.getRecycleStationPriceList()!=null){
}
if (form.getEecycleStationHousingEstateList()!=null){
for(EecycleStationHousingEstateModel t : form.getEecycleStationHousingEstateList()){
if(StringUtil.isNotEmpty(t.getHousingEstateName())){
t.setHousingEstateName(t.getHousingEstateName().trim());
}
else{
return "范围内小区-小区名称不能为空";
}
}
}
return countRecover;
}
/**
* ()
* @param id
* @param enterpriseRecycleStationForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(EnterpriseRecycleStationForm enterpriseRecycleStationForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
enterpriseRecycleStationForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(EnterpriseRecycleStationConstant.getFormData(),enterpriseRecycleStationForm),EnterpriseRecycleStationForm.class);
EnterpriseRecycleStationEntity entity = JsonUtil.getJsonToBean(enterpriseRecycleStationForm, EnterpriseRecycleStationEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setId(mainId);
}else{
}
this.saveOrUpdate(entity);
//RecycleStationPrice子表数据新增修改
if(!isSave){
QueryWrapper<RecycleStationPriceEntity> RecycleStationPricequeryWrapper = new QueryWrapper<>();
RecycleStationPricequeryWrapper.lambda().eq(RecycleStationPriceEntity::getStationId, entity.getId());
recycleStationPriceService.remove(RecycleStationPricequeryWrapper);
}
if (enterpriseRecycleStationForm.getRecycleStationPriceList()!=null){
List<RecycleStationPriceEntity> tableField135 = JsonUtil.getJsonToList(enterpriseRecycleStationForm.getRecycleStationPriceList(),RecycleStationPriceEntity.class);
for(RecycleStationPriceEntity entitys : tableField135){
entitys.setId(RandomUtil.uuId());
entitys.setStationId(entity.getId());
if(isSave){
}else{
}
recycleStationPriceService.saveOrUpdate(entitys);
}
}
//EecycleStationHousingEstate子表数据新增修改
if(!isSave){
QueryWrapper<EecycleStationHousingEstateEntity> EecycleStationHousingEstatequeryWrapper = new QueryWrapper<>();
EecycleStationHousingEstatequeryWrapper.lambda().eq(EecycleStationHousingEstateEntity::getStationId, entity.getId());
eecycleStationHousingEstateService.remove(EecycleStationHousingEstatequeryWrapper);
}
if (enterpriseRecycleStationForm.getEecycleStationHousingEstateList()!=null){
List<EecycleStationHousingEstateEntity> tableField119 = JsonUtil.getJsonToList(enterpriseRecycleStationForm.getEecycleStationHousingEstateList(),EecycleStationHousingEstateEntity.class);
for(EecycleStationHousingEstateEntity entitys : tableField119){
entitys.setId(RandomUtil.uuId());
entitys.setStationId(entity.getId());
if(isSave){
}else{
}
eecycleStationHousingEstateService.saveOrUpdate(entitys);
}
}
}
}

@ -0,0 +1,627 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.EnterpriserecyclestationMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.enterpriserecyclestation.*;
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 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;
/**
*
* Enterpriserecyclestation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-29
*/
@Service
public class EnterpriserecyclestationServiceImpl extends ServiceImpl<EnterpriserecyclestationMapper, EnterpriserecyclestationEntity> implements EnterpriserecyclestationService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private RecyclestationpriceService recyclestationpriceService;
@Autowired
private RecyclestationhousingestateService recyclestationhousingestateService;
@Override
public List<EnterpriserecyclestationEntity> getList(EnterpriserecyclestationPagination enterpriserecyclestationPagination){
return getTypeList(enterpriserecyclestationPagination,enterpriserecyclestationPagination.getDataType());
}
/** 列表查询 */
@Override
public List<EnterpriserecyclestationEntity> getTypeList(EnterpriserecyclestationPagination enterpriserecyclestationPagination,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 ? EnterpriserecyclestationConstant.getAppColumnData() : EnterpriserecyclestationConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int enterpriserecyclestationNum =0;
QueryWrapper<EnterpriserecyclestationEntity> enterpriserecyclestationQueryWrapper=new QueryWrapper<>();
int recyclestationhousingestateNum =0;
QueryWrapper<RecyclestationhousingestateEntity> recyclestationhousingestateQueryWrapper=new QueryWrapper<>();
int recyclestationpriceNum =0;
QueryWrapper<RecyclestationpriceEntity> recyclestationpriceQueryWrapper=new QueryWrapper<>();
long recyclestationhousingestatecount = recyclestationhousingestateService.count();
long recyclestationpricecount = recyclestationpriceService.count();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = enterpriserecyclestationPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<EnterpriserecyclestationEntity> enterpriserecyclestationSuperWrapper = new QueryWrapper<>();
enterpriserecyclestationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriserecyclestationSuperWrapper,EnterpriserecyclestationEntity.class,queryJson,"0"));
int enterpriserecyclestationNum1 = enterpriserecyclestationSuperWrapper.getExpression().getNormal().size();
if (enterpriserecyclestationNum1>0){
List<String> enterpriserecyclestationList =this.list(enterpriserecyclestationSuperWrapper).stream().map(EnterpriserecyclestationEntity::getId).collect(Collectors.toList());
allSuperList.addAll(enterpriserecyclestationList);
intersectionSuperList.add(enterpriserecyclestationList);
superNum++;
}
String RecyclestationhousingestateTable = "nx_recycle_station_housing_estate";
boolean RecyclestationhousingestateHasSql = queryJson.contains(RecyclestationhousingestateTable);
List<String> recyclestationhousingestateList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationhousingestateTable , queryJson, null);
if (RecyclestationhousingestateHasSql){
allSuperList.addAll(recyclestationhousingestateList);
intersectionSuperList.add(recyclestationhousingestateList);
superNum++;
}
String RecyclestationpriceTable = "nx_recycle_station_price";
boolean RecyclestationpriceHasSql = queryJson.contains(RecyclestationpriceTable);
List<String> recyclestationpriceList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationpriceTable , queryJson, null);
if (RecyclestationpriceHasSql){
allSuperList.addAll(recyclestationpriceList);
intersectionSuperList.add(recyclestationpriceList);
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<EnterpriserecyclestationEntity> enterpriserecyclestationSuperWrapper = new QueryWrapper<>();
enterpriserecyclestationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriserecyclestationSuperWrapper,EnterpriserecyclestationEntity.class,ruleJson,"0"));
int enterpriserecyclestationNum1 = enterpriserecyclestationSuperWrapper.getExpression().getNormal().size();
if (enterpriserecyclestationNum1>0){
List<String> enterpriserecyclestationList =this.list(enterpriserecyclestationSuperWrapper).stream().map(EnterpriserecyclestationEntity::getId).collect(Collectors.toList());
allRuleList.addAll(enterpriserecyclestationList);
intersectionRuleList.add(enterpriserecyclestationList);
ruleNum++;
}
String RecyclestationhousingestateTable = "nx_recycle_station_housing_estate";
boolean RecyclestationhousingestateHasSql = ruleJson.contains(RecyclestationhousingestateTable);
List<String> recyclestationhousingestateList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationhousingestateTable , ruleJson, null);
if (RecyclestationhousingestateHasSql){
allRuleList.addAll(recyclestationhousingestateList);
intersectionRuleList.add(recyclestationhousingestateList);
ruleNum++;
}
String RecyclestationpriceTable = "nx_recycle_station_price";
boolean RecyclestationpriceHasSql = ruleJson.contains(RecyclestationpriceTable);
List<String> recyclestationpriceList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationpriceTable , ruleJson, null);
if (RecyclestationpriceHasSql){
allRuleList.addAll(recyclestationpriceList);
intersectionRuleList.add(recyclestationpriceList);
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 enterpriserecyclestationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriserecyclestationQueryWrapper,EnterpriserecyclestationEntity.class,enterpriserecyclestationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(enterpriserecyclestationObj)){
return new ArrayList<>();
} else {
enterpriserecyclestationQueryWrapper = (QueryWrapper<EnterpriserecyclestationEntity>)enterpriserecyclestationObj;
if( enterpriserecyclestationQueryWrapper.getExpression().getNormal().size()>0){
enterpriserecyclestationNum++;
}
}
Object recyclestationhousingestateObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationhousingestateQueryWrapper,RecyclestationhousingestateEntity.class,enterpriserecyclestationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recyclestationhousingestateObj)){
return new ArrayList<>();
} else {
recyclestationhousingestateQueryWrapper = (QueryWrapper<RecyclestationhousingestateEntity>)recyclestationhousingestateObj;
if( recyclestationhousingestateQueryWrapper.getExpression().getNormal().size()>0){
recyclestationhousingestateNum++;
}
}
Object recyclestationpriceObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationpriceQueryWrapper,RecyclestationpriceEntity.class,enterpriserecyclestationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recyclestationpriceObj)){
return new ArrayList<>();
} else {
recyclestationpriceQueryWrapper = (QueryWrapper<RecyclestationpriceEntity>)recyclestationpriceObj;
if( recyclestationpriceQueryWrapper.getExpression().getNormal().size()>0){
recyclestationpriceNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object enterpriserecyclestationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriserecyclestationQueryWrapper,EnterpriserecyclestationEntity.class,enterpriserecyclestationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(enterpriserecyclestationObj)){
return new ArrayList<>();
} else {
enterpriserecyclestationQueryWrapper = (QueryWrapper<EnterpriserecyclestationEntity>)enterpriserecyclestationObj;
if( enterpriserecyclestationQueryWrapper.getExpression().getNormal().size()>0){
enterpriserecyclestationNum++;
}
}
Object recyclestationhousingestateObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationhousingestateQueryWrapper,RecyclestationhousingestateEntity.class,enterpriserecyclestationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recyclestationhousingestateObj)){
return new ArrayList<>();
} else {
recyclestationhousingestateQueryWrapper = (QueryWrapper<RecyclestationhousingestateEntity>)recyclestationhousingestateObj;
if( recyclestationhousingestateQueryWrapper.getExpression().getNormal().size()>0){
recyclestationhousingestateNum++;
}
}
Object recyclestationpriceObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationpriceQueryWrapper,RecyclestationpriceEntity.class,enterpriserecyclestationPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recyclestationpriceObj)){
return new ArrayList<>();
} else {
recyclestationpriceQueryWrapper = (QueryWrapper<RecyclestationpriceEntity>)recyclestationpriceObj;
if( recyclestationpriceQueryWrapper.getExpression().getNormal().size()>0){
recyclestationpriceNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getTableField135_recycleTypeName())){
recyclestationpriceNum++;
List<String> idList = new ArrayList<>();
try {
String[][] recycleTypeName = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getTableField135_recycleTypeName(),String[][].class);
for(int i=0;i<recycleTypeName.length;i++){
if(recycleTypeName[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleTypeName[i])));
}
}
}catch (Exception e1){
try {
List<String> recycleTypeName = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getTableField135_recycleTypeName(),String.class);
if(recycleTypeName.size()>0){
idList.addAll(recycleTypeName);
}
}catch (Exception e2){
idList.add(String.valueOf(enterpriserecyclestationPagination.getTableField135_recycleTypeName()));
}
}
recyclestationpriceQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(RecyclestationpriceEntity::getRecycleTypeName, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getTableField119_housingEstateName())){
recyclestationhousingestateNum++;
String value = enterpriserecyclestationPagination.getTableField119_housingEstateName() instanceof List ?
JsonUtil.getObjectToString(enterpriserecyclestationPagination.getTableField119_housingEstateName()) :
String.valueOf(enterpriserecyclestationPagination.getTableField119_housingEstateName());
recyclestationhousingestateQueryWrapper.lambda().like(RecyclestationhousingestateEntity::getHousingEstateName,value);
}
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getStationCode())){
enterpriserecyclestationNum++;
String value = enterpriserecyclestationPagination.getStationCode() instanceof List ?
JsonUtil.getObjectToString(enterpriserecyclestationPagination.getStationCode()) :
String.valueOf(enterpriserecyclestationPagination.getStationCode());
enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getStationCode,value);
}
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getStationName())){
enterpriserecyclestationNum++;
String value = enterpriserecyclestationPagination.getStationName() instanceof List ?
JsonUtil.getObjectToString(enterpriserecyclestationPagination.getStationName()) :
String.valueOf(enterpriserecyclestationPagination.getStationName());
enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getStationName,value);
}
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getManagementModel())){
enterpriserecyclestationNum++;
List<String> idList = new ArrayList<>();
try {
String[][] managementModel = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getManagementModel(),String[][].class);
for(int i=0;i<managementModel.length;i++){
if(managementModel[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(managementModel[i])));
}
}
}catch (Exception e1){
try {
List<String> managementModel = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getManagementModel(),String.class);
if(managementModel.size()>0){
idList.addAll(managementModel);
}
}catch (Exception e2){
idList.add(String.valueOf(enterpriserecyclestationPagination.getManagementModel()));
}
}
enterpriserecyclestationQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(EnterpriserecyclestationEntity::getManagementModel, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getCity())){
enterpriserecyclestationNum++;
List<String> idList = new ArrayList<>();
try {
String[][] city = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getCity(),String[][].class);
for(int i=0;i<city.length;i++){
if(city[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(city[i])));
}
}
}catch (Exception e1){
try {
List<String> city = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getCity(),String.class);
if(city.size()>0){
idList.add(JsonUtil.getObjectToString(city));
}
}catch (Exception e2){
idList.add(String.valueOf(enterpriserecyclestationPagination.getCity()));
}
}
enterpriserecyclestationQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(EnterpriserecyclestationEntity::getCity, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getRecycleTypeIds())){
enterpriserecyclestationNum++;
List<String> idList = new ArrayList<>();
try {
String[][] recycleTypeIds = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getRecycleTypeIds(),String[][].class);
for(int i=0;i<recycleTypeIds.length;i++){
if(recycleTypeIds[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleTypeIds[i])));
}
}
}catch (Exception e1){
try {
List<String> recycleTypeIds = JsonUtil.getJsonToList(enterpriserecyclestationPagination.getRecycleTypeIds(),String.class);
if(recycleTypeIds.size()>0){
idList.addAll(recycleTypeIds);
}
}catch (Exception e2){
idList.add(String.valueOf(enterpriserecyclestationPagination.getRecycleTypeIds()));
}
}
enterpriserecyclestationQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(EnterpriserecyclestationEntity::getRecycleTypeIds, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getFirstContactPerson())){
enterpriserecyclestationNum++;
String value = enterpriserecyclestationPagination.getFirstContactPerson() instanceof List ?
JsonUtil.getObjectToString(enterpriserecyclestationPagination.getFirstContactPerson()) :
String.valueOf(enterpriserecyclestationPagination.getFirstContactPerson());
enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getFirstContactPerson,value);
}
if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getShortName())){
enterpriserecyclestationNum++;
String value = enterpriserecyclestationPagination.getShortName() instanceof List ?
JsonUtil.getObjectToString(enterpriserecyclestationPagination.getShortName()) :
String.valueOf(enterpriserecyclestationPagination.getShortName());
enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getShortName,value);
}
}
if(recyclestationhousingestateNum>0){
List<String> recyclestationhousingestateIdList = recyclestationhousingestateService.list(recyclestationhousingestateQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getStationId())).map(t->t.getStationId()).collect(Collectors.toList());
long count = recyclestationhousingestateService.count();
if (count>0){
intersectionList.add(recyclestationhousingestateIdList);
}
AllIdList.addAll(recyclestationhousingestateIdList);
}
total+=recyclestationhousingestateNum;
if(recyclestationpriceNum>0){
List<String> recyclestationpriceIdList = recyclestationpriceService.list(recyclestationpriceQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getStationId())).map(t->t.getStationId()).collect(Collectors.toList());
long count = recyclestationpriceService.count();
if (count>0){
intersectionList.add(recyclestationpriceIdList);
}
AllIdList.addAll(recyclestationpriceIdList);
}
total+=recyclestationpriceNum;
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
enterpriserecyclestationQueryWrapper.lambda().in(EnterpriserecyclestationEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
enterpriserecyclestationQueryWrapper.lambda().and(t->t.in(EnterpriserecyclestationEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
enterpriserecyclestationQueryWrapper.lambda().and(t->t.in(EnterpriserecyclestationEntity::getId, finalAllRuleIDlist));
}
//排序
if(StringUtil.isEmpty(enterpriserecyclestationPagination.getSidx())){
enterpriserecyclestationQueryWrapper.lambda().orderByDesc(EnterpriserecyclestationEntity::getId);
}else{
try {
String sidx = enterpriserecyclestationPagination.getSidx();
String[] strs= sidx.split("_name");
EnterpriserecyclestationEntity enterpriserecyclestationEntity = new EnterpriserecyclestationEntity();
Field declaredField = enterpriserecyclestationEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
enterpriserecyclestationQueryWrapper="asc".equals(enterpriserecyclestationPagination.getSort().toLowerCase())?enterpriserecyclestationQueryWrapper.orderByAsc(value):enterpriserecyclestationQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<EnterpriserecyclestationEntity> page=new Page<>(enterpriserecyclestationPagination.getCurrentPage(), enterpriserecyclestationPagination.getPageSize());
IPage<EnterpriserecyclestationEntity> userIPage=this.page(page, enterpriserecyclestationQueryWrapper);
return enterpriserecyclestationPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<EnterpriserecyclestationEntity> list = new ArrayList();
return enterpriserecyclestationPagination.setData(list, list.size());
}
}else{
return this.list(enterpriserecyclestationQueryWrapper);
}
}
@Override
public EnterpriserecyclestationEntity getInfo(String id){
QueryWrapper<EnterpriserecyclestationEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(EnterpriserecyclestationEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(EnterpriserecyclestationEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, EnterpriserecyclestationEntity entity){
return this.updateById(entity);
}
@Override
public void delete(EnterpriserecyclestationEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/** Recyclestationprice子表方法 */
@Override
public List<RecyclestationpriceEntity> getRecyclestationpriceList(String id,EnterpriserecyclestationPagination enterpriserecyclestationPagination){
Map<String, Object> newtabMap=EnterpriserecyclestationConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="recyclestationprice";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<RecyclestationpriceEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = recyclestationpriceService.getChild(enterpriserecyclestationPagination,queryWrapper);
queryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, id);
generaterSwapUtil.wrapperHandle(EnterpriserecyclestationConstant.getColumnData(), EnterpriserecyclestationConstant.getAppColumnData(), queryWrapper,RecyclestationpriceEntity.class,"sub",tableName);
return recyclestationpriceService.list(queryWrapper);
}
/** Recyclestationprice子表方法 */
@Override
public List<RecyclestationpriceEntity> getRecyclestationpriceList(String id){
QueryWrapper<RecyclestationpriceEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, id);
return recyclestationpriceService.list(queryWrapper);
}
/** Recyclestationhousingestate子表方法 */
@Override
public List<RecyclestationhousingestateEntity> getRecyclestationhousingestateList(String id,EnterpriserecyclestationPagination enterpriserecyclestationPagination){
Map<String, Object> newtabMap=EnterpriserecyclestationConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="recyclestationhousingestate";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<RecyclestationhousingestateEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = recyclestationhousingestateService.getChild(enterpriserecyclestationPagination,queryWrapper);
queryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, id);
generaterSwapUtil.wrapperHandle(EnterpriserecyclestationConstant.getColumnData(), EnterpriserecyclestationConstant.getAppColumnData(), queryWrapper,RecyclestationhousingestateEntity.class,"sub",tableName);
return recyclestationhousingestateService.list(queryWrapper);
}
/** Recyclestationhousingestate子表方法 */
@Override
public List<RecyclestationhousingestateEntity> getRecyclestationhousingestateList(String id){
QueryWrapper<RecyclestationhousingestateEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, id);
return recyclestationhousingestateService.list(queryWrapper);
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(EnterpriserecyclestationForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";
if (isUp){
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getStationCode())){
return "回收站编号不能为空";
}
if(StringUtil.isEmpty(form.getStationName())){
return "回收站名称不能为空";
}
if(StringUtil.isEmpty(form.getFirstContactPerson())){
return "首联系人不能为空";
}
if(StringUtil.isEmpty(form.getFirstContactPersonTel())){
return "手机号码不能为空";
}
if(StringUtil.isEmpty(form.getAddress())){
return "详细地址不能为空";
}
if(StringUtil.isEmpty(form.getRecycleTel())){
return "回收电话不能为空";
}
if(StringUtil.isNotEmpty(form.getRecycleTel())){
if(!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getRecycleTel())).matches()){
return "请输入正确的联系方式";
}
}
//子表字段验证
if (form.getRecyclestationpriceList()!=null){
}
if (form.getRecyclestationhousingestateList()!=null){
}
return countRecover;
}
/**
* ()
* @param id
* @param enterpriserecyclestationForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(EnterpriserecyclestationForm enterpriserecyclestationForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
enterpriserecyclestationForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(EnterpriserecyclestationConstant.getFormData(),enterpriserecyclestationForm),EnterpriserecyclestationForm.class);
EnterpriserecyclestationEntity entity = JsonUtil.getJsonToBean(enterpriserecyclestationForm, EnterpriserecyclestationEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setId(mainId);
}else{
}
this.saveOrUpdate(entity);
//Recyclestationprice子表数据新增修改
if(!isSave){
QueryWrapper<RecyclestationpriceEntity> RecyclestationpricequeryWrapper = new QueryWrapper<>();
RecyclestationpricequeryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, entity.getId());
recyclestationpriceService.remove(RecyclestationpricequeryWrapper);
}
if (enterpriserecyclestationForm.getRecyclestationpriceList()!=null){
List<RecyclestationpriceEntity> tableField135 = JsonUtil.getJsonToList(enterpriserecyclestationForm.getRecyclestationpriceList(),RecyclestationpriceEntity.class);
for(RecyclestationpriceEntity entitys : tableField135){
entitys.setId(RandomUtil.uuId());
entitys.setStationId(entity.getId());
if(isSave){
}else{
}
recyclestationpriceService.saveOrUpdate(entitys);
}
}
//Recyclestationhousingestate子表数据新增修改
if(!isSave){
QueryWrapper<RecyclestationhousingestateEntity> RecyclestationhousingestatequeryWrapper = new QueryWrapper<>();
RecyclestationhousingestatequeryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, entity.getId());
recyclestationhousingestateService.remove(RecyclestationhousingestatequeryWrapper);
}
if (enterpriserecyclestationForm.getRecyclestationhousingestateList()!=null){
List<RecyclestationhousingestateEntity> tableField119 = JsonUtil.getJsonToList(enterpriserecyclestationForm.getRecyclestationhousingestateList(),RecyclestationhousingestateEntity.class);
for(RecyclestationhousingestateEntity entitys : tableField119){
entitys.setId(RandomUtil.uuId());
entitys.setStationId(entity.getId());
if(isSave){
}else{
}
recyclestationhousingestateService.saveOrUpdate(entitys);
}
}
}
}

@ -1,59 +0,0 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.RecycleStationPriceHistoryMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.enterpriserecyclestation.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import 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;
/**
*
* EnterpriseRecycleStation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
*/
@Service
public class RecycleStationPriceHistoryServiceImpl extends ServiceImpl<RecycleStationPriceHistoryMapper, RecycleStationPriceHistoryEntity> implements RecycleStationPriceHistoryService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
//子表过滤方法
@Override
public QueryWrapper<RecycleStationPriceHistoryEntity> getChild(EnterpriseRecycleStationPagination pagination, QueryWrapper<RecycleStationPriceHistoryEntity> recycleStationPriceHistoryQueryWrapper){
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String ruleQueryJson = isPc?EnterpriseRecycleStationConstant.getColumnData():EnterpriseRecycleStationConstant.getAppColumnData();
ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
if(isPc){
}
return recycleStationPriceHistoryQueryWrapper;
}
}

@ -36,7 +36,7 @@ import jnpf.permission.entity.UserEntity;
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
@Service
public class RecycleStationStaffServiceImpl extends ServiceImpl<RecycleStationStaffMapper, RecycleStationStaffEntity> implements RecycleStationStaffService{
@ -179,7 +179,7 @@ public class RecycleStationStaffServiceImpl extends ServiceImpl<RecycleStationSt
String value = recycleStationStaffPagination.getStafname() instanceof List ?
JsonUtil.getObjectToString(recycleStationStaffPagination.getStafname()) :
String.valueOf(recycleStationStaffPagination.getStafname());
recycleStationStaffQueryWrapper.lambda().like(RecycleStationStaffEntity::getStafname,value);
recycleStationStaffQueryWrapper.lambda().like(RecycleStationStaffEntity::getStaffsName,value);
}
@ -278,7 +278,7 @@ public class RecycleStationStaffServiceImpl extends ServiceImpl<RecycleStationSt
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getStafname())){
if(StringUtil.isEmpty(form.getStaffsName())){
return "回收员姓名不能为空";
}
if(StringUtil.isEmpty(form.getMobilePhone())){

@ -1,7 +1,7 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.EecycleStationHousingEstateMapper;
import jnpf.mapper.RecyclestationhousingestateMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.enterpriserecyclestation.*;
@ -29,14 +29,14 @@ import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* EnterpriseRecycleStation
* Enterpriserecyclestation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
@Service
public class EecycleStationHousingEstateServiceImpl extends ServiceImpl<EecycleStationHousingEstateMapper, EecycleStationHousingEstateEntity> implements EecycleStationHousingEstateService{
public class RecyclestationhousingestateServiceImpl extends ServiceImpl<RecyclestationhousingestateMapper, RecyclestationhousingestateEntity> implements RecyclestationhousingestateService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@ -45,15 +45,15 @@ public class EecycleStationHousingEstateServiceImpl extends ServiceImpl<EecycleS
//子表过滤方法
@Override
public QueryWrapper<EecycleStationHousingEstateEntity> getChild(EnterpriseRecycleStationPagination pagination, QueryWrapper<EecycleStationHousingEstateEntity> eecycleStationHousingEstateQueryWrapper){
public QueryWrapper<RecyclestationhousingestateEntity> getChild(EnterpriserecyclestationPagination pagination, QueryWrapper<RecyclestationhousingestateEntity> recyclestationhousingestateQueryWrapper){
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String ruleQueryJson = isPc?EnterpriseRecycleStationConstant.getColumnData():EnterpriseRecycleStationConstant.getAppColumnData();
String ruleQueryJson = isPc?EnterpriserecyclestationConstant.getColumnData():EnterpriserecyclestationConstant.getAppColumnData();
ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
if(isPc){
}
return eecycleStationHousingEstateQueryWrapper;
return recyclestationhousingestateQueryWrapper;
}
}

@ -1,7 +1,7 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.RecycleStationPriceMapper;
import jnpf.mapper.RecyclestationpriceMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.enterpriserecyclestation.*;
@ -29,14 +29,14 @@ import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* EnterpriseRecycleStation
* Enterpriserecyclestation
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
@Service
public class RecycleStationPriceServiceImpl extends ServiceImpl<RecycleStationPriceMapper, RecycleStationPriceEntity> implements RecycleStationPriceService{
public class RecyclestationpriceServiceImpl extends ServiceImpl<RecyclestationpriceMapper, RecyclestationpriceEntity> implements RecyclestationpriceService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@ -45,15 +45,15 @@ public class RecycleStationPriceServiceImpl extends ServiceImpl<RecycleStationPr
//子表过滤方法
@Override
public QueryWrapper<RecycleStationPriceEntity> getChild(EnterpriseRecycleStationPagination pagination, QueryWrapper<RecycleStationPriceEntity> recycleStationPriceQueryWrapper){
public QueryWrapper<RecyclestationpriceEntity> getChild(EnterpriserecyclestationPagination pagination, QueryWrapper<RecyclestationpriceEntity> recyclestationpriceQueryWrapper){
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String ruleQueryJson = isPc?EnterpriseRecycleStationConstant.getColumnData():EnterpriseRecycleStationConstant.getAppColumnData();
String ruleQueryJson = isPc?EnterpriserecyclestationConstant.getColumnData():EnterpriserecyclestationConstant.getAppColumnData();
ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
if(isPc){
}
return recycleStationPriceQueryWrapper;
return recyclestationpriceQueryWrapper;
}
}

@ -0,0 +1,190 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.enterpriseaccountbill.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
/**
* EnterpriseAccountBill
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-29
*/
@Slf4j
@RestController
@Tag(name = "EnterpriseAccountBill" , description = "scm")
@RequestMapping("/api/scm/EnterpriseAccountBill")
public class EnterpriseAccountBillController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private EnterpriseAccountBillService enterpriseAccountBillService;
/**
*
*
* @param enterpriseAccountBillPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody EnterpriseAccountBillPagination enterpriseAccountBillPagination)throws IOException{
List<EnterpriseAccountBillEntity> list= enterpriseAccountBillService.getList(enterpriseAccountBillPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (EnterpriseAccountBillEntity entity : list) {
Map<String, Object> enterpriseAccountBillMap=JsonUtil.entityToMap(entity);
enterpriseAccountBillMap.put("id", enterpriseAccountBillMap.get("id"));
//副表数据
//子表数据
realList.add(enterpriseAccountBillMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, EnterpriseAccountBillConstant.getFormData(), EnterpriseAccountBillConstant.getColumnData(), enterpriseAccountBillPagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(enterpriseAccountBillPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param enterpriseAccountBillForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid EnterpriseAccountBillForm enterpriseAccountBillForm) {
String b = enterpriseAccountBillService.checkForm(enterpriseAccountBillForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
try{
enterpriseAccountBillService.saveOrUpdate(enterpriseAccountBillForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
*
* @param id
* @param enterpriseAccountBillForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid EnterpriseAccountBillForm enterpriseAccountBillForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
enterpriseAccountBillForm.setId(id);
if (!isImport) {
String b = enterpriseAccountBillService.checkForm(enterpriseAccountBillForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
}
EnterpriseAccountBillEntity entity= enterpriseAccountBillService.getInfo(id);
if(entity!=null){
try{
enterpriseAccountBillService.saveOrUpdate(enterpriseAccountBillForm,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){
EnterpriseAccountBillEntity entity= enterpriseAccountBillService.getInfo(id);
if(entity!=null){
//主表数据删除
enterpriseAccountBillService.delete(entity);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
EnterpriseAccountBillEntity entity= enterpriseAccountBillService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> enterpriseAccountBillMap=JsonUtil.entityToMap(entity);
enterpriseAccountBillMap.put("id", enterpriseAccountBillMap.get("id"));
//副表数据
//子表数据
enterpriseAccountBillMap = generaterSwapUtil.swapDataDetail(enterpriseAccountBillMap,EnterpriseAccountBillConstant.getFormData(),"521683377103837957",false);
return ActionResult.success(enterpriseAccountBillMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
EnterpriseAccountBillEntity entity= enterpriseAccountBillService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> enterpriseAccountBillMap=JsonUtil.entityToMap(entity);
enterpriseAccountBillMap.put("id", enterpriseAccountBillMap.get("id"));
//副表数据
//子表数据
enterpriseAccountBillMap = generaterSwapUtil.swapDataForm(enterpriseAccountBillMap,EnterpriseAccountBillConstant.getFormData(),EnterpriseAccountBillConstant.TABLEFIELDKEY,EnterpriseAccountBillConstant.TABLERENAMES);
return ActionResult.success(enterpriseAccountBillMap);
}
}

@ -1,214 +0,0 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.enterpriserecyclestation.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
/**
* EnterpriseRecycleStation
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
*/
@Slf4j
@RestController
@Tag(name = "EnterpriseRecycleStation" , description = "scm")
@RequestMapping("/api/scm/EnterpriseRecycleStation")
public class EnterpriseRecycleStationController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private EnterpriseRecycleStationService enterpriseRecycleStationService;
@Autowired
private RecycleStationPriceService recycleStationPriceService;
@Autowired
private EecycleStationHousingEstateService eecycleStationHousingEstateService;
/**
*
*
* @param enterpriseRecycleStationPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody EnterpriseRecycleStationPagination enterpriseRecycleStationPagination)throws IOException{
List<EnterpriseRecycleStationEntity> list= enterpriseRecycleStationService.getList(enterpriseRecycleStationPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (EnterpriseRecycleStationEntity entity : list) {
Map<String, Object> enterpriseRecycleStationMap=JsonUtil.entityToMap(entity);
enterpriseRecycleStationMap.put("id", enterpriseRecycleStationMap.get("id"));
//副表数据
//子表数据
List<RecycleStationPriceEntity> recycleStationPriceList = enterpriseRecycleStationService.getRecycleStationPriceList(entity.getId(),enterpriseRecycleStationPagination);
enterpriseRecycleStationMap.put("tableField135",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recycleStationPriceList)));
List<EecycleStationHousingEstateEntity> eecycleStationHousingEstateList = enterpriseRecycleStationService.getEecycleStationHousingEstateList(entity.getId(),enterpriseRecycleStationPagination);
enterpriseRecycleStationMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(eecycleStationHousingEstateList)));
realList.add(enterpriseRecycleStationMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, EnterpriseRecycleStationConstant.getFormData(), EnterpriseRecycleStationConstant.getColumnData(), enterpriseRecycleStationPagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(enterpriseRecycleStationPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param enterpriseRecycleStationForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid EnterpriseRecycleStationForm enterpriseRecycleStationForm) {
String b = enterpriseRecycleStationService.checkForm(enterpriseRecycleStationForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
try{
enterpriseRecycleStationService.saveOrUpdate(enterpriseRecycleStationForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
*
* @param id
* @param enterpriseRecycleStationForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid EnterpriseRecycleStationForm enterpriseRecycleStationForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
enterpriseRecycleStationForm.setId(id);
if (!isImport) {
String b = enterpriseRecycleStationService.checkForm(enterpriseRecycleStationForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
}
EnterpriseRecycleStationEntity entity= enterpriseRecycleStationService.getInfo(id);
if(entity!=null){
try{
enterpriseRecycleStationService.saveOrUpdate(enterpriseRecycleStationForm,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){
EnterpriseRecycleStationEntity entity= enterpriseRecycleStationService.getInfo(id);
if(entity!=null){
//主表数据删除
enterpriseRecycleStationService.delete(entity);
QueryWrapper<RecycleStationPriceEntity> queryWrapperRecycleStationPrice=new QueryWrapper<>();
queryWrapperRecycleStationPrice.lambda().eq(RecycleStationPriceEntity::getStationId,entity.getId());
//子表数据删除
recycleStationPriceService.remove(queryWrapperRecycleStationPrice);
QueryWrapper<EecycleStationHousingEstateEntity> queryWrapperEecycleStationHousingEstate=new QueryWrapper<>();
queryWrapperEecycleStationHousingEstate.lambda().eq(EecycleStationHousingEstateEntity::getStationId,entity.getId());
//子表数据删除
eecycleStationHousingEstateService.remove(queryWrapperEecycleStationHousingEstate);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
EnterpriseRecycleStationEntity entity= enterpriseRecycleStationService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> enterpriseRecycleStationMap=JsonUtil.entityToMap(entity);
enterpriseRecycleStationMap.put("id", enterpriseRecycleStationMap.get("id"));
//副表数据
//子表数据
List<RecycleStationPriceEntity> recycleStationPriceList = enterpriseRecycleStationService.getRecycleStationPriceList(entity.getId());
enterpriseRecycleStationMap.put("tableField135",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recycleStationPriceList)));
List<EecycleStationHousingEstateEntity> eecycleStationHousingEstateList = enterpriseRecycleStationService.getEecycleStationHousingEstateList(entity.getId());
enterpriseRecycleStationMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(eecycleStationHousingEstateList)));
enterpriseRecycleStationMap = generaterSwapUtil.swapDataDetail(enterpriseRecycleStationMap,EnterpriseRecycleStationConstant.getFormData(),"518043449954403781",false);
return ActionResult.success(enterpriseRecycleStationMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
EnterpriseRecycleStationEntity entity= enterpriseRecycleStationService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> enterpriseRecycleStationMap=JsonUtil.entityToMap(entity);
enterpriseRecycleStationMap.put("id", enterpriseRecycleStationMap.get("id"));
//副表数据
//子表数据
List<RecycleStationPriceEntity> recycleStationPriceList = enterpriseRecycleStationService.getRecycleStationPriceList(entity.getId());
enterpriseRecycleStationMap.put("recycleStationPriceList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recycleStationPriceList)));
List<EecycleStationHousingEstateEntity> eecycleStationHousingEstateList = enterpriseRecycleStationService.getEecycleStationHousingEstateList(entity.getId());
enterpriseRecycleStationMap.put("eecycleStationHousingEstateList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(eecycleStationHousingEstateList)));
enterpriseRecycleStationMap = generaterSwapUtil.swapDataForm(enterpriseRecycleStationMap,EnterpriseRecycleStationConstant.getFormData(),EnterpriseRecycleStationConstant.TABLEFIELDKEY,EnterpriseRecycleStationConstant.TABLERENAMES);
return ActionResult.success(enterpriseRecycleStationMap);
}
}

@ -0,0 +1,214 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.enterpriserecyclestation.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
/**
* Enterpriserecyclestation
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-29
*/
@Slf4j
@RestController
@Tag(name = "Enterpriserecyclestation" , description = "scm")
@RequestMapping("/api/scm/Enterpriserecyclestation")
public class EnterpriserecyclestationController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private EnterpriserecyclestationService enterpriserecyclestationService;
@Autowired
private RecyclestationpriceService recyclestationpriceService;
@Autowired
private RecyclestationhousingestateService recyclestationhousingestateService;
/**
*
*
* @param enterpriserecyclestationPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody EnterpriserecyclestationPagination enterpriserecyclestationPagination)throws IOException{
List<EnterpriserecyclestationEntity> list= enterpriserecyclestationService.getList(enterpriserecyclestationPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (EnterpriserecyclestationEntity entity : list) {
Map<String, Object> enterpriserecyclestationMap=JsonUtil.entityToMap(entity);
enterpriserecyclestationMap.put("id", enterpriserecyclestationMap.get("id"));
//副表数据
//子表数据
List<RecyclestationpriceEntity> recyclestationpriceList = enterpriserecyclestationService.getRecyclestationpriceList(entity.getId(),enterpriserecyclestationPagination);
enterpriserecyclestationMap.put("tableField135",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationpriceList)));
List<RecyclestationhousingestateEntity> recyclestationhousingestateList = enterpriserecyclestationService.getRecyclestationhousingestateList(entity.getId(),enterpriserecyclestationPagination);
enterpriserecyclestationMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationhousingestateList)));
realList.add(enterpriserecyclestationMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, EnterpriserecyclestationConstant.getFormData(), EnterpriserecyclestationConstant.getColumnData(), enterpriserecyclestationPagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(enterpriserecyclestationPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param enterpriserecyclestationForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid EnterpriserecyclestationForm enterpriserecyclestationForm) {
String b = enterpriserecyclestationService.checkForm(enterpriserecyclestationForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
try{
enterpriserecyclestationService.saveOrUpdate(enterpriserecyclestationForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
*
* @param id
* @param enterpriserecyclestationForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid EnterpriserecyclestationForm enterpriserecyclestationForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
enterpriserecyclestationForm.setId(id);
if (!isImport) {
String b = enterpriserecyclestationService.checkForm(enterpriserecyclestationForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
}
EnterpriserecyclestationEntity entity= enterpriserecyclestationService.getInfo(id);
if(entity!=null){
try{
enterpriserecyclestationService.saveOrUpdate(enterpriserecyclestationForm,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){
EnterpriserecyclestationEntity entity= enterpriserecyclestationService.getInfo(id);
if(entity!=null){
//主表数据删除
enterpriserecyclestationService.delete(entity);
QueryWrapper<RecyclestationpriceEntity> queryWrapperRecyclestationprice=new QueryWrapper<>();
queryWrapperRecyclestationprice.lambda().eq(RecyclestationpriceEntity::getStationId,entity.getId());
//子表数据删除
recyclestationpriceService.remove(queryWrapperRecyclestationprice);
QueryWrapper<RecyclestationhousingestateEntity> queryWrapperRecyclestationhousingestate=new QueryWrapper<>();
queryWrapperRecyclestationhousingestate.lambda().eq(RecyclestationhousingestateEntity::getStationId,entity.getId());
//子表数据删除
recyclestationhousingestateService.remove(queryWrapperRecyclestationhousingestate);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
EnterpriserecyclestationEntity entity= enterpriserecyclestationService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> enterpriserecyclestationMap=JsonUtil.entityToMap(entity);
enterpriserecyclestationMap.put("id", enterpriserecyclestationMap.get("id"));
//副表数据
//子表数据
List<RecyclestationpriceEntity> recyclestationpriceList = enterpriserecyclestationService.getRecyclestationpriceList(entity.getId());
enterpriserecyclestationMap.put("tableField135",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationpriceList)));
List<RecyclestationhousingestateEntity> recyclestationhousingestateList = enterpriserecyclestationService.getRecyclestationhousingestateList(entity.getId());
enterpriserecyclestationMap.put("tableField119",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationhousingestateList)));
enterpriserecyclestationMap = generaterSwapUtil.swapDataDetail(enterpriserecyclestationMap,EnterpriserecyclestationConstant.getFormData(),"518043449954403781",false);
return ActionResult.success(enterpriserecyclestationMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
EnterpriserecyclestationEntity entity= enterpriserecyclestationService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> enterpriserecyclestationMap=JsonUtil.entityToMap(entity);
enterpriserecyclestationMap.put("id", enterpriserecyclestationMap.get("id"));
//副表数据
//子表数据
List<RecyclestationpriceEntity> recyclestationpriceList = enterpriserecyclestationService.getRecyclestationpriceList(entity.getId());
enterpriserecyclestationMap.put("recyclestationpriceList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationpriceList)));
List<RecyclestationhousingestateEntity> recyclestationhousingestateList = enterpriserecyclestationService.getRecyclestationhousingestateList(entity.getId());
enterpriserecyclestationMap.put("recyclestationhousingestateList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(recyclestationhousingestateList)));
enterpriserecyclestationMap = generaterSwapUtil.swapDataForm(enterpriserecyclestationMap,EnterpriserecyclestationConstant.getFormData(),EnterpriserecyclestationConstant.TABLEFIELDKEY,EnterpriserecyclestationConstant.TABLERENAMES);
return ActionResult.success(enterpriserecyclestationMap);
}
}

@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-01-29
*/
@Slf4j
@RestController

@ -0,0 +1,46 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-29
*/
@Data
@TableName("nx_enterprise_account_bill")
public class EnterpriseAccountBillEntity {
@TableId(value ="ID" )
private String id;
@TableField("ENTERPRISE_ID")
private String enterpriseId;
@TableField(value = "BILL_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
private String billNumber;
@TableField(value = "ORDER_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
private String orderNumber;
@TableField(value = "ORDER_TYPE_ID" , updateStrategy = FieldStrategy.IGNORED)
private String orderTypeId;
@TableField(value = "BILL_STATUS_ID" , updateStrategy = FieldStrategy.IGNORED)
private String billStatusId;
@TableField(value = "INCOME_AMOUNT" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal incomeAmount;
@TableField(value = "PAYOUT_AMOUNT" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal payoutAmount;
@TableField(value = "ACCOUNT_BALANCE" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal accountBalance;
@TableField("CREATOR_USER_ID")
private String creatorUserId;
@TableField("CREATOR_TIME")
private Date creatorTime;
@TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED)
private String remark;
@TableField("F_FLOW_ID")
private String flowId;
}

@ -9,11 +9,11 @@ import java.util.Date;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-01-29
*/
@Data
@TableName("nx_enterprise_recycle_station")
public class EnterpriseRecycleStationEntity {
public class EnterpriserecyclestationEntity {
@TableId(value ="ID" )
private String id;
@TableField("ENTERPRISE_ID")
@ -49,7 +49,7 @@ public class EnterpriseRecycleStationEntity {
@TableField(value = "STATION_DESCRIPTION" , updateStrategy = FieldStrategy.IGNORED)
private String stationDescription;
@TableField(value = "STATION_STATUS" , updateStrategy = FieldStrategy.IGNORED)
private Boolean stationStatus;
private Integer stationStatus;
@TableField("REMARK")
private String remark;
@TableField(value = "BUSINESS_DAYS" , updateStrategy = FieldStrategy.IGNORED)
@ -57,9 +57,9 @@ public class EnterpriseRecycleStationEntity {
@TableField("BUSINESS_HOURS")
private String businessHours;
@TableField(value = "APPOINTMENT_TIME_START" , updateStrategy = FieldStrategy.IGNORED)
private Date appointmentTimeStart;
private String appointmentTimeStart;
@TableField(value = "APPOINTMENT_TIME_END" , updateStrategy = FieldStrategy.IGNORED)
private Date appointmentTimeEnd;
private String appointmentTimeEnd;
@TableField("PREDICT_ARRIVE_TIME")
private String predictArriveTime;
@TableField(value = "ACCEPT_RANGE" , updateStrategy = FieldStrategy.IGNORED)

@ -1,30 +0,0 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
*/
@Data
@TableName("nx_recycle_station_price_history")
public class RecycleStationPriceHistoryEntity {
@TableId(value ="ID" )
private String id;
@TableField("STATION_ID")
private String stationId;
@TableField("RECYCLE_TYPE_ID")
private String recycleTypeId;
@TableField("UNIT_PRICE")
private BigDecimal unitPrice;
@TableField("CREATOR_TIME")
private Date creatorTime;
@TableField("CREATOR_USER_ID")
private String creatorUserId;
}

@ -10,7 +10,7 @@ import java.math.BigDecimal;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-01-29
*/
@Data
@TableName("nx_recycle_station_staff")
@ -19,8 +19,8 @@ public class RecycleStationStaffEntity {
private String id;
@TableField(value = "STATION_ID" , updateStrategy = FieldStrategy.IGNORED)
private String stationId;
@TableField(value = "STAFF_NAME" , updateStrategy = FieldStrategy.IGNORED)
private String stafname;
@TableField(value = "STAFFS_NAME" , updateStrategy = FieldStrategy.IGNORED)
private String staffsName;
@TableField(value = "MOBILE_PHONE" , updateStrategy = FieldStrategy.IGNORED)
private String mobilePhone;
@TableField(value = "HEAD_ICON" , updateStrategy = FieldStrategy.IGNORED)

@ -9,20 +9,20 @@ import java.util.Date;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-01-29
*/
@Data
@TableName("nx_recycle_station_housing_estate")
public class EecycleStationHousingEstateEntity {
public class RecyclestationhousingestateEntity {
@TableId(value ="ID" )
private String id;
@TableField("STATION_ID")
private String stationId;
@TableField("STATION_NAME")
private String stationName;
@TableField("HOUSING_ESTATE_ID")
@TableField(value = "HOUSING_ESTATE_ID" , updateStrategy = FieldStrategy.IGNORED)
private String housingEstateId;
@TableField(value = "HOUSING_ESTATE_NAME" , updateStrategy = FieldStrategy.IGNORED)
@TableField("HOUSING_ESTATE_NAME")
private String housingEstateName;
@TableField("DISTANCE")
private Double distance;

@ -10,18 +10,18 @@ import java.math.BigDecimal;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-01-29
*/
@Data
@TableName("nx_recycle_station_price")
public class RecycleStationPriceEntity {
public class RecyclestationpriceEntity {
@TableId(value ="ID" )
private String id;
@TableField("STATION_ID")
private String stationId;
@TableField("RECYCLE_TYPE_ID")
@TableField(value = "RECYCLE_TYPE_ID" , updateStrategy = FieldStrategy.IGNORED)
private String recycleTypeId;
@TableField(value = "RECYCLE_TYPE_NAME" , updateStrategy = FieldStrategy.IGNORED)
@TableField("RECYCLE_TYPE_NAME")
private String recycleTypeName;
@TableField(value = "UNIT_PRICE" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal unitPrice;

@ -0,0 +1,44 @@
package jnpf.model.enterpriseaccountbill;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* EnterpriseAccountBill
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-29
*/
@Data
public class EnterpriseAccountBillForm {
/** 主键 */
private String id;
/** 流水编号 **/
@JsonProperty("billNumber")
private String billNumber;
/** 订单编号 **/
@JsonProperty("orderNumber")
private String orderNumber;
/** 订单类型 **/
@JsonProperty("orderTypeId")
private Object orderTypeId;
/** 单据状态 **/
@JsonProperty("billStatusId")
private Object billStatusId;
/** 收入(元) **/
@JsonProperty("incomeAmount")
private String incomeAmount;
/** 支出(元) **/
@JsonProperty("payoutAmount")
private String payoutAmount;
/** 余额(元) **/
@JsonProperty("accountBalance")
private String accountBalance;
/** 备注 **/
@JsonProperty("remark")
private String remark;
}

@ -0,0 +1,45 @@
package jnpf.model.enterpriseaccountbill;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
/**
*
* EnterpriseAccountBill
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-29
*/
@Data
public class EnterpriseAccountBillPagination 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("billNumber")
private Object billNumber;
/** 订单编号 */
@JsonProperty("orderNumber")
private Object orderNumber;
/** 订单类型 */
@JsonProperty("orderTypeId")
private Object orderTypeId;
/** 单据状态 */
@JsonProperty("billStatusId")
private Object billStatusId;
/** 备注 */
@JsonProperty("remark")
private Object remark;
}

@ -6,22 +6,22 @@ import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* EnterpriseRecycleStation
* Enterpriserecyclestation
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-01-29
*/
@Data
public class EnterpriseRecycleStationForm {
public class EnterpriserecyclestationForm {
/** 主键 */
private String id;
/** 子表数据 **/
@JsonProperty("recycleStationPriceList")
private List<RecycleStationPriceModel> recycleStationPriceList;
@JsonProperty("recyclestationpriceList")
private List<RecyclestationpriceModel> recyclestationpriceList;
/** 子表数据 **/
@JsonProperty("eecycleStationHousingEstateList")
private List<EecycleStationHousingEstateModel> eecycleStationHousingEstateList;
@JsonProperty("recyclestationhousingestateList")
private List<RecyclestationhousingestateModel> recyclestationhousingestateList;
/** 回收站编号 **/
@JsonProperty("stationCode")

@ -7,14 +7,14 @@ import java.util.List;
/**
*
* EnterpriseRecycleStation
* Enterpriserecyclestation
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-01-29
*/
@Data
public class EnterpriseRecycleStationPagination extends Pagination {
public class EnterpriserecyclestationPagination extends Pagination {
/** 查询key */
private String[] selectKey;
/** json */

@ -0,0 +1,24 @@
package jnpf.model.enterpriserecyclestation;
import lombok.Data;
import java.util.List;
import java.util.Date;
import java.math.BigDecimal;
import com.alibaba.fastjson.annotation.JSONField;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
*
* Enterpriserecyclestation
* V3.5
* : https://www.jnpfsoft.com
* JNPF
* 2024-01-29
*/
@Data
public class RecyclestationhousingestateModel {
/** 小区id **/
@JSONField(name = "housingEstateId")
private String housingEstateId;
}

@ -10,17 +10,17 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
*
* EnterpriseRecycleStation
* Enterpriserecyclestation
* V3.5
* : https://www.jnpfsoft.com
* JNPF
* 2024-01-27
* 2024-01-29
*/
@Data
public class RecycleStationPriceModel {
/** 回收类目名称 **/
@JSONField(name = "recycleTypeName")
private Object recycleTypeName;
public class RecyclestationpriceModel {
/** 回收类目 **/
@JSONField(name = "recycleTypeId")
private Object recycleTypeId;
/** 单价(kg) **/
@JSONField(name = "unitPrice")

@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-01-29
*/
@Data
public class RecycleStationStaffForm {
@ -24,8 +24,8 @@ public class RecycleStationStaffForm {
@JsonProperty("headIcon")
private Object headIcon;
/** 回收员姓名 **/
@JsonProperty("stafname")
private String stafname;
@JsonProperty("staffsName")
private String staffsName;
/** 回收员手机 **/
@JsonProperty("mobilePhone")
private String mobilePhone;

@ -11,7 +11,7 @@ import java.util.List;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-01-27
* @ 2024-01-29
*/
@Data
public class RecycleStationStaffPagination extends Pagination {

@ -0,0 +1,148 @@
<template>
<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="详情"/>
<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" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="流水编号"
prop="billNumber" >
<p>{{dataForm.billNumber}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="订单编号"
prop="orderNumber" >
<p>{{dataForm.orderNumber}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="订单类型"
prop="orderTypeId" >
<p>{{dataForm.orderTypeId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="单据状态"
prop="billStatusId" >
<p>{{dataForm.billStatusId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="收入(元)"
prop="incomeAmount" >
<p>{{dataForm.incomeAmount}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="支出(元)"
prop="payoutAmount" >
<p>{{dataForm.payoutAmount}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="余额(元)"
prop="accountBalance" >
<p>{{dataForm.accountBalance}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="备注"
prop="remark" >
<p>{{dataForm.remark}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</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 :'',
billNumber : '',
orderNumber : '',
orderTypeId : "",
billStatusId : "",
incomeAmount : '',
payoutAmount : '',
accountBalance : '',
remark : '',
},
orderTypeIdProps:{"label":"fullName","value":"id" },
billStatusIdProps:{"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
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/scm/EnterpriseAccountBill/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,489 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
:content="!dataForm.id ? '新建':'编辑'"/>
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<template v-if="dataForm.id">
<el-dropdown-item @click.native="prev" :disabled='prevDis'>
{{'上一条'}}
</el-dropdown-item>
<el-dropdown-item @click.native="next" :disabled='nextDis'>
{{'下一条'}}
</el-dropdown-item>
</template>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
:loading="continueBtnLoading" :disabled='btnLoading'>
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> </el-button>
<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" :rules="dataRule" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8" >
<jnpf-form-tip-item
label="流水编号" prop="billNumber" >
<JnpfInput v-model="dataForm.billNumber" @change="changeData('billNumber',-1)"
placeholder="请输入" disabled readonly clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="订单编号" prop="orderNumber" >
<JnpfInput v-model="dataForm.orderNumber" @change="changeData('orderNumber',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="订单类型" prop="orderTypeId" >
<JnpfSelect v-model="dataForm.orderTypeId" @change="changeData('orderTypeId',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="orderTypeIdOptions" :props="orderTypeIdProps" >
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="单据状态" prop="billStatusId" >
<JnpfSelect v-model="dataForm.billStatusId" @change="changeData('billStatusId',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="billStatusIdOptions" :props="billStatusIdProps" >
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="收入(元)" prop="incomeAmount" >
<JnpfInput v-model="dataForm.incomeAmount" @change="changeData('incomeAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="支出(元)" prop="payoutAmount" >
<JnpfInput v-model="dataForm.payoutAmount" @change="changeData('payoutAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="余额(元)" prop="accountBalance" >
<JnpfInput v-model="dataForm.accountBalance" @change="changeData('accountBalance',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="备注" prop="remark" >
<JnpfTextarea v-model="dataForm.remark" @change="changeData('remark',-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>
</div>
</transition>
</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: {
billNumber : undefined,
orderNumber : undefined,
orderTypeId : undefined,
billStatusId : undefined,
incomeAmount : undefined,
payoutAmount : undefined,
accountBalance : undefined,
remark : undefined,
},
tableRequiredData: {},
dataRule:
{
},
orderTypeIdOptions:[],
orderTypeIdProps:{"label":"fullName","value":"id" },
billStatusIdOptions:[],
billStatusIdProps:{"label":"fullName","value":"id" },
childIndex:-1,
isEdit:false,
interfaceRes: {
billNumber:[] ,
orderNumber:[] ,
orderTypeId:[] ,
billStatusId:[] ,
incomeAmount:[] ,
payoutAmount:[] ,
accountBalance:[] ,
remark:[] ,
},
}
},
computed: {
...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/scm/EnterpriseAccountBill/'+ 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(){
this.getorderTypeIdOptions();
this.getbillStatusIdOptions();
},
getorderTypeIdOptions() {
getDictionaryDataSelector('520193298627825989').then(res => {
this.orderTypeIdOptions = res.data.list
})
},
getbillStatusIdOptions() {
getDictionaryDataSelector('521683590119955205').then(res => {
this.billStatusIdOptions = res.data.list
})
},
goBack() {
this.$emit('refresh')
},
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/scm/EnterpriseAccountBill/'+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/scm/EnterpriseAccountBill',
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/scm/EnterpriseAccountBill/'+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,528 @@
<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="流水编号">
<el-input v-model="query.billNumber" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单编号">
<el-input v-model="query.orderNumber" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单类型">
<JnpfSelect v-model="query.orderTypeId" placeholder="请选择" clearable
:options="orderTypeIdOptions"
:props="orderTypeIdProps" multiple >
</JnpfSelect>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="单据状态">
<JnpfSelect v-model="query.billStatusId" placeholder="请选择" clearable
:options="billStatusIdOptions"
:props="billStatusIdProps" multiple >
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注">
<el-input v-model="query.remark" placeholder="请输入" clearable> </el-input>
</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>
</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="billNumber"
label="流水编号" align="left"
>
</el-table-column>
<el-table-column
prop="orderNumber"
label="订单编号" align="left"
>
</el-table-column>
<el-table-column
prop="orderTypeId"
label="订单类型" align="left"
>
</el-table-column>
<el-table-column
prop="billStatusId"
label="单据状态" align="left"
>
</el-table-column>
<el-table-column
prop="incomeAmount"
label="收入(元)" align="left"
>
</el-table-column>
<el-table-column
prop="payoutAmount"
label="支出(元)" align="left"
>
</el-table-column>
<el-table-column
prop="accountBalance"
label="余额(元)" align="left"
>
</el-table-column>
<el-table-column
prop="remark"
label="备注" align="left"
>
</el-table-column>
<el-table-column label="操作"
fixed="right" width="150" >
<template slot-scope="scope" >
<el-button type="text"
@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: {
billNumber:undefined,
orderNumber:undefined,
orderTypeId:undefined,
billStatusId:undefined,
remark: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,
orderTypeIdOptions:[],
orderTypeIdProps:{"label":"fullName","value":"id" },
billStatusIdOptions:[],
billStatusIdProps:{"label":"fullName","value":"id" },
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.getorderTypeIdOptions();
this.getbillStatusIdOptions();
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
},
getorderTypeIdOptions() {
getDictionaryDataSelector('520193298627825989').then(res => {
this.orderTypeIdOptions = res.data.list
})
},
getbillStatusIdOptions() {
getDictionaryDataSelector('521683590119955205').then(res => {
this.billStatusIdOptions = res.data.list
})
},
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:'521683377103837957',
type:1,
};
request({
url: `/api/scm/EnterpriseAccountBill/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/scm/EnterpriseAccountBill/${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("","scm/EnterpriseAccountBill")
})
},
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/scm/EnterpriseAccountBill/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

@ -120,9 +120,9 @@
</div>
<el-table :data="dataForm.tableField135" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="recycleTypeName" label="回收类目名称" >
<el-table-column prop="recycleTypeId" label="回收类目" >
<template slot-scope="scope">
<p>{{scope.row.recycleTypeName}}</p>
<p>{{scope.row.recycleTypeId}}</p>
</template>
</el-table-column>
<el-table-column prop="unitPrice" label="单价(kg)" >
@ -179,9 +179,9 @@
</div>
<el-table :data="dataForm.tableField119" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="housingEstateName" label="小区名称" >
<el-table-column prop="housingEstateId" label="小区id" >
<template slot-scope="scope">
<p>{{scope.row.housingEstateName}}</p>
<p>{{scope.row.housingEstateId}}</p>
</template>
</el-table-column>
</el-table>
@ -230,7 +230,7 @@
appointmentTimeEnd : "",
acceptRange : "",
recyclestationpriceList:[],
eecyclestationhousingestateList:[],
recyclestationhousingestateList:[],
},
managementModelProps:{"label":"fullName","value":"id" },
recycleTypeIdsProps:{"label":"fullName","value":"id" },
@ -239,7 +239,7 @@
acceptRangeOptions:[{"fullName":"无限制","id":"0"},{"fullName":"1KM","id":"1"},{"fullName":"3KM","id":"3"},{"fullName":"5KM","id":"5"}],
acceptRangeProps:{"label":"fullName","value":"id" },
recycleTypeNameProps:{"label":"fullName","value":"id" },
recycleTypeIdProps:{"label":"fullName","value":"id" },
}
},
computed: {},
@ -276,7 +276,7 @@
if(this.dataForm.id){
this.loading = true
request({
url: '/api/scm/EnterpriseRecycleStation/detail/'+this.dataForm.id,
url: '/api/scm/Enterpriserecyclestation/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)

File diff suppressed because one or more lines are too long

@ -168,13 +168,13 @@
<el-table :data="dataForm.recyclestationpriceList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column
label="回收类目名称" prop="recycleTypeName" >
label="回收类目" prop="recycleTypeId" >
<template slot="header" v-if="false" >
<span class="required-sign" >*</span>回收类目名称
<span class="required-sign" >*</span>回收类目
</template>
<template slot-scope="scope">
<JnpfSelect v-model="scope.row.recycleTypeName" @change="changeData('recyclestationprice-recycleTypeName',scope.$index)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="recyclestationpricerecycleTypeNameOptions" :props="recyclestationpricerecycleTypeNameProps" >
<JnpfSelect v-model="scope.row.recycleTypeId" @change="changeData('recyclestationprice-recycleTypeId',scope.$index)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="recyclestationpricerecycleTypeIdOptions" :props="recyclestationpricerecycleTypeIdProps" >
</JnpfSelect>
</template>
</el-table-column>
@ -212,7 +212,7 @@
<jnpf-form-tip-item
label="营业时间" prop="businessDays" >
<JnpfCheckbox v-model="dataForm.businessDays" @change="changeData('businessDays',-1)"
direction="horizontal" :style='{"width":"100%"}' :options="businessDaysOptions" :props="businessDaysProps" >
optionType="default" direction="horizontal" :style='{"width":"100%"}' :options="businessDaysOptions" :props="businessDaysProps" >
</JnpfCheckbox>
</jnpf-form-tip-item>
</el-col>
@ -250,26 +250,26 @@
<div class="JNPF-common-title">
<h2>范围内小区</h2>
</div>
<el-table :data="dataForm.eecyclestationhousingestateList" size='mini' >
<el-table :data="dataForm.recyclestationhousingestateList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column
label="小区名称" prop="housingEstateName" >
<template slot="header" v-if="true" >
<span class="required-sign" >*</span>小区名称
label="小区id" prop="housingEstateId" >
<template slot="header" v-if="false" >
<span class="required-sign" >*</span>小区id
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.housingEstateName" @change="changeData('eecyclestationhousingestate-housingEstateName',scope.$index)"
placeholder="请输入" readonly :style='{"width":"100%"}'>
</JnpfInput>
<JnpfPopupSelect v-model="scope.row.housingEstateId" @change="changeData('recyclestationhousingestate-housingEstateId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm" :templateJson="interfaceRes.recyclestationhousingestatehousingEstateId" placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name' :field="'housingEstateId'+scope.$index" interfaceId="520155939362312325" :pageSize="20" :columnOptions="recyclestationhousingestatehousingEstateIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="deleecyclestationhousingestateList(scope.$index)"></el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delrecyclestationhousingestateList(scope.$index)"></el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addeecyclestationhousingestateList()" >
<div class="table-actions" @click="addrecyclestationhousingestateList()" >
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -316,22 +316,22 @@
currTableConf:{},
dataValueAll:{},
addTableConf:{
recyclestationpriceList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[{"label":"商品名称","value":"recycle_type_name"},{"label":"单价kg","value":"unit_price"}],"interfaceId":"","interfaceName":"","relationOptions":[{"field":"","type":1,"value":""}],"templateJson":[],"popupWidth":"800px"},
eecyclestationhousingestateList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[{"label":"小区名称","value":"name"},{"label":"小区地址","value":"address"}],"interfaceId":"520155939362312325","interfaceName":"查询全部小区","relationOptions":[{"field":"housingEstateName","type":1,"value":"name"}],"templateJson":[],"popupWidth":"800px"},
recyclestationpriceList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
recyclestationhousingestateList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
},
//
ableAll:{
},
tableRows:{
recyclestationpriceList:{
recycleTypeNameOptions:[],
recycleTypeIdOptions:[],
unitPrice : '',
unitPriceOptions:[],
enabledmark:undefined
},
eecyclestationhousingestateList:{
housingEstateName : '',
housingEstateNameOptions:[],
recyclestationhousingestateList:{
housingEstateId : '',
housingEstateIdOptions:[],
enabledmark:undefined
},
},
@ -357,7 +357,7 @@
appointmentTimeEnd : undefined,
acceptRange : undefined,
recyclestationpriceList:[],
eecyclestationhousingestateList:[],
recyclestationhousingestateList:[],
},
tableRequiredData: {},
dataRule:
@ -389,13 +389,6 @@
message: '请至少选择一个',
trigger: 'change'
},
],
recycleTypeIds: [
{
required: true,
message: '请选择',
trigger: 'change'
},
],
firstContactPerson: [
{
@ -467,8 +460,9 @@
businessDaysProps:{"label":"fullName","value":"id" },
acceptRangeOptions:[{"fullName":"无限制","id":"0"},{"fullName":"1KM","id":"1"},{"fullName":"3KM","id":"3"},{"fullName":"5KM","id":"5"}],
acceptRangeProps:{"label":"fullName","value":"id" },
recyclestationpricerecycleTypeNameOptions:[],
recyclestationpricerecycleTypeNameProps:{"label":"fullName","value":"id" },
recyclestationpricerecycleTypeIdOptions:[],
recyclestationpricerecycleTypeIdProps:{"label":"fullName","value":"id" },
recyclestationhousingestatehousingEstateIdcolumnOptions:[ {"label":"小区名称","value":"name"},],
childIndex:-1,
isEdit:false,
interfaceRes: {
@ -490,9 +484,9 @@
appointmentTimeStart:[] ,
appointmentTimeEnd:[] ,
acceptRange:[] ,
recyclestationpricerecycleTypeName: [] ,
recyclestationpricerecycleTypeId: [] ,
recyclestationpriceunitPrice: [] ,
eecyclestationhousingestatehousingEstateName: [] ,
recyclestationhousingestatehousingEstateId: [] ,
},
}
},
@ -535,7 +529,7 @@
},
getInfo(id) {
request({
url: '/api/scm/EnterpriseRecycleStation/'+ id,
url: '/api/scm/Enterpriserecyclestation/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -586,7 +580,7 @@
dataAll(){
this.getmanagementModelOptions();
this.getrecycleTypeIdsOptions();
this.getrecyclestationpricerecycleTypeNameOptions();
this.getrecyclestationpricerecycleTypeIdOptions();
},
recyclestationpriceExist() {
let isOk = true;
@ -595,19 +589,10 @@
}
return isOk;
},
eecyclestationhousingestateExist() {
recyclestationhousingestateExist() {
let isOk = true;
for(let i=0;i<this.dataForm.eecyclestationhousingestateList.length;i++){
const e = this.dataForm.eecyclestationhousingestateList[i];
if (!e.housingEstateName) {
this.$message({
message: '小区名称不能为空',
type: 'error',
duration: 1000
});
isOk = false
break
}
for(let i=0;i<this.dataForm.recyclestationhousingestateList.length;i++){
const e = this.dataForm.recyclestationhousingestateList[i];
}
return isOk;
},
@ -621,9 +606,9 @@
this.recycleTypeIdsOptions = res.data.list
})
},
getrecyclestationpricerecycleTypeNameOptions() {
getrecyclestationpricerecycleTypeIdOptions() {
getDictionaryDataSelector('519096374193555461').then(res => {
this.recyclestationpricerecycleTypeNameOptions = res.data.list
this.recyclestationpricerecycleTypeIdOptions = res.data.list
})
},
goBack() {
@ -654,7 +639,7 @@
if(this.dataForm.id){
this.loading = true
request({
url: '/api/scm/EnterpriseRecycleStation/'+this.dataForm.id,
url: '/api/scm/Enterpriserecyclestation/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -677,7 +662,7 @@
this.$refs['formRef'].validate((valid) => {
if (valid) {
if (!this.recyclestationpriceExist()) return
if (!this.eecyclestationhousingestateExist()) return
if (!this.recyclestationhousingestateExist()) return
this.request()
}
})
@ -691,7 +676,7 @@
}
if (!this.dataForm.id) {
request({
url: '/api/scm/EnterpriseRecycleStation',
url: '/api/scm/Enterpriserecyclestation',
method: 'post',
data: _data
}).then((res) => {
@ -719,7 +704,7 @@
})
}else{
request({
url: '/api/scm/EnterpriseRecycleStation/'+this.dataForm.id,
url: '/api/scm/Enterpriserecyclestation/'+this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
@ -742,8 +727,8 @@
},
addrecyclestationpriceList(){
let item = {
recycleTypeName:'',
recycleTypeNameOptions:[],
recycleTypeId:'',
recycleTypeIdOptions:[],
unitPrice:undefined,
}
this.getrecyclestationpriceList(item)
@ -764,24 +749,24 @@
this.isEdit = false
this.childIndex = -1
},
addeecyclestationhousingestateList(){
addrecyclestationhousingestateList(){
let item = {
housingEstateName:undefined,
housingEstateId:'',
}
this.geteecyclestationhousingestateList(item)
this.getrecyclestationhousingestateList(item)
},
deleecyclestationhousingestateList(index) {
delrecyclestationhousingestateList(index) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
this.dataForm.eecyclestationhousingestateList.splice(index, 1);
this.dataForm.recyclestationhousingestateList.splice(index, 1);
}).catch(() => {
});
},
geteecyclestationhousingestateList(value){
let item={...this.tableRows.eecyclestationhousingestateList,...value}
this.dataForm.eecyclestationhousingestateList.push(item)
this.childIndex=this.dataForm.eecyclestationhousingestateList.length-1
getrecyclestationhousingestateList(value){
let item={...this.tableRows.recyclestationhousingestateList,...value}
this.dataForm.recyclestationhousingestateList.push(item)
this.childIndex=this.dataForm.recyclestationhousingestateList.length-1
this.isEdit = true
this.isEdit = false
this.childIndex = -1
@ -877,7 +862,7 @@
for(let i=0;i<_dataAll.recyclestationpriceList.length;i++){
this.childIndex = i
}
for(let i=0;i<_dataAll.eecyclestationhousingestateList.length;i++){
for(let i=0;i<_dataAll.recyclestationhousingestateList.length;i++){
this.childIndex = i
}
this.childIndex=-1

@ -396,9 +396,11 @@
businessDaysProps:{"label":"fullName","value":"id" },
acceptRangeOptions:[{"fullName":"无限制","id":"0"},{"fullName":"1KM","id":"1"},{"fullName":"3KM","id":"3"},{"fullName":"5KM","id":"5"}],
acceptRangeProps:{"label":"fullName","value":"id" },
tableField135_recycleTypeNameOptions:[],
tableField135_recycleTypeNameProps:{"label":"fullName","value":"id" },
tableField135_recycleTypeIdOptions:[],
tableField135_recycleTypeIdProps:{"label":"fullName","value":"id" },
tableField119_housingEstateIdcolumnOptions:[ {"label":"小区名称","value":"name"},],
interfaceRes: {
tableField119_housingEstateId: [] ,
},
}
},
@ -609,7 +611,7 @@
type:1,
};
request({
url: `/api/scm/EnterpriseRecycleStation/getList`,
url: `/api/scm/Enterpriserecyclestation/getList`,
method: 'post',
data: _query
}).then(res => {
@ -627,7 +629,7 @@
type: 'warning'
}).then(() => {
request({
url: `/api/scm/EnterpriseRecycleStation/${id}`,
url: `/api/scm/Enterpriserecyclestation/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
@ -644,7 +646,7 @@
handelUpload(){
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("","scm/EnterpriseRecycleStation")
this.$refs.UploadBox.init("","scm/Enterpriserecyclestation")
})
},
openSuperQuery() {
@ -674,7 +676,7 @@
download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
request({
url: `/api/scm/EnterpriseRecycleStation/Actions/Export`,
url: `/api/scm/Enterpriserecyclestation/Actions/Export`,
method: 'post',
data: query
}).then(res => {

File diff suppressed because one or more lines are too long

@ -43,8 +43,8 @@
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="回收员姓名"
prop="stafname" >
<p>{{dataForm.stafname}}</p>
prop="staffsName" >
<p>{{dataForm.staffsName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
@ -97,9 +97,9 @@
id :'',
stationId : "",
headIcon : [],
stafname : '',
staffsName : '',
mobilePhone : '',
gender : '',
gender : "1",
birthday : '',
autoEnabled : 1,
},

File diff suppressed because one or more lines are too long

@ -66,8 +66,8 @@
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="回收员姓名" prop="stafname" >
<JnpfInput v-model="dataForm.stafname" @change="changeData('stafname',-1)"
label="回收员姓名" prop="staffsName" >
<JnpfInput v-model="dataForm.staffsName" @change="changeData('staffsName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
@ -158,9 +158,9 @@
dataForm: {
stationId : undefined,
headIcon : [],
stafname : undefined,
staffsName : undefined,
mobilePhone : undefined,
gender : undefined,
gender : "1",
birthday : undefined,
autoEnabled : 1,
},
@ -174,7 +174,7 @@
trigger: 'change'
},
],
stafname: [
staffsName: [
{
required: true,
message: '请输入',
@ -198,7 +198,7 @@
interfaceRes: {
stationId:[] ,
headIcon:[] ,
stafname:[] ,
staffsName:[] ,
mobilePhone:[] ,
gender:[] ,
birthday:[] ,

@ -20,7 +20,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="回收员姓名">
<el-input v-model="query.stafname" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.staffsName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -63,7 +63,7 @@
>
</el-table-column>
<el-table-column
prop="stafname"
prop="staffsName"
label="回收员姓名" align="left"
>
</el-table-column>
@ -88,6 +88,7 @@
label="自动接单" align="left"
>
</el-table-column>
<el-table-column label="操作"
fixed="right" width="150" >
<template slot-scope="scope" >
@ -162,8 +163,8 @@
detailVisible: false,
query: {
stationId:undefined,
stafname:undefined,
mobilePhone:undefined,
staffsName:undefined,
},
treeProps: {
children: 'children',

File diff suppressed because one or more lines are too long

@ -17,6 +17,10 @@
<artifactId>jnpf-common-all</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
</project>
Loading…
Cancel
Save