Merge remote-tracking branch 'origin/main'

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/product/vo/ProductCodePageRespVO.java

@@ -55,4 +55,6 @@ public class ProductCodePageRespVO {
     private Integer printNum;
 
     private String productPic;
+
+    private LocalDateTime createTime;
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/scanrecord/ScanRecordController.java

@@ -120,8 +120,8 @@ public class ScanRecordController {
     }
 
     @GetMapping("/staticScanRecord")
-    public CommonResult<Map<String,Object>> staticScanRecord() {
-        Map<String,Object> map =scanRecordService.staticScanRecord();
+    public CommonResult<Map<String,Object>> staticScanRecord(@RequestParam("type") Integer type) {
+        Map<String,Object> map =scanRecordService.staticScanRecord(type);
         return success(map);
     }
 }

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

@@ -168,6 +168,7 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
                  .select(ProductDO :: getSourceType)
                  .select(SpeciesDO :: getSpeciesName)
                  .select(ProductDO :: getPrintNum)
+                 .select(ProductDO :: getCreateTime)
                  .select(AgriculturalProductDO :: getProductPic)
                  .disableSubLogicDel()
                  .leftJoin(CropperDO.class,CropperDO :: getId,ProductDO :: getCropperId)

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/scanrecord/ScanRecordMapper.java

@@ -8,6 +8,7 @@ import com.cjy.traceability.framework.mybatis.core.mapper.BaseMapperX;
 import com.cjy.traceability.module.traceability.dal.dataobject.scanrecord.ScanRecordDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.cjy.traceability.module.traceability.controller.admin.scanrecord.vo.*;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 扫码记录 Mapper
@@ -44,7 +45,7 @@ public interface ScanRecordMapper extends BaseMapperX<ScanRecordDO> {
      */
     List<Map<String,Object>> getTraceability();
 
-     Long  staticScanRecordTotal();
-     Long staticScanRecordToday();
-     Long staticScanRecordYesterday();
+     Long  staticScanRecordTotal(@Param("type") Integer type);
+     Long staticScanRecordToday(@Param("type") Integer type);
+     Long staticScanRecordYesterday(@Param("type") Integer type);
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/scanrecord/ScanRecordService.java

@@ -70,5 +70,5 @@ public interface ScanRecordService {
      */
     Map<String,Object> getTraceability();
 
-    Map<String,Object> staticScanRecord();
+    Map<String,Object> staticScanRecord(Integer type);
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/scanrecord/ScanRecordServiceImpl.java

@@ -222,11 +222,11 @@ public class ScanRecordServiceImpl implements ScanRecordService {
 		return returnMap;
 	}
 	@Override
-	public Map<String, Object> staticScanRecord() {
+	public Map<String, Object> staticScanRecord(Integer type) {
 		Map<String,Object> map  = new HashMap<>(3);
-		map.put("totalScan",scanRecordMapper.staticScanRecordTotal());
-		map.put("todayScan",scanRecordMapper.staticScanRecordToday());
-		map.put("yesterdayScan",scanRecordMapper.staticScanRecordYesterday());
+			map.put("totalScan",scanRecordMapper.staticScanRecordTotal(type));
+			map.put("todayScan",scanRecordMapper.staticScanRecordToday(type));
+			map.put("yesterdayScan",scanRecordMapper.staticScanRecordYesterday(type));
 		return map;
 	}
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/agricultural/AgriculturalMapper.xml

@@ -15,7 +15,8 @@
             id,
             agricultural_name AS agriculturalName,
             manufacturer,
-            agricultural_unit AS agriculturalUnit
+            agricultural_unit AS agriculturalUnit,
+            agricultural_type AS agriculturalType
         FROM
             traceability_agricultural
         WHERE
@@ -23,4 +24,4 @@
           AND agricultural_status = 1
           AND husbandry_id = #{husbandryId}
     </select>
-</mapper>
+</mapper>

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/growrecord/GrowRecordMapper.xml

@@ -46,6 +46,9 @@
         <if test="reqVO.endTime !=null and reqVO.endTime!=''">
             and t1.end_time between #{reqVO.endTime[0]} and #{reqVO.endTime[1]}
         </if>
+        <if test="reqVO.blockId !=null and reqVO.blockId!='' ">
+            and t5.id=#{reqVO.blockId}
+        </if>
         order by t1.create_time desc
     </select>
     <select id="getDataCount" resultType="java.lang.Integer">

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/product/ProductMapper.xml

@@ -121,7 +121,7 @@
 
 
     <select id="getSelfOroducedProductsAndInventory" resultType="java.util.Map">
-        select t1.id, t1.processing_name as processingName,t1.inventory_production as inventoryProduction,t1.batch,t1.traceability_code as traceabilityCode
+        select   t1.processing_name as processingName,t1.inventory_production as inventoryProduction,t1.batch,t1.traceability_code as traceabilityCode,t1.id as  cropperId
         from traceability_product t1
         left join traceability_agricultural_product t2 on t1.cropper_id = t2.id
         where t1.deleted = 0

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/scanrecord/ScanRecordMapper.xml

@@ -50,14 +50,24 @@
 
     <select id="staticScanRecordTotal" resultType="java.lang.Long">
         select  count(id)as totalNum  from traceability_scan_record
+        <if test=" type == 2">
+            <where>
+                product_id in ( select  product_id from traceability_sale_record)
+            </where>
+        </if>
     </select>
 
     <select id="staticScanRecordToday" resultType="java.lang.Long">
         select count(id) as todayNum  from traceability_scan_record where DATE_FORMAT(create_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')
-
+         <if test="type ==2">
+             and product_id in(select  product_id from traceability_sale_record)
+         </if>
     </select>
 
     <select id="staticScanRecordYesterday" resultType="java.lang.Long">
         select count(id) as yesterday from traceability_scan_record where DATE_FORMAT(create_time,'%Y-%m-%d') =  DATE(DATE_SUB(NOW(), INTERVAL 1 DAY))
+        <if test="type ==2">
+            and product_id in(select  product_id from traceability_sale_record)
+        </if>
     </select>
 </mapper>