考勤

src/main/java/com/gogirl/shared/product/PurchaseSkuPOI.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.net.URL;
 
 /**
@@ -21,30 +22,39 @@ public class PurchaseSkuPOI {
 
     @ExcelProperty("sku")
     @ApiModelProperty("sku码")
-    @ColumnWidth(50)
+    @ColumnWidth(20)
     private String sku;
 
     @ExcelIgnore
     @ApiModelProperty("商品图")
-    @ColumnWidth(50)
+    @ColumnWidth(20)
     private String picturePath;
 
     @ExcelProperty("名称")
     @ApiModelProperty("商品名字")
-    @ColumnWidth(50)
+    @ColumnWidth(20)
     private String skuName;
 
+    @ColumnWidth(10)
+    @ExcelProperty("店铺看到的价格")
+    private BigDecimal shopPrice;
+
+    @ColumnWidth(10)
+    @ExcelProperty("采购价格")
+    private BigDecimal purchasePrice;
+
     @ExcelProperty("分类")
     @ApiModelProperty("分类名称")
-    @ColumnWidth(50)
+    @ColumnWidth(20)
     private String skuType;
 
     @ExcelProperty("型号")
-    @ColumnWidth(50)
+    @ColumnWidth(20)
     private String skuModel;
 
     @ExcelProperty(value = "sku图片")
     @ApiModelProperty("商品图")
     private URL imagesUrl;
 
+
 }

src/main/resources/mapper/product/PurchaseSkuMapper.xml

@@ -27,7 +27,7 @@
 
 
     <select id="purchaseSkuExcel" resultType="com.gogirl.shared.product.PurchaseSkuPOI">
-        SELECT t1.sku, t1.picture_path, t1.sku_name, t2.`name` sku_type, t1.sku_model
+        SELECT t1.sku, t1.picture_path, t1.sku_name, t2.`name` sku_type, t1.sku_model, t1.shop_price, t1.purchase_price
         from purchase_sku t1
                  LEFT JOIN purchase_sku_type t2 on t1.sku_type = t2.id
 

src/main/resources/mapper/store/TakeLeaveEventMapper.xml

@@ -6,11 +6,12 @@
         SELECT *
         from take_leave_event
         where ((start_time < #{endTime} and end_time > #{endTime})
-            or (start_time < #{startTime} and start_time > #{startTime})
-            or (start_time > #{startTime} and end_time < #{endTime}))
+            or (start_time < #{startTime} and end_time > #{startTime})
+            or (start_time >= #{startTime} and end_time <= #{endTime}))
           and apply_technician_id = #{applyTechnicianId}
           and `status` != 3
     </select>
+
     <select id="takeLeaveId" resultType="com.gogirl.domain.store.oa.OvertimeRecord">
         SELECT t1.*
         from over_time_record t1

src/test/java/com/gogirl/Test.java

@@ -676,7 +676,7 @@ public class Test {
         List<PurchaseSkuPOI> purchaseSkuPOIList = purchaseSkuMapper.purchaseSkuExcel();
 //        List<PurchaseSkuPOI>
 
-        String fileName = "/Users/huluobin/purchaseSku2.xlsx";
+        String fileName = "/Users/huluobin/purchaseSku4.xlsx";
 
         purchaseSkuPOIList.forEach(purchaseSkuPOI -> {
             try {
@@ -693,7 +693,6 @@ public class Test {
         });
 
         EasyExcel.write(fileName, PurchaseSkuPOI.class).sheet("purchaseSku").doWrite(purchaseSkuPOIList);
-
     }
 
 }