0514

src/main/java/cn/ezhizao/project/business/controller/BizOutsourcedOrderDetailController.java

@@ -53,6 +53,12 @@ public class BizOutsourcedOrderDetailController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(BizOutsourcedOrderDetail bizOutsourcedOrderDetail) throws NoSuchFieldException, IllegalAccessException
     {
+        if(bizOutsourcedOrderDetail.getStartTime()!=null) {
+            bizOutsourcedOrderDetail.setStartTime(bizOutsourcedOrderDetail.getStartTime()+ " 00:00:00");
+        }
+        if(bizOutsourcedOrderDetail.getEndTime()!=null) {
+            bizOutsourcedOrderDetail.setEndTime(bizOutsourcedOrderDetail.getEndTime()+ " 23:59:59");
+        }
         setTenantId(bizOutsourcedOrderDetail);
         startPage();
         List<BizOutsourcedOrderDetail> list = bizOutsourcedOrderDetailService.getList(bizOutsourcedOrderDetail);

src/main/java/cn/ezhizao/project/business/controller/BizReturnReceiptController.java

@@ -49,6 +49,12 @@ public class BizReturnReceiptController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(BizReturnReceipt bizReturnReceipt) throws NoSuchFieldException, IllegalAccessException
     {
+        if(bizReturnReceipt.getStartTime()!=null) {
+            bizReturnReceipt.setStartTime(bizReturnReceipt.getStartTime()+ " 00:00:00");
+        }
+        if(bizReturnReceipt.getEndTime()!=null) {
+            bizReturnReceipt.setEndTime(bizReturnReceipt.getEndTime()+ " 23:59:59");
+        }
         final String supplierId = request.getHeader("tenantId");
         bizReturnReceipt.setSupplierId(Long.parseLong(supplierId));
         startPage();
@@ -81,43 +87,44 @@ public class BizReturnReceiptController extends BaseController
     {
         final String supplierId = request.getHeader("tenantId");
         bizReturnReceipt.setSupplierId(Long.parseLong(supplierId));
-        //若有id，则说将之前的明细删除不生成新的单号
-        if (bizReturnReceipt.getId() != null) {
-            List<Long> ids = new ArrayList<>();
-        } else {
-            /* 生成单号 */
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yy"); // 定义日期格式
-            String formattedDate = dateFormat.format(new Date());
-            String codeValue;
-            String codeType = "returnReceiveCode";
-            //查询redis中外协单号的值
-            String previous = redisCache.hasKey(codeType) ? redisCache.getCacheObject(codeType) :"";
-            //若不存在，则直接存入
-            if (previous.isEmpty()) {
-                previous = ("SHD" + formattedDate + "000001");
-            } else {
-                codeValue=previous;
-                int lastFourDigits = Integer.parseInt(codeValue.substring(5, 10));
-                lastFourDigits += 1; // 加1
-                codeValue = codeValue.substring(0, 5) + String.format("%05d", lastFourDigits);
-                previous=codeValue;
-            }
-            //存到redis中
-            redisCache.setCacheObject(codeType, previous);
-            bizReturnReceipt.setFormCode(previous);
-        }
-        //向收回单主表存
-        bizReturnReceiptService.save(bizReturnReceipt);
-        //向收回单明细表存
-        bizReturnReceipt.getDetails().stream()
-                .forEach(bizReturnReceiptDetail -> {
-                    bizReturnReceiptDetail.setMasterId(bizReturnReceipt.getId());
-                    bizReturnReceiptDetail.setFormCode(bizReturnReceipt.getFormCode());
-                    bizReturnReceiptDetail.setSupplierId(bizReturnReceipt.getSupplierId());
-                    bizReturnReceiptDetail.setSupplierName(bizReturnReceipt.getSupplierName());
-                    bizReturnReceiptDetail.setFormDate(bizReturnReceipt.getFormDate());
-                });
-        return success(bizReturnReceiptDetailService.saveBatch(bizReturnReceipt.getDetails()));
+        return success();
+//        //若有id，则说将之前的明细删除不生成新的单号
+//        if (bizReturnReceipt.getId() != null) {
+//            List<Long> ids = new ArrayList<>();
+//        } else {
+//            /* 生成单号 */
+//            SimpleDateFormat dateFormat = new SimpleDateFormat("yy"); // 定义日期格式
+//            String formattedDate = dateFormat.format(new Date());
+//            String codeValue;
+//            String codeType = "returnReceiveCode";
+//            //查询redis中外协单号的值
+//            String previous = redisCache.hasKey(codeType) ? redisCache.getCacheObject(codeType) :"";
+//            //若不存在，则直接存入
+//            if (previous.isEmpty()) {
+//                previous = ("SHD" + formattedDate + "000001");
+//            } else {
+//                codeValue=previous;
+//                int lastFourDigits = Integer.parseInt(codeValue.substring(5, 10));
+//                lastFourDigits += 1; // 加1
+//                codeValue = codeValue.substring(0, 5) + String.format("%05d", lastFourDigits);
+//                previous=codeValue;
+//            }
+//            //存到redis中
+//            redisCache.setCacheObject(codeType, previous);
+//            bizReturnReceipt.setFormCode(previous);
+//        }
+//        //向收回单主表存
+//        bizReturnReceiptService.save(bizReturnReceipt);
+//        //向收回单明细表存
+//        bizReturnReceipt.getDetails().stream()
+//                .forEach(bizReturnReceiptDetail -> {
+//                    bizReturnReceiptDetail.setMasterId(bizReturnReceipt.getId());
+//                    bizReturnReceiptDetail.setFormCode(bizReturnReceipt.getFormCode());
+//                    bizReturnReceiptDetail.setSupplierId(bizReturnReceipt.getSupplierId());
+//                    bizReturnReceiptDetail.setSupplierName(bizReturnReceipt.getSupplierName());
+//                    bizReturnReceiptDetail.setFormDate(bizReturnReceipt.getFormDate());
+//                });
+//        return success(bizReturnReceiptDetailService.saveBatch(bizReturnReceipt.getDetails()));
     }
     /**
      * 修改外协单主

src/main/java/cn/ezhizao/project/business/domain/BizOutsourcedOrderDetail.java

@@ -140,6 +140,10 @@ public class BizOutsourcedOrderDetail extends BaseEntity
     private List<BizOutsourcedOrderDetailProcess> processes;
     @TableField(exist = false)
     private Integer receiptNum;
+    @TableField(exist = false)
+    private String startTime;
+    @TableField(exist = false)
+    private String endTime;
 
     @TableField(exist = false)
     private List<BizOutsourcedOrderDetailProcess> outsourcedOrderDetailProcessList;

src/main/java/cn/ezhizao/project/business/domain/BizReturnReceipt.java

@@ -64,6 +64,10 @@ public class BizReturnReceipt extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField(exist = false)
     private Date formEndDate;
+    @TableField(exist = false)
+    private String startTime;
+    @TableField(exist = false)
+    private String endTime;
 
     private Integer status;
 }

src/main/resources/mybatis/business/BizOutsourcedOrderDetailMapper.xml

@@ -16,7 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             <if test="formCode != null  and formCode != ''"> AND form_code = #{formCode}</if>
-            <if test="formDate != null "> AND form_date = #{formDate}</if>
+            <if test="startTime != null ">AND form_date &gt; #{startTime}</if>
+            <if test="endTime != null ">AND form_date &lt; #{endTime}</if>
             <if test="supplierName != null  and supplierName != ''"> AND supplier_name like concat('%', #{supplierName}, '%')</if>
             <if test="deliveryMethod != null "> AND delivery_method = #{deliveryMethod}</if>
             <if test="packagingMethod != null  and packagingMethod != ''"> AND packaging_method = #{packagingMethod}</if>
@@ -74,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productDescription != null  and productDescription != ''"> AND t1.product_description LIKE CONCAT('%', #{productDescription}, '%')</if>
             <if test="originalCarrier != null "> AND t1.original_carrier LIKE CONCAT('%', #{originalCarrier}, '%')</if>
             <if test="newCarrier != null "> AND t1.new_carrier LIKE CONCAT('%', #{newCarrier}, '%')</if>
+            <if test="startTime != null ">AND form_date &gt; #{startTime}</if>
+            <if test="endTime != null ">AND form_date &lt; #{endTime}</if>
             <if test="supplierId != null "> AND t1.supplier_id = #{supplierId}</if>
         </trim>
     </select>

src/main/resources/mybatis/business/BizReturnReceiptMapper.xml

@@ -14,8 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             deleted = 0
             <if test="supplierId != null and supplierId != ''"> AND supplier_id = #{supplierId}</if>
             <if test="formCode != null and formCode != ''"> AND form_code LIKE CONCAT('%', #{formCode}, '%')</if>
-            <if test="formStartDate != null"> AND form_date &gt;= DATE_FORMAT(#{formStartDate}, '%Y-%m-%d')</if>
-            <if test="formEndDate != null"> AND form_date &lt;= DATE_FORMAT(#{formEndDate}, '%Y-%m-%d')</if>
+            <if test="startTime != null ">AND form_date &gt; #{startTime}</if>
+            <if test="endTime != null ">AND form_date &lt; #{endTime}</if>
         </trim>
     </select>