暂存12

app-admin/src/main/java/com/ruoyi/web/v2/v1/entity/JsProduceCode.java

@@ -44,5 +44,11 @@ public class JsProduceCode implements Serializable {
 
     private String oneCode;
 
+    @ApiModelProperty(value = "肉品合格证")
+    private String supplierName;
+
+    @ApiModelProperty(value = "肉品合格证")
+    private String purchaserName;
+
 
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/mapper/JsDistributionMapper.java

@@ -18,4 +18,6 @@ import java.util.List;
 public interface JsDistributionMapper extends BaseMapper<JsDistribution> {
 
     List<ProductionVo> getAllList(@Param("purchaserName")String purchaserName,@Param("startTime") String startTime, @Param("endTime")String endTime);
+
+    List<ProductionVo> getAllList1(@Param("purchaserName")String purchaserName,@Param("startTime") String startTime, @Param("endTime")String endTime,@Param("supplierName")String supplierName);
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsDistributionServiceImpl.java

@@ -130,12 +130,13 @@ public class JsDistributionServiceImpl extends ServiceImpl<JsDistributionMapper,
     @Override
     public PaginationUtil.PageResult<JsProduction> productionPage(Integer pageNum, Integer pageSize, String startTime, String endTime, String animalCertNo) {
         QueryWrapper<JsDistribution> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotEmpty(animalCertNo), "animal_cert_no", animalCertNo).groupBy("purchaser_name");
+        queryWrapper.eq(StringUtils.isNotEmpty(animalCertNo), "animal_cert_no", animalCertNo).groupBy("supplier_name,purchaser_name");
         if ("".equals(startTime) || null == startTime) {
 
         } else {
             queryWrapper.between("distribution_time", startTime + " 00:00:00", endTime + " 23:59:59");
         }
+        queryWrapper.orderByDesc("distribution_time");
         List<JsDistribution> jsDistributions = distributionMapper.selectList(queryWrapper);
         List<JsProduction> productions = new ArrayList<>();
         for (JsDistribution jsDistribution : jsDistributions) {
@@ -161,9 +162,9 @@ public class JsDistributionServiceImpl extends ServiceImpl<JsDistributionMapper,
             }
             List<ProductionVo> list = new ArrayList<>();
             if ("".equals(startTime) || null == startTime) {
-                list = distributionMapper.getAllList(jsDistribution.getPurchaserName(), null, null);
+                list = distributionMapper.getAllList1(jsDistribution.getPurchaserName(), null, null,jsDistribution.getSupplierName());
             } else {
-                list = distributionMapper.getAllList(jsDistribution.getPurchaserName(), startTime + " 00:00:00", endTime + " 23:59:59");
+                list = distributionMapper.getAllList1(jsDistribution.getPurchaserName(), startTime + " 00:00:00", endTime + " 23:59:59",jsDistribution.getSupplierName());
             }
             jsProduction.setProductionVos(list);
             productions.add(jsProduction);
@@ -173,13 +174,19 @@ public class JsDistributionServiceImpl extends ServiceImpl<JsDistributionMapper,
 
     @Override
     public AjaxResult editProduce(JsProduceCode jsProduceCode) {
-        String oneCode = jsProduceCode.getOneCode();
         QueryWrapper<JsProduceCode> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("one_code", oneCode);
-        JsProduceCode jsProduceCode1 = produceCodeMapper.selectOne(queryWrapper1);
-        jsProduceCode1.setAnimalCert(jsProduceCode.getAnimalCert());
-        jsProduceCode1.setMeatCert(jsProduceCode.getMeatCert());
-        produceCodeMapper.updateById(jsProduceCode1);
+        queryWrapper1.eq("purchaser_name",jsProduceCode.getPurchaserName()).eq("supplier_name",jsProduceCode.getSupplierName());
+        List<JsProduceCode> jsProduceCodes = produceCodeMapper.selectList(queryWrapper1);
+        for (JsProduceCode produceCode : jsProduceCodes) {
+            if ("".equals(produceCode.getAnimalCert()) || null == produceCode.getAnimalCert()) {
+
+            } else {
+                produceCode.setAnimalCert(jsProduceCode.getAnimalCert());
+                produceCode.setMeatCert(jsProduceCode.getMeatCert());
+                produceCodeMapper.updateById(produceCode);
+            }
+
+        }
         return success();
     }
 }

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsDrugCheckServiceImpl.java

@@ -336,11 +336,18 @@ public class JsDrugCheckServiceImpl extends ServiceImpl<JsDrugCheckMapper, JsDru
                 placeVo.setCreateTime(jsDistribution.getDistributionTime());
                 Supplier supplier = supplierMapper.selectSupplierById(jsDistribution.getSupplierId().longValue());
                 placeVo.setCargoOwner(supplier.getSupplierName());
+                JsProduceCode jsProduceCode = produceCodeMapper.selectOne(new QueryWrapper<JsProduceCode>().eq("one_code", jsDistribution.getOneCode()));
+                if (ObjectUtil.isNotEmpty(jsProduceCode)) {
+                    placeVo.setAnimalCert(jsProduceCode.getAnimalCert());
+                    placeVo.setMeatCert(jsProduceCode.getMeatCert());
+                }else {
                 AncimalDTO oneAnimal = purchaserMapper.getOneAnimal(jsDistribution.getPurchaserId().toString());
-                if (ObjectUtil.isNotEmpty(oneAnimal)) {
-                    placeVo.setAnimalCert(oneAnimal.getAnimalCert());
-                    placeVo.setMeatCert(oneAnimal.getMeatCert());
+                    if (ObjectUtil.isNotEmpty(oneAnimal)) {
+                        placeVo.setAnimalCert(oneAnimal.getAnimalCert());
+                        placeVo.setMeatCert(oneAnimal.getMeatCert());
+                    }
                 }
+
                 placeVo.setProduceName(jsDistribution.getProduceName());
                 Purchaser purchaser = purchaserMapper.selectPurchaserById((long) jsDistribution.getPurchaserId());
                 if (ObjectUtil.isNotEmpty(purchaser)) {
@@ -424,7 +431,11 @@ public class JsDrugCheckServiceImpl extends ServiceImpl<JsDrugCheckMapper, JsDru
                 }
                 summaryVo.setDongAmount(amount / 2.0);//胴体头数
                 DecimalFormat def = new DecimalFormat("0.00");
-                summaryVo.setWeight(def.format(values));//产品重量
+                if (values == 0) {
+                    summaryVo.setWeight("0.00");
+                } else {
+                    summaryVo.setWeight(def.format(values));//产品重量
+                }
 
                 HarmlessTreatment harmlessTreatment = harmlessTreatmentMapper.selectByEntraceBatchId(entranceBatch.getId());
 
@@ -454,7 +465,8 @@ public class JsDrugCheckServiceImpl extends ServiceImpl<JsDrugCheckMapper, JsDru
 
     public List<SummaryVo> mergeObjectsByTime(List<SummaryVo> list) {
         Map<Date, SummaryVo> map = new HashMap<>();
-
+        DecimalFormat def = new DecimalFormat("0.00");
+        Double values = 0.00;
         for (SummaryVo summaryVo : list) {
             map.compute(summaryVo.getCreateTime(), (k, v) -> {
                 if (v == null) {
@@ -468,7 +480,8 @@ public class JsDrugCheckServiceImpl extends ServiceImpl<JsDrugCheckMapper, JsDru
                 v.setQualifiedAmount(v.getQualifiedAmount() + summaryVo.getQualifiedAmount());
                 v.setTuzaiAmount(v.getTuzaiAmount() + summaryVo.getTuzaiAmount());
                 v.setDongAmount(v.getDongAmount() + summaryVo.getDongAmount());
-                v.setWeight(v.getWeight() + summaryVo.getWeight());
+                double v1 = Double.valueOf(v.getWeight()) + Double.valueOf(summaryVo.getWeight());
+                v.setWeight(def.format(v1));
                 v.setRoadDealAmount(v.getRoadDealAmount() + summaryVo.getRoadDealAmount());
                 v.setIllnessDeadAmount(v.getIllnessDeadAmount() + summaryVo.getIllnessDeadAmount());
                 v.setIllnessDiseaseAmount(v.getIllnessDiseaseAmount() + summaryVo.getIllnessDiseaseAmount());

app-admin/src/main/resources/mapper/JsDistributionMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="getAllList" resultType="com.ruoyi.web.v2.v1.entity.vo.ProductionVo">
 select b.productName produceName,a.afterWeight weight,a.amount amount,b.unit unit FROM
-(select produce_name produceName,SUM(after_weight) afterWeight,SUM(amount) amount FROM js_distribution where purchaser_name=#{purchaserName}
+(select produce_name produceName,convert(SUM(after_weight),decimal(10,2)) afterWeight,SUM(amount) amount FROM js_distribution where purchaser_name=#{purchaserName}
         <if test="startTime != null">
             AND distribution_time between #{startTime} and #{endTime}
         </if>
@@ -14,4 +14,18 @@ GROUP BY produce_name)
 on a.produceName=b.productName
 
     </select>
+
+    <select id="getAllList1" resultType="com.ruoyi.web.v2.v1.entity.vo.ProductionVo">
+        select b.productName produceName,a.afterWeight weight,a.amount amount,b.unit unit FROM
+        (select produce_name produceName,convert(SUM(after_weight),decimal(10,2)) afterWeight,SUM(amount) amount FROM js_distribution where purchaser_name=#{purchaserName}
+        and supplier_name=#{supplierName}
+        <if test="startTime != null">
+            AND distribution_time between #{startTime} and #{endTime}
+        </if>
+        GROUP BY produce_name)
+        as a right JOIN
+        (select product_name productName,unit unit FROM product_category WHERE del_flag='0') AS b
+        on a.produceName=b.productName
+
+    </select>
 </mapper>