From 047dc0fe088f45d298822d4fc1bbe39c0a21fab7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 22 二月 2022 09:45:25 +0800
Subject: [PATCH] 修复bug
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 2
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java | 79 +++++++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java
new file mode 100644
index 0000000..88d9f47
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPbCheckUnitApi.java
@@ -0,0 +1,79 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
+import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+/**
+ * title: 党建-报到单位(ComPbCheckUnit) 控制层
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 党建-报到单位
+ *
+ * @author lyq
+ * @date 2022-02-16 16:22:18
+ */
+
+@Slf4j
+@Api(tags = {"党建-报到单位"})
+@RestController
+@RequestMapping("/checkUnit")
+public class ComPbCheckUnitApi extends BaseController {
+
+ @Resource
+ private ComPbCheckUnitFeign comPbCheckUnitService;
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comPbCheckUnit 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-02-16 16:22:18
+ */
+ @ApiOperation(value = "分页查询报道单位", response = ComPbCheckUnitVo.class)
+ @PostMapping("/page")
+ public R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
+ comPbCheckUnit.setCommunityId(this.getCommunityId());
+ return this.comPbCheckUnitService.queryByPage(comPbCheckUnit);
+ }
+
+ /**
+ * description detailById 查询详情
+ *
+ * @param id 主键id
+ * @return 详情数据
+ * @author lyq
+ * @date 2022-02-16 16:22:18
+ */
+ @ApiOperation(value = "查询报道单位", response = ComPbCheckUnitVo.class)
+ @GetMapping("/detail")
+ public R detailById(@RequestParam("id") Long id) {
+ return this.comPbCheckUnitService.detailById(id);
+ }
+
+ /**
+ * description queryByPage 查询列表
+ *
+ * @param comPbCheckUnit 请求参数
+ * @return 列表数据
+ * @author lyq
+ * @date 2022-02-16 16:22:18
+ */
+ @ApiOperation(value = "查询报道单位列表", response = ComPbCheckUnitVo.class)
+ @PostMapping("/list")
+ public R queryByList(@RequestBody PageComPbCheckUnitDto comPbCheckUnit) {
+ comPbCheckUnit.setCommunityId(this.getCommunityId());
+ return this.comPbCheckUnitService.queryByList(comPbCheckUnit);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index c900f4b..277f6a0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -616,7 +616,7 @@
if (comPbMemberDO == null) {
return R.fail("未找到党员认证信息");
}
- BeanUtils.copyProperties(partyBuildingMemberVO, comPbMemberDO);
+// BeanUtils.copyProperties(partyBuildingMemberVO, comPbMemberDO);
comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
if (partyBuildingMemberVO.getAuditResult() != null && partyBuildingMemberVO.getAuditResult().equals(3)) {
comPbMemberDO.setRefuseReason(partyBuildingMemberVO.getRefuseReason());
--
Gitblit v1.7.1