佰穗莱分页代码优化

ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtil.java

@@ -55,7 +55,9 @@ public class PageUtil{
 
 
     public static <E, T> PageInfo<T> convert(Page<E> page, Class<T> targetClass) {
-        if(CollectionUtil.isNotEmpty(page)) return PageInfo.of(new Page<>());
-        return page.toPageInfo(item -> ConvertUtils.sourceToTarget(item, targetClass));
+        if(CollectionUtil.isEmpty(page)) return PageInfo.of(new Page<>());
+        PageInfo<T> targetPageInfo = page.toPageInfo(item -> ConvertUtils.sourceToTarget(item, targetClass));
+        targetPageInfo.setTotal(page.getTotal());
+        return targetPageInfo;
     }
 }

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/AciService.java

@@ -2,7 +2,6 @@ package com.ruoyi.ams.agv.ndc;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.thread.ThreadUtil;
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.ams.agv.ndc.common.Aci;
 import com.ruoyi.ams.agv.ndc.common.ByteUtil;

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/bean/dto/OrgDTO.java

@@ -38,7 +38,6 @@ public class OrgDTO extends WarewmsExtDTO {
     @Excel(name = "联系人")
     private String orgContacts;
 
-
     /**
      * 联系电话
      */
@@ -59,8 +58,7 @@ public class OrgDTO extends WarewmsExtDTO {
 
 
     /**
-     * 组织类型 10客户，00供应商
-     * @see com.ruoyi.base.constant.type.BizEnum.OrgType#getCode()
+     * 组织类型 10客户，00供应商 {@link com.ruoyi.base.constant.type.BizEnum.OrgType}
      */
     private String orgType;
 }

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/service/IOrgSevice.java

@@ -7,6 +7,10 @@ import com.ruoyi.framework.service.CrudService;
 
 import java.util.List;
 
+/**
+ * 机构相关接口提供（客户以及供应商）
+ * @author ChenYang
+ */
 public interface IOrgSevice extends CrudService<OrgEntity, OrgDTO> {
 
     PageInfo<OrgDTO> getOrgPageInfo(OrgDTO orgDTO);

warewms-ams/src/main/java/com/ruoyi/ams/bionutrition/org/service/impl/OrgServiceImpl.java

@@ -68,9 +68,6 @@ public class OrgServiceImpl extends CrudServiceImpl<OrgMapper, OrgEntity, OrgDTO
     @Override
     public QueryWrapper<OrgEntity> getWrapper(Map<String, Object> params) {
         QueryWrapper<OrgEntity> queryWrapper = new QueryWrapper<>();
-        /*String orgStatus = StringUtils.isBlank((String)params.get("orgStatus"))
-                ? BizEnum.OrgStatus.Enable.getCode() : BizEnum.OrgStatus.Disable.getCode();
-        queryWrapper.lambda().eq(OrgEntity::getOrgStatus, orgStatus);*/
         queryWrapper.lambda().eq(StringUtils.isNotBlank((String)params.get("orgStatus")), OrgEntity::getOrgStatus, params.get("orgStatus"));
         queryWrapper.lambda().eq(StringUtils.isNotBlank((String)params.get("orgName")), OrgEntity::getOrgName, params.get("orgName"));
         queryWrapper.lambda().eq(StringUtils.isNotBlank((String)params.get("orgType")), OrgEntity::getOrgType, params.get("orgType"));

warewms-base/src/main/java/com/ruoyi/base/constant/type/BizEnum.java

@@ -34,14 +34,21 @@ public class BizEnum {
      *  机构状态
      */
     public enum OrgStatus implements IBaseEnum<String> {
+
         /**
-         * 启用
+         * 启用不合格
          */
-        Enable("0"),
+        ENABLE_NOT_QUALIFIED("2"),
+
+        /**
+         * 启用且合格
+         */
+        ENABLE_ISQUALIFIED("1"),
+
         /**
          * 禁用
          */
-        Disable("1");
+        DISABLE("0");
 
         private final String code;
 
@@ -55,4 +62,6 @@ public class BizEnum {
         }
     }
 
+
+
 }