调整打印溯源码

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/salerecord/vo/SaleRecordSaveReqVO.java

@@ -37,4 +37,6 @@ public class SaleRecordSaveReqVO {
     @Schema(description = "销售金额")
     private BigDecimal salesVolume;
 
+    private Integer printNum;
+
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/product/ProductMapper.java

@@ -169,7 +169,7 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
                  .select(ProductDO :: getPrintNum)
                  .leftJoin(CropperDO.class,CropperDO :: getId,ProductDO :: getCropperId)
                  .leftJoin(SpeciesDO.class,SpeciesDO :: getId,CropperDO ::getSpeciesId)
-                 .between(reqVO.getProcessingTime() !=null,ProductDO :: getProcessingTime,reqVO.getProcessingTime(),reqVO.getProcessingTime())
+                 .between(reqVO.getProcessingTime() !=null,ProductDO :: getProcessingTime,reqVO.getProcessingTime() == null? "" :reqVO.getProcessingTime()[0],reqVO.getProcessingTime() == null? "" :reqVO.getProcessingTime()[1])
                  .like(StringUtil.isNotBlank(reqVO.getProcessingName()),ProductDO :: getProcessingName,reqVO.getProcessingName())
                  .orderByDesc(ProductDO :: getProcessingTime)
           );

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/salerecord/SaleRecordMapper.java

@@ -83,7 +83,7 @@ public interface SaleRecordMapper extends BaseMapperX<SaleRecordDO> {
                 .leftJoin(ProductDO.class,ProductDO :: getId,SaleRecordDO :: getProductId)
                 .leftJoin(CropperDO.class,CropperDO :: getId,ProductDO :: getCropperId )
                 .leftJoin(SpeciesDO.class,SpeciesDO :: getId,CropperDO ::getSpeciesId)
-                .between(pageReqVO.getCreateTime() !=null,ProductDO :: getCreateTime,pageReqVO.getCreateTime(),pageReqVO.getCreateTime())
+                .between(pageReqVO.getCreateTime() !=null,ProductDO :: getCreateTime,pageReqVO.getCreateTime() == null? "" :pageReqVO.getCreateTime()[0],pageReqVO.getCreateTime() == null? "" :pageReqVO.getCreateTime()[1])
                 .like(StringUtil.isNotBlank(pageReqVO.getProcessingName()),ProductDO :: getProcessingName,pageReqVO.getProcessingName())
                 .orderByDesc(SaleRecordDO :: getCreateTime)
         );

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/salerecord/SaleRecordServiceImpl.java

@@ -105,6 +105,7 @@ public class SaleRecordServiceImpl implements SaleRecordService {
     public void changePrintNum(SaleRecordSaveReqVO saleRecordSaveReqVO) {
         SaleRecordDO saleRecordDO = saleRecordMapper.selectById(saleRecordSaveReqVO.getId());
         Integer printNum = saleRecordDO.getPrintNum() == null? 0 : saleRecordDO.getPrintNum();
+        printNum +=saleRecordSaveReqVO.getPrintNum();
         SaleRecordDO updateSaleRecord = new SaleRecordDO().setId(saleRecordDO.getId()).setPrintNum(printNum);
         saleRecordMapper.updateById(updateSaleRecord);
     }