模块开发12

huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionReceiveServiceImpl.java

@@ -5,12 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import vip.xiaonuo.production.entity.ProductionReceive;
+import vip.xiaonuo.production.entity.ProductionWriteRate;
 import vip.xiaonuo.production.mapper.ProductionReceiveMapper;
+import vip.xiaonuo.production.mapper.ProductionWriteRateMapper;
 import vip.xiaonuo.production.param.ProductionReceiveParam;
 import vip.xiaonuo.production.service.IProductionReceiveService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -27,6 +30,8 @@ public class ProductionReceiveServiceImpl extends ServiceImpl<ProductionReceiveM
 
     @Autowired
     private ProductionReceiveMapper receiveMapper;
+    @Autowired
+    private ProductionWriteRateMapper writeRateMapper;
 
     @Override
     public List<ProductionReceive> getList(ProductionReceiveParam receiveParam) {
@@ -34,21 +39,31 @@ public class ProductionReceiveServiceImpl extends ServiceImpl<ProductionReceiveM
         String produceName = receiveParam.getProduceName();//可多选
         String orgId = receiveParam.getOrgId();
         Integer timeType = receiveParam.getTimeType();
-        QueryWrapper<ProductionReceive> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId)
+
+        QueryWrapper<ProductionWriteRate> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq(StringUtils.isNotBlank(orgId), "org_id", orgId)
                 .eq(StringUtils.isNotBlank(locationName), "location_name", locationName);
         if (StringUtils.isNotBlank(produceName)) {
-            queryWrapper.in("produce_name", produceName);
+            queryWrapper1.like("produce_name", produceName);
         }
-        queryWrapper.select(" convert(IFNULL(avg(rate),'0'),decimal(10,2)) rate,create_time createTime");
+        queryWrapper1.select(" convert(IFNULL(avg(production_rate),'0'),decimal(10,2)) productionRate, create_time createTime");
         if (0 == timeType) {
-            queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
+            queryWrapper1.groupBy("DATE_FORMAT(create_time,'%Y')");
         } else {
-            queryWrapper.ge("create_time", DateUtil.beginOfYear(new Date()));
-            queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
+            queryWrapper1.groupBy("DATE_FORMAT(create_time,'%Y-%m')");
+        }
+        queryWrapper1.orderByAsc("create_time");
+        List<ProductionWriteRate> writeRates = writeRateMapper.selectList(queryWrapper1);
+        List<ProductionReceive> list = new ArrayList<>();
+        if (writeRates.size() != 0) {
+            for (ProductionWriteRate writeRate : writeRates) {
+                ProductionReceive receive = new ProductionReceive();
+                receive.setRate(writeRate.getProductionRate());
+                receive.setCreateTime(writeRate.getCreateTime());
+                list.add(receive);
+            }
         }
-        queryWrapper.orderByAsc("create_time");
-        return receiveMapper.selectList(queryWrapper);
+        return list;
     }
 
 }