From da8cca4d320908b672f439369e65e9e6a95374e3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 07 三月 2022 09:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index bd58309..2fb8c00 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -5,6 +5,9 @@
import javax.annotation.Resource;
import com.panzhihua.common.interfaces.OperLog;
+import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
+import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
+import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -45,6 +48,8 @@
private UserService userService;
@Resource
private CheckService checkService;
+ @Resource
+ private ComPbCheckUnitFeign pbCheckUnitFeign;
public static void main(String[] args) {
Date date = new Date();
@@ -262,4 +267,13 @@
}
return R.fail();
}
+
+ @ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
+ @PostMapping("/comPbCheckUnit/list")
+ public R getPbCheckUnitList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
+ if(comPbCheckUnit.getCommunityId() == null){
+ comPbCheckUnit.setCommunityId(this.getCommunityId());
+ }
+ return pbCheckUnitFeign.queryByList(comPbCheckUnit);
+ }
}
--
Gitblit v1.7.1