Merge remote-tracking branch 'origin/main'

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/cropper/vo/CropperPageReqVO.java

@@ -19,6 +19,9 @@ public class CropperPageReqVO extends PageParam {
     @Schema(description = "种植地块", example = "9895")
     private Integer blockId;
 
+    @Schema(description = "基地id")
+    private Integer baseId;
+
     @Schema(description = "产品名称", example = "21084")
     private Integer productId;
 

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/recoveryrecord/vo/RecoveryRecordPageReqVO.java

@@ -19,6 +19,9 @@ public class RecoveryRecordPageReqVO extends PageParam {
     @Schema(description = "农作物ID", example = "1064")
     private Integer cropperId;
 
+    @Schema(description = "基地id")
+    private Integer baseId;
+
     @Schema(description = "产品批次")
     private Integer batch;
 

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/recoveryrecord/RecoveryRecordMapper.java

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cjy.traceability.framework.common.pojo.PageResult;
 import com.cjy.traceability.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cjy.traceability.framework.mybatis.core.mapper.BaseMapperX;
+import com.cjy.traceability.module.traceability.controller.admin.block.vo.BlockSaveReqVO;
+import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO;
+import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.recoveryrecord.RecoveryRecordDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.cjy.traceability.module.traceability.controller.admin.recoveryrecord.vo.*;
@@ -24,6 +27,7 @@ public interface RecoveryRecordMapper extends BaseMapperX<RecoveryRecordDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<RecoveryRecordDO>()
                 .eqIfPresent(RecoveryRecordDO::getCropperId, reqVO.getCropperId())
                 .eqIfPresent(RecoveryRecordDO::getBatch, reqVO.getBatch())
+//                .likeLeft(BlockDO::getBaseId, reqVO.getBaseId())
                 .likeIfPresent(RecoveryRecordDO::getProductName, reqVO.getProductName())
                 .eqIfPresent(RecoveryRecordDO::getProduction, reqVO.getProduction())
                 .betweenIfPresent(RecoveryRecordDO::getJobTime, reqVO.getJobTime())

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/husbandryrecord/HusbandryRecordServiceImpl.java

@@ -47,8 +47,8 @@ public class HusbandryRecordServiceImpl implements HusbandryRecordService {
 			JSONArray jsonArray = new JSONArray(agriculturalJson);
 			for (Object obj : jsonArray) {
 				JSONObject jsonObject = new JSONObject(obj);
-				jsonObject.put("creator", husbandryRecord.getCreator());
-				jsonObject.put("updater", husbandryRecord.getUpdater());
+				jsonObject.put("creator", husbandryRecord.getCreator() == null ? husbandryRecord.getUpdater(): husbandryRecord.getCreator());
+				jsonObject.put("updater", husbandryRecord.getUpdater() == null ? husbandryRecord.getCreator(): husbandryRecord.getUpdater());
 				husbandryRecordMapper.insertAgriculturalUsed(husbandryRecord.getId(), jsonObject);
 			}
 		}
@@ -64,14 +64,14 @@ public class HusbandryRecordServiceImpl implements HusbandryRecordService {
 		HusbandryRecordDO updateObj = BeanUtils.toBean(updateReqVO, HusbandryRecordDO.class);
 		husbandryRecordMapper.updateById(updateObj);
 		// 删除已添加农资记录
-		agriculturalUsedMapper.deleteByHusbandryId(updateReqVO.getHusbandryId());
+		agriculturalUsedMapper.deleteByHusbandryId(updateReqVO.getId());
 		if (StringUtil.isNotBlank(updateReqVO.getAgriculturalJson())) {
 			JSONArray jsonArray = new JSONArray(updateReqVO.getAgriculturalJson());
 			for (Object obj : jsonArray) {
 				JSONObject jsonObject = new JSONObject(obj);
-				jsonObject.put("creator", updateObj.getCreator());
-				jsonObject.put("updater", updateObj.getUpdater());
-				husbandryRecordMapper.insertAgriculturalUsed(updateReqVO.getHusbandryId(),jsonObject);
+				jsonObject.put("creator", updateObj.getCreator() == null ? updateObj.getUpdater(): updateObj.getCreator());
+				jsonObject.put("updater", updateObj.getUpdater() == null ? updateObj.getCreator(): updateObj.getUpdater());
+				husbandryRecordMapper.insertAgriculturalUsed(updateReqVO.getId(),jsonObject);
 			}
 		}
 

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/product/ProductServiceImpl.java

@@ -214,7 +214,7 @@ public class ProductServiceImpl implements ProductService {
         List<Map<String, Object>> saleRecordList = saleRecordMapper.selectProductSaleRecord(Integer.parseInt(productMap.get("id").toString()));
         map.put("saleRecord", saleRecordList);
         //5. 产品农业
-        if ("1".equals(productMap.get("sourceType"))) {
+        if ( 1==Integer.parseInt(productMap.get("sourceType").toString())) {
             Map<String, Object> cropperAgriculture = new HashMap<>(1);
             List<Map<String, Object>> agriculture = husbandryRecordService.getHusbandryRecordListByBatch(Integer.parseInt(productMap.get("cropperId").toString()), Integer.parseInt(productMap.get("batch").toString()));
             cropperAgriculture.put("cropperName", productMap.get("processingName").toString());
@@ -235,7 +235,7 @@ public class ProductServiceImpl implements ProductService {
         }
         List<Map<String, Object>> materialList = new ArrayList<>();
         // 获取地块 基地信息
-        if (productMap.get("sourceType").equals("1")) {
+        if ( 1== Integer.parseInt(productMap.get("sourceType").toString())) {
             List<Map<String, Object>> baseBlockList = blockMapper.selectBaseBlock(productMap.get("cropperId").toString());
             Map<String, Object> baseBlockMap = new HashMap<>(1);
             baseBlockMap.put("cropperName", productMap.get("processingName").toString());

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/cropper/CropperMapper.xml

@@ -32,7 +32,7 @@
             <if test="reqVO.harvestTime != null and reqVO.harvestTime.length == 2">
                 AND t1.harvest_time BETWEEN #{reqVO.harvestTime[0]} AND #{reqVO.harvestTime[1]}
             </if>
-            <if test="reqVO.plantEnd != null and reqVO.plantEnd != ''"> AND plant_end = #{reqVO.plantEnd}</if>
+            <if test="reqVO.baseId != null and reqVO.baseId != ''"> AND t4.base_id = #{reqVO.baseId}</if>
             AND t1.deleted = 0
             AND t1.plant_end = 1
         </where>