产量详情

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ScreenEnterpriseOutputDTO.java

@@ -51,7 +51,7 @@ public class ScreenEnterpriseOutputDTO implements Serializable {
     /**
      * 产量
      */
-	private String output;
+	private Double output;
 
     /**
      * 删除标识：0.未删除 1.已删除

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/vegetableFormDTO.java

@@ -35,7 +35,7 @@ public class vegetableFormDTO implements Serializable {
          * growTime : 2020-01-02 09:27:06
          * marketTime : 2020-01-02 09:27:06
          */
-        private String output;
+        private Double output;
         private String placeOrgName;
         private String vegetableCategory;
         private Date growTime;

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AegetableResultDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.resi.partymember.dto.partymember.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @description:  蔬菜产量详情
+ * @author qushutong
+ * @date 2024/3/22 15:08
+ * @param
+ * @return  [ {"西红柿":[{ "亿联":"100" }, { "移丰":"59" }]}, {"茄子":[{ "亿联":"100" }, { "移丰":"59" }]} ]
+ * @Version1.0
+ **/
+@Data
+public class AegetableResultDTO implements Serializable {
+
+    private String vegetableCategory;
+
+    private List<AegetableResultClildDTO> detailList;
+
+
+    @Data
+    public static class  AegetableResultClildDTO implements Serializable {
+
+        private String placeOrgName;
+
+        private Double output;
+
+        private Date growTime;
+
+        private Date marketTime;
+
+
+
+    }
+
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/ScreenEnterpriseOutputController.java

@@ -28,6 +28,7 @@ import com.epmet.modules.partymember.entity.ScreenEnterpriseOutputEntity;
 import com.epmet.modules.partymember.service.ScreenEnterpriseOutputService;
 import com.epmet.resi.partymember.dto.ScreenEnterpriseOutputDTO;
 import com.epmet.resi.partymember.dto.partymember.form.vegetableFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.AegetableResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -108,5 +109,36 @@ public class ScreenEnterpriseOutputController {
         return new Result();
     }
 
+    /**
+     *
+     * @description: z总产量列表
+     * @author qushutong
+     * @date 2024/3/26 17:29
+     * @param 
+     * @return com.epmet.commons.tools.utils.Result
+     * @Version1.0
+     **/
+    @GetMapping("yifengScreen/getVegetableOutputList")
+    public Result getVegetableOutputList() {
+        List<ScreenEnterpriseOutputEntity> list = screenEnterpriseOutputService.selectVegetableOutputList();
+        return new Result().ok(list);
+    }
+
 
+    
+    /**
+     *
+     * @description:
+     * @author qushutong
+     * @date 2024/3/26 17:30
+     * @param 
+     * @return com.epmet.commons.tools.utils.Result
+     * @Version1.0
+     **/
+    @GetMapping("yifengScreen/getVegetableOutputListDetail")
+    public Result getVegetableOutputListDetail() {
+        List<AegetableResultDTO> listDetail = screenEnterpriseOutputService.getVegetableOutputListDetail();
+        return new Result().ok(listDetail);
+    }
+    
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/ScreenEnterpriseOutputDao.java

@@ -19,8 +19,11 @@ package com.epmet.modules.partymember.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partymember.entity.ScreenEnterpriseOutputEntity;
+import com.epmet.resi.partymember.dto.partymember.result.AegetableResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 用于上报蔬菜的企业
  *
@@ -29,5 +32,8 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ScreenEnterpriseOutputDao extends BaseDao<ScreenEnterpriseOutputEntity> {
-	
+
+    List<ScreenEnterpriseOutputEntity> selectVegetableOutputList();
+
+    List<AegetableResultDTO> selectVegetableOutputListDetails();
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/ScreenEnterpriseOutputEntity.java

@@ -51,7 +51,7 @@ public class ScreenEnterpriseOutputEntity extends BaseEpmetEntity {
     /**
      * 产量
      */
-	private String output;
+	private Double output;
 
     /**
      * 种植时间

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/ScreenEnterpriseOutputService.java

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.partymember.entity.ScreenEnterpriseOutputEntity;
 import com.epmet.resi.partymember.dto.ScreenEnterpriseOutputDTO;
 import com.epmet.resi.partymember.dto.partymember.form.vegetableFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.AegetableResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -98,4 +99,8 @@ public interface ScreenEnterpriseOutputService extends BaseService<ScreenEnterpr
     Result submitOutput(vegetableFormDTO dto);
 
     List<ScreenEnterpriseOutputEntity>  getListVegetable(String placeOrgName);
+
+    List<ScreenEnterpriseOutputEntity> selectVegetableOutputList();
+
+    List<AegetableResultDTO> getVegetableOutputListDetail();
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/ScreenEnterpriseOutputServiceImpl.java

@@ -29,6 +29,7 @@ import com.epmet.modules.partymember.entity.ScreenEnterpriseOutputEntity;
 import com.epmet.modules.partymember.service.ScreenEnterpriseOutputService;
 import com.epmet.resi.partymember.dto.ScreenEnterpriseOutputDTO;
 import com.epmet.resi.partymember.dto.partymember.form.vegetableFormDTO;
+import com.epmet.resi.partymember.dto.partymember.result.AegetableResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -122,5 +123,15 @@ public class ScreenEnterpriseOutputServiceImpl extends BaseServiceImpl<ScreenEnt
         return entityList;
     }
 
+    @Override
+    public List<ScreenEnterpriseOutputEntity> selectVegetableOutputList() {
+        return baseDao.selectVegetableOutputList();
+    }
+
+    @Override
+    public List<AegetableResultDTO> getVegetableOutputListDetail() {
+        return baseDao.selectVegetableOutputListDetails();
+    }
+
 
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/ScreenEnterpriseOutputDao.xml

@@ -18,5 +18,49 @@
         <result property="marketTime" column="MARKET_TIME"/>
     </resultMap>
 
+    <select id="selectVegetableOutputList" resultMap="screenEnterpriseOutputMap">
+
+        SELECT
+            SUM( o.OUTPUT ) as OUTPUT,
+            o.VEGETABLE_CATEGORY
+        FROM
+            screen_enterprise_output o
+        WHERE
+            o.DEL_FLAG = '0'
+        GROUP BY
+            o.VEGETABLE_CATEGORY
+
+
+    </select>
+
+    <resultMap type="com.epmet.resi.partymember.dto.partymember.result.AegetableResultDTO" id="selectVegetableOutputListDetailsMap">
+        <result property="vegetableCategory" column="VEGETABLE_CATEGORY"/>
+        <collection property="detailList" ofType="com.epmet.resi.partymember.dto.partymember.result.AegetableResultDTO$AegetableResultClildDTO">
+            <result property="placeOrgName" column="PLACE_ORG_NAME"/>
+            <result property="output" column="OUTPUT"/>
+            <result property="growTime" column="GROW_TIME"/>
+            <result property="marketTime" column="MARKET_TIME"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectVegetableOutputListDetails" resultMap="selectVegetableOutputListDetailsMap">
+        SELECT
+            o1.VEGETABLE_CATEGORY,
+            o2.PLACE_ORG_NAME,
+            o2.GROW_TIME,
+            o2.MARKET_TIME,
+            o2.OUTPUT
+        FROM
+            screen_enterprise_output o1
+            LEFT JOIN screen_enterprise_output o2 ON o1.VEGETABLE_CATEGORY = o2.VEGETABLE_CATEGORY
+        WHERE
+            o1.DEL_FLAG = '0'
+            AND o2.DEL_FLAG = '0'
+        GROUP BY
+            o1.VEGETABLE_CATEGORY
+    </select>
+
+
+
 
 </mapper>