Browse Source

售后管理添加字段

yzc 1 year ago
parent
commit
a2cfe78e9b

+ 10 - 0
hx-jxst/src/main/java/com/fjhx/jxst/entity/after/po/AfterSalesRecord.java

@@ -70,4 +70,14 @@ public class AfterSalesRecord extends BasePo {
      */
     private String tenantId;
 
+    /**
+     * 售后说明
+     */
+    private String afterSalesRemark;
+
+    /**
+     * 售后金额
+     */
+    private String amount;
+
 }

+ 1 - 1
hx-jxst/src/main/java/com/fjhx/jxst/entity/after/po/AfterSalesRecordDetail.java

@@ -35,7 +35,7 @@ public class AfterSalesRecordDetail extends BasePo {
     private Long accessoriesId;
 
     /**
-     * 售后数量 备用字段
+     * 售后数量
      */
     private Long quantity;
 

+ 11 - 0
hx-jxst/src/main/java/com/fjhx/jxst/service/after/impl/AfterSalesRecordServiceImpl.java

@@ -34,6 +34,7 @@ import com.fjhx.mes.service.production.ProductionTaskDetailService;
 import com.fjhx.mes.service.work.WorkOrderBomService;
 import com.fjhx.mes.service.work.WorkOrderService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -74,6 +75,16 @@ public class AfterSalesRecordServiceImpl extends ServiceImpl<AfterSalesRecordMap
     @Override
     public Page<AfterSalesRecordVo> getPage(AfterSalesRecordSelectDto dto) {
         IWrapper<AfterSalesRecord> wrapper = getWrapper();
+
+        //关键字搜索
+        wrapper.keyword(dto.getKeyword(),
+                new SqlField("asr",AfterSalesRecord::getCode),
+                new SqlField("asr",AfterSalesRecord::getProductSn),
+                new SqlField("asr",AfterSalesRecord::getRemark),
+                new SqlField("asr",AfterSalesRecord::getAfterSalesRemark),
+                new SqlField("asr",AfterSalesRecord::getAmount)
+        );
+
         wrapper.orderByDesc("asr", AfterSalesRecord::getId);
         Page<AfterSalesRecordVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<AfterSalesRecordVo> records = page.getRecords();

+ 3 - 1
hx-jxst/src/main/resources/mapper/after/AfterSalesRecordMapper.xml

@@ -12,7 +12,9 @@
                asr.create_user,
                asr.create_time,
                asr.update_user,
-               asr.update_time
+               asr.update_time,
+               asr.after_sales_remark,
+               asr.amount
         from after_sales_record asr
             ${ew.customSqlSegment}
     </select>