字段补充等

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -80,7 +80,6 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     @Override
     public Page<ProductInfoVo> getPage(ProductInfoSelectDto dto) {
         IWrapper<ProductInfo> wrapper = getWrapper();
-        wrapper.orderByDesc("pi", ProductInfo::getId);
         wrapper.eq("pi", ProductInfo::getType, dto.getType());
         wrapper.eq("pi", ProductInfo::getDefinition, dto.getDefinition());
 
@@ -107,6 +106,13 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         //过滤组合产品
         wrapper.eq("json_unquote( victoriatourist_json -> '$.combination' )", dto.getCombination());
 
+        //根据id倒序名称规格升序
+        wrapper.orderByDesc("pi", ProductInfo::getId);
+        wrapper.orderByAsc("pi", ProductInfo::getName);
+        wrapper.orderByAsc("pi", ProductInfo::getSpec);
+
+
+
         Page<ProductInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         List<ProductInfoVo> records = page.getRecords();

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/po/SalesContract.java

@@ -1,5 +1,6 @@
 package com.fjhx.jxst.entity.sales.po;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -29,6 +30,7 @@ public class SalesContract extends BasePo {
     /**
      * 交货日期
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     private Date deliveryDate;
 
     /**

hx-jxst/src/main/resources/mapper/sales/SalesContractMapper.xml

@@ -4,6 +4,7 @@
     <select id="getPage" resultType="com.fjhx.jxst.entity.sales.vo.SalesContractVo">
         select
             sc.id,
+            sc.code,
             sc.customer_id,
             sc.delivery_date,
             sc.pay_method,

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

@@ -53,12 +53,15 @@ public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper,
     @Override
     public Page<ProductionPlanVo> getPage(ProductionPlanSelectDto dto) {
         IWrapper<ProductionPlan> wrapper = getWrapper();
-        wrapper.orderByDesc("pp", ProductionPlan::getId);
         if(ObjectUtil.isNotEmpty(dto.getKeyword())) {
             wrapper.and(q->q.like(ProductionPlan::getStartDate, dto.getKeyword())
                     .or().like(ProductionPlan::getStopDate, dto.getKeyword())
                     .or().like(ProductionPlan::getQuantity, dto.getKeyword()));
         }
+
+        wrapper.orderByAsc("pp", ProductionPlan::getCreateTime);
+
+
         Page<ProductionPlanVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ProductionPlanVo> records = page.getRecords();