diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ScreenEnterpriseOutputDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ScreenEnterpriseOutputDTO.java index f2eb5838a1..7d3616f588 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ScreenEnterpriseOutputDTO.java +++ b/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.已删除 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/vegetableFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/vegetableFormDTO.java index 5894e66ed9..a36f9cf019 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/vegetableFormDTO.java +++ b/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; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AegetableResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/AegetableResultDTO.java new file mode 100644 index 0000000000..e8b369bb88 --- /dev/null +++ b/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 detailList; + + + @Data + public static class AegetableResultClildDTO implements Serializable { + + private String placeOrgName; + + private Double output; + + private Date growTime; + + private Date marketTime; + + + + } + + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/ScreenEnterpriseOutputController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/ScreenEnterpriseOutputController.java index deb74321fe..01f68ea0ea 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/ScreenEnterpriseOutputController.java +++ b/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 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 listDetail = screenEnterpriseOutputService.getVegetableOutputListDetail(); + return new Result().ok(listDetail); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/ScreenEnterpriseOutputDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/ScreenEnterpriseOutputDao.java index 99946a4bb2..632ebeaf47 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/ScreenEnterpriseOutputDao.java +++ b/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 { - + + List selectVegetableOutputList(); + + List selectVegetableOutputListDetails(); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/ScreenEnterpriseOutputEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/ScreenEnterpriseOutputEntity.java index db9747637e..fa20e1998f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/ScreenEnterpriseOutputEntity.java +++ b/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; /** * 种植时间 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/ScreenEnterpriseOutputService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/ScreenEnterpriseOutputService.java index bfe4297af3..e025b244e8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/ScreenEnterpriseOutputService.java +++ b/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 getListVegetable(String placeOrgName); + + List selectVegetableOutputList(); + + List getVegetableOutputListDetail(); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/ScreenEnterpriseOutputServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/ScreenEnterpriseOutputServiceImpl.java index e401cf462e..ddfca85b14 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/ScreenEnterpriseOutputServiceImpl.java +++ b/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 selectVegetableOutputList() { + return baseDao.selectVegetableOutputList(); + } + + @Override + public List getVegetableOutputListDetail() { + return baseDao.selectVegetableOutputListDetails(); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/ScreenEnterpriseOutputDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/ScreenEnterpriseOutputDao.xml index f2da83d5bf..e7ffcad376 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/ScreenEnterpriseOutputDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/ScreenEnterpriseOutputDao.xml @@ -18,5 +18,49 @@ + + + + + + + + + + + + + + + + \ No newline at end of file