位置->区域->回收站

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）
@@ -52,11 +64,15 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<Enterpriser
     private RecyclestationhousingestateService recyclestationhousingestateService;
     @Autowired
     private HousingEstateService housingEstateService;
+
     @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();
@@ -467,27 +483,34 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<Enterpriser
             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子表方法 */
+
+    /**
+     * Recyclestationprice子表方法
+     */
     @Override
     public List<RecyclestationpriceEntity> getRecyclestationpriceList(String id, EnterpriserecyclestationPagination enterpriserecyclestationPagination) {
         Map<String, Object> newtabMap = EnterpriserecyclestationConstant.TABLEFIELDKEY.entrySet()
@@ -501,14 +524,19 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<Enterpriser
         return recyclestationpriceService.list(queryWrapper);
     }
 
-    /** Recyclestationprice子表方法 */
+    /**
+     * Recyclestationprice子表方法
+     */
     @Override
     public List<RecyclestationpriceEntity> getRecyclestationpriceList(String id) {
         QueryWrapper<RecyclestationpriceEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(RecyclestationpriceEntity::getStationId, id);
         return recyclestationpriceService.list(queryWrapper);
     }
-    /** Recyclestationhousingestate子表方法 */
+
+    /**
+     * Recyclestationhousingestate子表方法
+     */
     @Override
     public List<RecyclestationhousingestateEntity> getRecyclestationhousingestateList(String id, EnterpriserecyclestationPagination enterpriserecyclestationPagination) {
         Map<String, Object> newtabMap = EnterpriserecyclestationConstant.TABLEFIELDKEY.entrySet()
@@ -522,14 +550,19 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<Enterpriser
         return recyclestationhousingestateService.list(queryWrapper);
     }
 
-    /** Recyclestationhousingestate子表方法 */
+    /**
+     * 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修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
     public String checkForm(EnterpriserecyclestationForm form, int i) {
         boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@@ -567,8 +600,10 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<Enterpriser
         }
         return countRecover;
     }
+
     /**
      * 新增修改数据(事务回滚)
+     *
      * @param id
      * @param enterpriserecyclestationForm
      * @return
@@ -644,9 +679,10 @@ public class EnterpriserecyclestationServiceImpl extends ServiceImpl<Enterpriser
     }
 
     @Override
-    public List<EnterpriserecyclestationEntity> getListByCompanyId(String enterprise_id) {
+    public List<EnterpriserecyclestationEntity> getListByCompanyId(String companyId) {
         QueryWrapper<EnterpriserecyclestationEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("enterprise_id", enterprise_id);
-        return null;
+        wrapper.eq("company_id", companyId);
+        List<EnterpriserecyclestationEntity> list = this.list(wrapper);
+        return list;
     }
 }