问题处理

hx-item/pom.xml

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <version>2.2.11</version>
+            <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>com.fjhx</groupId>

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderServiceImpl.java

@@ -91,14 +91,14 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         wrapper.ge("po", ProductionOrder::getCreateTime, dto.getBeginTime());
         wrapper.le("po", ProductionOrder::getCreateTime, dto.getEndTime());
         //关键字
-        wrapper.keyword(dto.getKeyword(), new SqlField(ProductionOrder::getCode));
+        wrapper.keyword(dto.getKeyword(), new SqlField("po", ProductionOrder::getCode));
 
         //权限过滤：生产订单-子公司看自己的,总公司看全部
         Long companyId = SecurityUtils.getCompanyId();
         if (!Objects.equals(companyId, 100L)) {
-            wrapper.eq(ProductionOrder::getCompanyId, companyId);
+            wrapper.eq("po", ProductionOrder::getCompanyId, companyId);
         } else {
-            wrapper.eq(ProductionOrder::getCompanyId, dto.getCompanyId());
+            wrapper.eq("po", ProductionOrder::getCompanyId, dto.getCompanyId());
         }
 
         Page<ProductionOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionProcessesServiceImpl.java

@@ -52,8 +52,10 @@ public class ProductionProcessesServiceImpl extends ServiceImpl<ProductionProces
     @Override
     public Page<ProductionProcessesVo> getPage(ProductionProcessesSelectDto dto) {
         IWrapper<ProductionProcesses> wrapper = getWrapper();
-        wrapper.orderByDesc("pp", ProductionProcesses::getId);
         wrapper.like(ProductionProcesses::getName, dto.getKeyword());
+
+        wrapper.orderByAsc("pp", ProductionProcesses::getCreateTime);
+        wrapper.orderByAsc("pp", ProductionProcesses::getId);
         Page<ProductionProcessesVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }