1

src/main/java/com/fdkankan/sale/service/impl/RepairSaleService.java

@@ -186,8 +186,16 @@ public class RepairSaleService {
             }
 
             priceList.setRepairId(param.getRepairId());
+            if(priceList.getPriceListId() != null){
+                PriceList dbPriceList = priceListService.getById(priceList.getPriceListId());
+                if(dbPriceList.getStatus() != 1){
+                    priceListService.updateById(priceList);
+                }
+            }else {
+                priceListService.save(priceList);
+            }
+
         }
-        priceListService.saveOrUpdateBatch(param.getPriceLists());
         repairLogService.saveBySysUser(userId,param.getRepairId(),3,"维修报价");
     }
 

src/main/java/com/fdkankan/sale/vo/request/RepairInvoiceParam.java

@@ -1,6 +1,7 @@
 package com.fdkankan.sale.vo.request;
 
 import com.fdkankan.sale.common.RequestBase;
+import com.fdkankan.sale.util.Dateutils;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
@@ -17,16 +18,17 @@ public class RepairInvoiceParam extends RequestBase {
 
     private List<String> payTimeList;
 
-    public String getStartTime() {
+
+    public String getPayStartTime() {
         if(StringUtils.isBlank(payStartTime) && payTimeList != null && payTimeList.size() >0){
-            return payTimeList.get(0);
+            return Dateutils.getStartTime(payTimeList.get(0));
         }
         return payStartTime;
     }
 
-    public String getEndTime() {
+    public String getPayEndTime() {
         if(StringUtils.isBlank(payEndTime) && payTimeList != null && payTimeList.size() >1){
-            return payTimeList.get(1);
+            return Dateutils.getEndTime(payTimeList.get(1));
         }
         return payEndTime;
     }

src/main/resources/mapper/sale/RepairInvoiceMapper.xml

@@ -13,7 +13,7 @@
             and ri.create_time between #{param.startTime} and #{param.endTime}
         </if>
         <if test="param.payStartTime !=null and param.payStartTime != ''">
-            and rp.create_time between #{param.payStartTime} and #{param.payEndTime}
+            and rp.pay_time between #{param.payStartTime} and #{param.payEndTime}
         </if>
         order by ri.create_time desc
     </select>