diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/EnterpriserecyclestationServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/EnterpriserecyclestationServiceImpl.java index d5d1b4a..6f9fde5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/EnterpriserecyclestationServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/EnterpriserecyclestationServiceImpl.java @@ -5,18 +5,26 @@ 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; @@ -25,13 +33,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.text.SimpleDateFormat; + import jnpf.util.*; + import java.util.*; + import jnpf.base.UserInfo; import jnpf.permission.entity.UserEntity; + /** - * * Enterpriserecyclestation * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） @@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity; * 日期： 2024-01-29 */ @Service -public class EnterpriserecyclestationServiceImpl extends ServiceImpl implements EnterpriserecyclestationService{ +public class EnterpriserecyclestationServiceImpl extends ServiceImpl implements EnterpriserecyclestationService { @Autowired private GeneraterSwapUtil generaterSwapUtil; @@ -52,589 +64,612 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl getList(EnterpriserecyclestationPagination enterpriserecyclestationPagination){ - return getTypeList(enterpriserecyclestationPagination,enterpriserecyclestationPagination.getDataType()); + public List getList(EnterpriserecyclestationPagination enterpriserecyclestationPagination) { + return getTypeList(enterpriserecyclestationPagination, enterpriserecyclestationPagination.getDataType()); } - /** 列表查询 */ + + /** + * 列表查询 + */ @Override - public List getTypeList(EnterpriserecyclestationPagination enterpriserecyclestationPagination,String dataType){ - String userId=userProvider.get().getUserId(); - List AllIdList =new ArrayList(); - List> intersectionList =new ArrayList<>(); + public List getTypeList(EnterpriserecyclestationPagination enterpriserecyclestationPagination, String dataType) { + String userId = userProvider.get().getUserId(); + List AllIdList = new ArrayList(); + List> 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 enterpriserecyclestationQueryWrapper=new QueryWrapper<>(); - int recyclestationhousingestateNum =0; - QueryWrapper recyclestationhousingestateQueryWrapper=new QueryWrapper<>(); - int recyclestationpriceNum =0; - QueryWrapper recyclestationpriceQueryWrapper=new QueryWrapper<>(); + int total = 0; + int enterpriserecyclestationNum = 0; + QueryWrapper enterpriserecyclestationQueryWrapper = new QueryWrapper<>(); + int recyclestationhousingestateNum = 0; + QueryWrapper recyclestationhousingestateQueryWrapper = new QueryWrapper<>(); + int recyclestationpriceNum = 0; + QueryWrapper recyclestationpriceQueryWrapper = new QueryWrapper<>(); long recyclestationhousingestatecount = recyclestationhousingestateService.count(); long recyclestationpricecount = recyclestationpriceService.count(); List allSuperIDlist = new ArrayList<>(); - String superOp =""; - if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getSuperQueryJson())){ + String superOp = ""; + if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getSuperQueryJson())) { List allSuperList = new ArrayList<>(); - List> intersectionSuperList = new ArrayList<>(); + List> intersectionSuperList = new ArrayList<>(); String queryJson = enterpriserecyclestationPagination.getSuperQueryJson(); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); int superNum = 0; QueryWrapper enterpriserecyclestationSuperWrapper = new QueryWrapper<>(); - enterpriserecyclestationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriserecyclestationSuperWrapper,EnterpriserecyclestationEntity.class,queryJson,"0")); + enterpriserecyclestationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriserecyclestationSuperWrapper, EnterpriserecyclestationEntity.class, queryJson, "0")); int enterpriserecyclestationNum1 = enterpriserecyclestationSuperWrapper.getExpression().getNormal().size(); - if (enterpriserecyclestationNum1>0){ - List enterpriserecyclestationList =this.list(enterpriserecyclestationSuperWrapper).stream().map(EnterpriserecyclestationEntity::getId).collect(Collectors.toList()); + if (enterpriserecyclestationNum1 > 0) { + List 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 recyclestationhousingestateList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationhousingestateTable , queryJson, null); - if (RecyclestationhousingestateHasSql){ + List 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 recyclestationpriceList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationpriceTable , queryJson, null); - if (RecyclestationpriceHasSql){ + List 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")){ + if (superOp.equalsIgnoreCase("and")) { allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); - }else{ + } else { allSuperIDlist = allSuperList; } } List allRuleIDlist = new ArrayList<>(); - String ruleOp =""; - if (ObjectUtil.isNotEmpty(ruleJson)){ + String ruleOp = ""; + if (ObjectUtil.isNotEmpty(ruleJson)) { List allRuleList = new ArrayList<>(); - List> intersectionRuleList = new ArrayList<>(); + List> intersectionRuleList = new ArrayList<>(); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); int ruleNum = 0; QueryWrapper enterpriserecyclestationSuperWrapper = new QueryWrapper<>(); - enterpriserecyclestationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriserecyclestationSuperWrapper,EnterpriserecyclestationEntity.class,ruleJson,"0")); + enterpriserecyclestationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriserecyclestationSuperWrapper, EnterpriserecyclestationEntity.class, ruleJson, "0")); int enterpriserecyclestationNum1 = enterpriserecyclestationSuperWrapper.getExpression().getNormal().size(); - if (enterpriserecyclestationNum1>0){ - List enterpriserecyclestationList =this.list(enterpriserecyclestationSuperWrapper).stream().map(EnterpriserecyclestationEntity::getId).collect(Collectors.toList()); + if (enterpriserecyclestationNum1 > 0) { + List 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 recyclestationhousingestateList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationhousingestateTable , ruleJson, null); - if (RecyclestationhousingestateHasSql){ + List 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 recyclestationpriceList = generaterSwapUtil.selectIdsByChildCondition(EnterpriserecyclestationConstant.getTableList(), RecyclestationpriceTable , ruleJson, null); - if (RecyclestationpriceHasSql){ + List 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")){ + if (ruleOp.equalsIgnoreCase("and")) { allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); - }else{ + } else { allRuleIDlist = allRuleList; } } - boolean pcPermission = true; - 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)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)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)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)enterpriserecyclestationObj; - if( enterpriserecyclestationQueryWrapper.getExpression().getNormal().size()>0){ - enterpriserecyclestationNum++; - } + boolean pcPermission = true; + 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) 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) 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) 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) 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)recyclestationhousingestateObj; - if( recyclestationhousingestateQueryWrapper.getExpression().getNormal().size()>0){ - recyclestationhousingestateNum++; - } - } + Object recyclestationhousingestateObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationhousingestateQueryWrapper, RecyclestationhousingestateEntity.class, enterpriserecyclestationPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(recyclestationhousingestateObj)) { + return new ArrayList<>(); + } else { + recyclestationhousingestateQueryWrapper = (QueryWrapper) 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)recyclestationpriceObj; - if( recyclestationpriceQueryWrapper.getExpression().getNormal().size()>0){ - recyclestationpriceNum++; - } - } + Object recyclestationpriceObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recyclestationpriceQueryWrapper, RecyclestationpriceEntity.class, enterpriserecyclestationPagination.getMenuId(), "0")); + if (ObjectUtil.isEmpty(recyclestationpriceObj)) { + return new ArrayList<>(); + } else { + recyclestationpriceQueryWrapper = (QueryWrapper) recyclestationpriceObj; + if (recyclestationpriceQueryWrapper.getExpression().getNormal().size() > 0) { + recyclestationpriceNum++; + } + } - } - } - if(isPc){ - if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getTableField135_recycleTypeName())){ - recyclestationpriceNum++; - - List idList = new ArrayList<>(); - try { - String[][] recycleTypeName = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getTableField135_recycleTypeName(),String[][].class); - for(int i=0;i0){ - idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleTypeName[i]))); - } - } - }catch (Exception e1){ - try { - List 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 (isPc) { + if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getTableField135_recycleTypeName())) { + recyclestationpriceNum++; + + List 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 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++; + 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); + JsonUtil.getObjectToString(enterpriserecyclestationPagination.getTableField119_housingEstateName()) : + String.valueOf(enterpriserecyclestationPagination.getTableField119_housingEstateName()); + recyclestationhousingestateQueryWrapper.lambda().like(RecyclestationhousingestateEntity::getHousingEstateName, value); } - if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getStationCode())){ - enterpriserecyclestationNum++; + 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); + JsonUtil.getObjectToString(enterpriserecyclestationPagination.getStationCode()) : + String.valueOf(enterpriserecyclestationPagination.getStationCode()); + enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getStationCode, value); } - if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getStationName())){ - enterpriserecyclestationNum++; + 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); + JsonUtil.getObjectToString(enterpriserecyclestationPagination.getStationName()) : + String.valueOf(enterpriserecyclestationPagination.getStationName()); + enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getStationName, value); } - if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getManagementModel())){ - enterpriserecyclestationNum++; + if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getManagementModel())) { + enterpriserecyclestationNum++; - List idList = new ArrayList<>(); - try { - String[][] managementModel = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getManagementModel(),String[][].class); - for(int i=0;i0){ - idList.add(JsonUtil.getObjectToString(Arrays.asList(managementModel[i]))); - } - } - }catch (Exception e1){ - try { - List 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(); - }); - }); + List 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 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++; + if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getCity())) { + enterpriserecyclestationNum++; - List idList = new ArrayList<>(); - try { - String[][] city = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getCity(),String[][].class); - for(int i=0;i0){ - idList.add(JsonUtil.getObjectToString(Arrays.asList(city[i]))); - } - } - }catch (Exception e1){ - try { - List 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(); - }); - }); + List 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 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++; + if (ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getRecycleTypeIds())) { + enterpriserecyclestationNum++; - List idList = new ArrayList<>(); - try { - String[][] recycleTypeIds = JsonUtil.getJsonToBean(enterpriserecyclestationPagination.getRecycleTypeIds(),String[][].class); - for(int i=0;i0){ - idList.add(JsonUtil.getObjectToString(Arrays.asList(recycleTypeIds[i]))); - } - } - }catch (Exception e1){ - try { - List 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(); - }); - }); + List 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 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++; + 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); + JsonUtil.getObjectToString(enterpriserecyclestationPagination.getFirstContactPerson()) : + String.valueOf(enterpriserecyclestationPagination.getFirstContactPerson()); + enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getFirstContactPerson, value); } - if(ObjectUtil.isNotEmpty(enterpriserecyclestationPagination.getShortName())){ - enterpriserecyclestationNum++; + 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); + JsonUtil.getObjectToString(enterpriserecyclestationPagination.getShortName()) : + String.valueOf(enterpriserecyclestationPagination.getShortName()); + enterpriserecyclestationQueryWrapper.lambda().like(EnterpriserecyclestationEntity::getShortName, value); } } - if(recyclestationhousingestateNum>0){ - List recyclestationhousingestateIdList = recyclestationhousingestateService.list(recyclestationhousingestateQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getStationId())).map(t->t.getStationId()).collect(Collectors.toList()); + if (recyclestationhousingestateNum > 0) { + List 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); + if (count > 0) { + intersectionList.add(recyclestationhousingestateIdList); } AllIdList.addAll(recyclestationhousingestateIdList); - } - total+=recyclestationhousingestateNum; - if(recyclestationpriceNum>0){ - List recyclestationpriceIdList = recyclestationpriceService.list(recyclestationpriceQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getStationId())).map(t->t.getStationId()).collect(Collectors.toList()); + } + total += recyclestationhousingestateNum; + if (recyclestationpriceNum > 0) { + List 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); + if (count > 0) { + intersectionList.add(recyclestationpriceIdList); } AllIdList.addAll(recyclestationpriceIdList); - } - total+=recyclestationpriceNum; + } + total += recyclestationpriceNum; List intersection = generaterSwapUtil.getIntersection(intersectionList); - if (total>0){ - if (intersection.size()==0){ + if (total > 0) { + if (intersection.size() == 0) { intersection.add("jnpfNullList"); } enterpriserecyclestationQueryWrapper.lambda().in(EnterpriserecyclestationEntity::getId, intersection); } - //是否有高级查询 - if (StringUtil.isNotEmpty(superOp)){ - if (allSuperIDlist.size()==0){ + //是否有高级查询 + if (StringUtil.isNotEmpty(superOp)) { + if (allSuperIDlist.size() == 0) { allSuperIDlist.add("jnpfNullList"); } List finalAllSuperIDlist = allSuperIDlist; - enterpriserecyclestationQueryWrapper.lambda().and(t->t.in(EnterpriserecyclestationEntity::getId, finalAllSuperIDlist)); + enterpriserecyclestationQueryWrapper.lambda().and(t -> t.in(EnterpriserecyclestationEntity::getId, finalAllSuperIDlist)); } - //是否有数据过滤查询 - if (StringUtil.isNotEmpty(ruleOp)){ - if (allRuleIDlist.size()==0){ + //是否有数据过滤查询 + if (StringUtil.isNotEmpty(ruleOp)) { + if (allRuleIDlist.size() == 0) { allRuleIDlist.add("jnpfNullList"); } List finalAllRuleIDlist = allRuleIDlist; - enterpriserecyclestationQueryWrapper.lambda().and(t->t.in(EnterpriserecyclestationEntity::getId, finalAllRuleIDlist)); + enterpriserecyclestationQueryWrapper.lambda().and(t -> t.in(EnterpriserecyclestationEntity::getId, finalAllRuleIDlist)); } //排序 - if(StringUtil.isEmpty(enterpriserecyclestationPagination.getSidx())){ + if (StringUtil.isEmpty(enterpriserecyclestationPagination.getSidx())) { enterpriserecyclestationQueryWrapper.lambda().orderByDesc(EnterpriserecyclestationEntity::getId); - }else{ + } else { try { String sidx = enterpriserecyclestationPagination.getSidx(); - String[] strs= sidx.split("_name"); + 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); + 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 page=new Page<>(enterpriserecyclestationPagination.getCurrentPage(), enterpriserecyclestationPagination.getPageSize()); - IPage userIPage=this.page(page, enterpriserecyclestationQueryWrapper); - return enterpriserecyclestationPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ + if ("0".equals(dataType)) { + if ((total > 0 && AllIdList.size() > 0) || total == 0) { + Page page = new Page<>(enterpriserecyclestationPagination.getCurrentPage(), enterpriserecyclestationPagination.getPageSize()); + IPage userIPage = this.page(page, enterpriserecyclestationQueryWrapper); + return enterpriserecyclestationPagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } else { List list = new ArrayList(); return enterpriserecyclestationPagination.setData(list, list.size()); } - }else{ + } else { return this.list(enterpriserecyclestationQueryWrapper); } } + @Override - public EnterpriserecyclestationEntity getInfo(String id){ - QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(EnterpriserecyclestationEntity::getId,id); + public EnterpriserecyclestationEntity getInfo(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(EnterpriserecyclestationEntity::getId, id); return this.getOne(queryWrapper); } + @Override - public void create(EnterpriserecyclestationEntity entity){ + public void create(EnterpriserecyclestationEntity entity) { this.save(entity); } + @Override - public boolean update(String id, EnterpriserecyclestationEntity entity){ + public boolean update(String id, EnterpriserecyclestationEntity entity) { return this.updateById(entity); } + @Override - public void delete(EnterpriserecyclestationEntity entity){ - if(entity!=null){ + public void delete(EnterpriserecyclestationEntity entity) { + if (entity != null) { this.removeById(entity.getId()); } } - /** Recyclestationprice子表方法 */ + + /** + * Recyclestationprice子表方法 + */ @Override - public List getRecyclestationpriceList(String id,EnterpriserecyclestationPagination enterpriserecyclestationPagination){ - Map 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(); + public List getRecyclestationpriceList(String id, EnterpriserecyclestationPagination enterpriserecyclestationPagination) { + Map 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 queryWrapper = new QueryWrapper<>(); - queryWrapper = recyclestationpriceService.getChild(enterpriserecyclestationPagination,queryWrapper); + queryWrapper = recyclestationpriceService.getChild(enterpriserecyclestationPagination, queryWrapper); queryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, id); - generaterSwapUtil.wrapperHandle(EnterpriserecyclestationConstant.getColumnData(), EnterpriserecyclestationConstant.getAppColumnData(), queryWrapper,RecyclestationpriceEntity.class,"sub",tableName); + generaterSwapUtil.wrapperHandle(EnterpriserecyclestationConstant.getColumnData(), EnterpriserecyclestationConstant.getAppColumnData(), queryWrapper, RecyclestationpriceEntity.class, "sub", tableName); return recyclestationpriceService.list(queryWrapper); } - /** Recyclestationprice子表方法 */ + /** + * Recyclestationprice子表方法 + */ @Override - public List getRecyclestationpriceList(String id){ + public List getRecyclestationpriceList(String id) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, id); return recyclestationpriceService.list(queryWrapper); } - /** Recyclestationhousingestate子表方法 */ + + /** + * Recyclestationhousingestate子表方法 + */ @Override - public List getRecyclestationhousingestateList(String id,EnterpriserecyclestationPagination enterpriserecyclestationPagination){ - Map 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(); + public List getRecyclestationhousingestateList(String id, EnterpriserecyclestationPagination enterpriserecyclestationPagination) { + Map 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 queryWrapper = new QueryWrapper<>(); - queryWrapper = recyclestationhousingestateService.getChild(enterpriserecyclestationPagination,queryWrapper); + queryWrapper = recyclestationhousingestateService.getChild(enterpriserecyclestationPagination, queryWrapper); queryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, id); - generaterSwapUtil.wrapperHandle(EnterpriserecyclestationConstant.getColumnData(), EnterpriserecyclestationConstant.getAppColumnData(), queryWrapper,RecyclestationhousingestateEntity.class,"sub",tableName); + generaterSwapUtil.wrapperHandle(EnterpriserecyclestationConstant.getColumnData(), EnterpriserecyclestationConstant.getAppColumnData(), queryWrapper, RecyclestationhousingestateEntity.class, "sub", tableName); return recyclestationhousingestateService.list(queryWrapper); } - /** Recyclestationhousingestate子表方法 */ + /** + * Recyclestationhousingestate子表方法 + */ @Override - public List getRecyclestationhousingestateList(String id){ + public List getRecyclestationhousingestateList(String id) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, id); return recyclestationhousingestateService.list(queryWrapper); } - /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/ + + /** + * 验证表单唯一字段，正则，非空 i-0新增-1修改 + */ @Override - public String checkForm(EnterpriserecyclestationForm form,int i) { - boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); - String id=""; + public String checkForm(EnterpriserecyclestationForm form, int i) { + boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); + String id = ""; String countRecover = ""; - if (isUp){ + if (isUp) { id = form.getId(); } //主表字段验证 - if(StringUtil.isEmpty(form.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 (StringUtil.isEmpty(form.getStationName())) { + return "回收站名称不能为空"; } - } - //子表字段验证 - if (form.getRecyclestationpriceList()!=null){ - } - if (form.getRecyclestationhousingestateList()!=null){ + 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 - */ + * 新增修改数据(事务回滚) + * + * @param id + * @param enterpriserecyclestationForm + * @return + */ @Override @Transactional - public void saveOrUpdate(EnterpriserecyclestationForm enterpriserecyclestationForm,String id, boolean isSave) throws Exception{ - UserInfo userInfo=userProvider.get(); + 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); + generaterSwapUtil.swapDatetime(EnterpriserecyclestationConstant.getFormData(), enterpriserecyclestationForm), EnterpriserecyclestationForm.class); EnterpriserecyclestationEntity entity = JsonUtil.getJsonToBean(enterpriserecyclestationForm, EnterpriserecyclestationEntity.class); - if(isSave){ - String mainId = RandomUtil.uuId() ; + if (isSave) { + String mainId = RandomUtil.uuId(); entity.setStationCode(generaterSwapUtil.getBillNumber("huishou", false)); entity.setId(mainId); - }else{ + } else { entity.setStationCode(generaterSwapUtil.getBillNumber("huishou", false)); } this.saveOrUpdate(entity); //Recyclestationprice子表数据新增修改 - if(!isSave){ + if (!isSave) { QueryWrapper RecyclestationpricequeryWrapper = new QueryWrapper<>(); RecyclestationpricequeryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, entity.getId()); recyclestationpriceService.remove(RecyclestationpricequeryWrapper); } - if (enterpriserecyclestationForm.getRecyclestationpriceList()!=null){ - List tableField135 = JsonUtil.getJsonToList(enterpriserecyclestationForm.getRecyclestationpriceList(),RecyclestationpriceEntity.class); - for(RecyclestationpriceEntity entitys : tableField135){ + if (enterpriserecyclestationForm.getRecyclestationpriceList() != null) { + List tableField135 = JsonUtil.getJsonToList(enterpriserecyclestationForm.getRecyclestationpriceList(), RecyclestationpriceEntity.class); + for (RecyclestationpriceEntity entitys : tableField135) { entitys.setId(RandomUtil.uuId()); entitys.setStationId(entity.getId()); - if(isSave){ - }else{ + if (isSave) { + } else { } recyclestationpriceService.saveOrUpdate(entitys); } } //Recyclestationhousingestate子表数据新增修改 - if(!isSave){ + if (!isSave) { QueryWrapper RecyclestationhousingestatequeryWrapper = new QueryWrapper<>(); RecyclestationhousingestatequeryWrapper.lambda().eq(RecyclestationhousingestateEntity::getStationId, entity.getId()); recyclestationhousingestateService.remove(RecyclestationhousingestatequeryWrapper); } - if (enterpriserecyclestationForm.getRecyclestationhousingestateList()!=null){ - List tableField119 = JsonUtil.getJsonToList(enterpriserecyclestationForm.getRecyclestationhousingestateList(),RecyclestationhousingestateEntity.class); - for(RecyclestationhousingestateEntity entitys : tableField119){ + if (enterpriserecyclestationForm.getRecyclestationhousingestateList() != null) { + List tableField119 = JsonUtil.getJsonToList(enterpriserecyclestationForm.getRecyclestationhousingestateList(), RecyclestationhousingestateEntity.class); + for (RecyclestationhousingestateEntity entitys : tableField119) { entitys.setId(RandomUtil.uuId()); entitys.setStationId(entity.getId()); //修改存储新的回收站id - QueryWrapper queryWrapper =new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(HousingEstateEntity::getId, entitys.getHousingEstateId()); List housingEstateEntityList = housingEstateService.list(queryWrapper); - if (housingEstateEntityList.size()>0){ - for (HousingEstateEntity housingEstateEntity: housingEstateEntityList) { + if (housingEstateEntityList.size() > 0) { + for (HousingEstateEntity housingEstateEntity : housingEstateEntityList) { housingEstateEntity.setStationId(entity.getId()); } } housingEstateService.updateBatchById(housingEstateEntityList); - if(isSave){ - }else{ + if (isSave) { + } else { } recyclestationhousingestateService.saveOrUpdate(entitys); @@ -644,9 +679,10 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl getListByCompanyId(String enterprise_id) { + public List getListByCompanyId(String companyId) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("enterprise_id", enterprise_id); - return null; + wrapper.eq("company_id", companyId); + List list = this.list(wrapper); + return list; } }