traceability
/
agricultural-products-traceability-new
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整溯源扫码

Browse Source
main
masong 2 years ago
parent 035bdaee88
commit f7d726a909
3 changed files with 48 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java
  2. 1
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/product/ProductMapper.java
  3. 37
      cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/product/ProductServiceImpl.java

15
cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java
Unescape View File

@ -8,12 +8,16 @@ import com.cjy.traceability.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.cjy.traceability.module.traceability.dal.dataobject.base.TraceabilityBaseDO;
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.cropper.CropperDO;
import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.ibatis.annotations.Mapper;
import com.cjy.traceability.module.traceability.controller.admin.block.vo.*;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 地块信息 Mapper
*
@ -38,4 +42,15 @@ public interface BlockMapper extends BaseMapperX<BlockDO> {
default Long selectBlockNumBaseId(Integer baseId){
return selectCount(BlockDO::getBaseId,baseId);
}
default List<Map<String,Object>> selectBaseBlock(String cropperId){
return selectJoinMaps(new MPJLambdaWrapper<BlockDO>()
.selectAs(BlockDO :: getBlockName,"blockName")
.selectAs(BlockDO :: getBlockColor,"blockColor")
.selectAs(BlockDO :: getPositionStr,"positionStr")
.selectAs(TraceabilityBaseDO :: getBaseName,"baseName")
.leftJoin(TraceabilityBaseDO.class,TraceabilityBaseDO::getBaseName,BlockDO :: getBaseId)
.leftJoin(CropperDO.class,CropperDO ::getBlockId,BlockDO :: getId)
.eq(CropperDO :: getId, cropperId)
);
}
}

1
cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/product/ProductMapper.java
Unescape View File

@ -117,6 +117,7 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
.selectAs(ProductDO :: getSourceType, "sourceType")
.selectAs(ProductDO :: getCropperId,"cropperId")
.select(ProductDO :: getBatch)
.select(ProductDO :: getId)
.selectAs(AgriculturalProductDO :: getProductBreed,"productBreed")
.selectAs(SpeciesDO :: getSpeciesName,"speciesName")
.selectAs(VarietyDO :: getVarietyName,"varietyName")

37
cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/product/ProductServiceImpl.java
Unescape View File

@ -3,9 +3,11 @@ package com.cjy.traceability.module.traceability.service.product;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cjy.traceability.module.traceability.dal.dataobject.materials.MaterialsDO;
import com.cjy.traceability.module.traceability.dal.mysql.block.BlockMapper;
import com.cjy.traceability.module.traceability.dal.mysql.husbandry.HusbandryMapper;
import com.cjy.traceability.module.traceability.dal.mysql.materials.MaterialsMapper;
import com.cjy.traceability.module.traceability.dal.mysql.processingworkshop.ProcessingWorkshopMapper;
import com.cjy.traceability.module.traceability.service.husbandryrecord.HusbandryRecordService;
import com.cjy.traceability.module.traceability.utils.TraceabilityCodeUtil;
import org.springframework.stereotype.Service;
@ -31,6 +33,7 @@ import com.cjy.traceability.module.traceability.dal.mysql.scanrecord.ScanRecordM
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -69,7 +72,10 @@ public class ProductServiceImpl implements ProductService {
@Resource
private ProcessingWorkshopMapper processingWorkshopMapper;
@Resource
private BlockMapper blockMapper;
@Resource
private HusbandryRecordService husbandryRecordService;
@Override
@Transactional
public Integer createProduct(ProductSaveReqVO createReqVO) {
@ -204,19 +210,40 @@ public class ProductServiceImpl implements ProductService {
//5. 产品农业
if ("1".equals(productMap.get("sourceType"))) {
Map<String, Object> cropperAgriculture = new HashMap<>(1);
List<Map<String, Object>> agriculture = husbandryRecordMapper.getHusbandryRecordListByBatch(Integer.parseInt(productMap.get("cropperId").toString()), Integer.parseInt(productMap.get("batch").toString()));
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());
cropperAgriculture.put("agriculture", agriculture);
map.put("agricultureRecord", cropperAgriculture);
} else {
Map<String, Object> cropperAgriculture = new HashMap<>(rawMaterials.size());
List<Map<String,Object>> agricultureRecord = new ArrayList<>();
for (Map<String, Object> rawMaterial : rawMaterials) {
List<Map<String, Object>> agriculture = husbandryRecordMapper.getHusbandryRecordListByBatch(Integer.parseInt(rawMaterial.get("cropperId").toString()), Integer.parseInt(rawMaterial.get("batch").toString()));
List<Map<String, Object>> agriculture = husbandryRecordService.getHusbandryRecordListByBatch(Integer.parseInt(rawMaterial.get("cropperId").toString()), Integer.parseInt(rawMaterial.get("batch").toString()));
Map<String, Object> cropperAgriculture = new HashMap<>(2);
cropperAgriculture.put("cropperName", rawMaterial.get("productName").toString());
cropperAgriculture.put("agriculture", agriculture);
map.put("agricultureRecord", cropperAgriculture);
agricultureRecord.add(cropperAgriculture);
}
map.put("agricultureRecord", agricultureRecord);
}
List<Map<String,Object>> materialList = new ArrayList<>();
// 获取地块 基地信息
if(productMap.get("sourceType").equals("1")){
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());
baseBlockMap.put("baseBlockList",baseBlockList);
materialList.add(baseBlockMap);
}else{
for(Map<String,Object> materials : rawMaterials){
List<Map<String,Object>> baseBlockList = blockMapper.selectBaseBlock(productMap.get("cropperId").toString());
Map<String, Object> baseBlockMap = new HashMap<>(2);
baseBlockMap.put("cropperName",productMap.get("processingName").toString());
baseBlockMap.put("baseBlockList",baseBlockList);
materialList.add(baseBlockMap);
}
}
map.put("baseBlock",materialList);
ScanRecordDO scanRecordDO = new ScanRecordDO()
.setProvince(province)
.setCity(city)

Write Preview
Loading…
Cancel
Save