问题处理

hx-item/src/main/java/com/fjhx/item/controller/product/ProductBomInfoController.java

@@ -49,7 +49,10 @@ public class ProductBomInfoController {
         Assert.notEmpty(productInfo, "查询不到产品信息");
 
         //赋值物料信息
-        List<ProductBomDetail> list = productBomDetailService.list(q -> q.eq(ProductBomDetail::getProductId, dto.getId()));
+        List<ProductBomDetail> list = productBomDetailService.list(q -> q
+                .eq(ProductBomDetail::getProductId, dto.getId())
+                .orderByAsc(ProductBomDetail::getType)
+        );
         List<ProductBomDetailVo> productBomDetailVos = BeanUtil.copyToList(list, ProductBomDetailVo.class);
         productInfoService.attributeAssign(productBomDetailVos, ProductBomDetail::getMaterialId, (item, material) -> {
             item.setMaterialName(material.getName());

hx-sale/src/main/java/com/fjhx/sale/entity/ext/vo/ExtQuotationVo.java

@@ -54,4 +54,9 @@ public class ExtQuotationVo extends ExtQuotation {
      */
     private List<ExtQuotation> quotationTrendList;
 
+    /**
+     * 创建人
+     */
+    private String userName;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/ext/impl/ExtQuotationServiceImpl.java

@@ -30,10 +30,12 @@ import com.fjhx.sale.service.ext.ExtQuotationFollowService;
 import com.fjhx.sale.service.ext.ExtQuotationProductBomService;
 import com.fjhx.sale.service.ext.ExtQuotationProductService;
 import com.fjhx.sale.service.ext.ExtQuotationService;
+import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -84,7 +86,7 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
         wrapper.ge("eq", ExtQuotation::getCreateTime, dto.getBeginTime());
         wrapper.le("eq", ExtQuotation::getCreateTime, dto.getEndTime());
 
-        wrapper.ne("eq", ExtQuotation::getStatus, FlowStatusEnum1.UPDATE);
+        wrapper.ne("eq", ExtQuotation::getStatus, FlowStatusEnum1.UPDATE.getKey());
         wrapper.eq("eq", ExtQuotation::getStatus, dto.getStatus());
 
         Page<ExtQuotationVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -94,6 +96,9 @@ public class ExtQuotationServiceImpl extends ServiceImpl<ExtQuotationMapper, Ext
             return page;
         }
 
+        // 赋值用户名称
+        UserUtil.assignmentNickName(records, BasePo::getCreateUser, ExtQuotationVo::setUserName);
+
         // 赋值买方公司名称(客户)
         customerService.attributeAssign(records, ExtQuotationVo::getBuyCorporationId, (item, customer) -> {
             item.setBuyCorporationName(customer.getName());

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -134,9 +134,11 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         wrapper.ge("sq", SaleQuotation::getCreateTime, dto.getBeginTime());
         wrapper.le("sq", SaleQuotation::getCreateTime, dto.getEndTime());
 
-        wrapper.ne("sq", SaleQuotation::getStatus, FlowStatusEnum1.UPDATE);
+        wrapper.ne("sq", SaleQuotation::getStatus, FlowStatusEnum1.UPDATE.getKey());
         wrapper.eq("sq", SaleQuotation::getStatus, dto.getStatus());
 
+        wrapper.orderByDesc(SaleQuotation::getCreateTime);
+
 
         Page<SaleQuotationVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<SaleQuotationVo> records = page.getRecords();