From 5e36c6690c4201672a03ae8aeedfb65c6ac55c48 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Mon, 25 Mar 2024 17:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScreenEnterpriseOutputController.java | 28 ++++++++++++------- .../ScreenEnterpriseOutputService.java | 2 ++ .../ScreenEnterpriseOutputServiceImpl.java | 16 +++++++++-- 3 files changed, 33 insertions(+), 13 deletions(-) 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 c0ca9f9d8d..deb74321fe 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 @@ -24,12 +24,14 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @@ -42,42 +44,47 @@ import java.util.Map; @RestController @RequestMapping("screenenterpriseoutput") public class ScreenEnterpriseOutputController { - + @Autowired private ScreenEnterpriseOutputService screenEnterpriseOutputService; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = screenEnterpriseOutputService.page(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { ScreenEnterpriseOutputDTO data = screenEnterpriseOutputService.get(id); return new Result().ok(data); } /** - * + * @param + * @return com.epmet.commons.tools.utils.Result * @description: 上报 * @author qushutong * @date 2024/3/22 14:52 - * @param - * @return com.epmet.commons.tools.utils.Result * @Version1.0 **/ @PostMapping("yifengScreen/submitOutput") - public Result submitOutput(@RequestBody vegetableFormDTO dto){ + public Result submitOutput(@RequestBody vegetableFormDTO dto) { //效验数据 // ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); screenEnterpriseOutputService.submitOutput(dto); return new Result(); } + + @GetMapping("yifengScreen/getVegetableByEnterprise/{placeOrgName}") + public Result> getVegetableByEnterprise(@PathVariable("placeOrgName") String placeOrgName) { + return new Result>().ok(screenEnterpriseOutputService.getListVegetable(placeOrgName)); + } + @PutMapping - public Result update(@RequestBody ScreenEnterpriseOutputDTO dto){ + public Result update(@RequestBody ScreenEnterpriseOutputDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); screenEnterpriseOutputService.update(dto); @@ -85,7 +92,7 @@ public class ScreenEnterpriseOutputController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); screenEnterpriseOutputService.delete(ids); @@ -94,11 +101,12 @@ public class ScreenEnterpriseOutputController { @PostMapping - public Result save(@RequestBody ScreenEnterpriseOutputDTO dto){ + public Result save(@RequestBody ScreenEnterpriseOutputDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); screenEnterpriseOutputService.save(dto); return new Result(); } + } \ No newline at end of file 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 a304c022a6..bfe4297af3 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 @@ -96,4 +96,6 @@ public interface ScreenEnterpriseOutputService extends BaseService getListVegetable(String placeOrgName); } \ 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 74c3bf658b..e401cf462e 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 @@ -65,8 +65,8 @@ public class ScreenEnterpriseOutputServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -105,7 +105,7 @@ public class ScreenEnterpriseOutputServiceImpl extends BaseServiceImpl vegetableList = dto.getVegetableList(); List screenEnterpriseOutputEntities = ConvertUtils.sourceToTarget(vegetableList, ScreenEnterpriseOutputEntity.class); @@ -113,4 +113,14 @@ public class ScreenEnterpriseOutputServiceImpl extends BaseServiceImpl getListVegetable(String placeOrgName) { + Map map = new HashMap(); + map.put("DEL_FLAG", "0"); + map.put("PLACE_ORG_NAME", placeOrgName); + List entityList = baseDao.selectByMap(map); + return entityList; + } + + } \ No newline at end of file