提交

blade-service-api/blade-rkxx-api/src/main/java/org/springblade/modules/entity/RkxxEntity.java

@@ -11,6 +11,18 @@ public class RkxxEntity extends BaseEntity {
 
 	private String ryxb;
 	private String rydz;
+	private String ryMz;
+	private String ryHyzk;
+	private String ryWhcd;
+	private String ryZzmm;
+	private String ryByzk;
+	private String ryHyzkDm;
+	private String ryWhcdDm;
+	private String ryZzmmDm;
+	private String ryByzkDm;
+	private String ryMzDm;
+	private String jzdpcs;
+	private Long jzdpcsdm;
 	@TableField(exist = false)
 	private String pcsjgdm;
 	@TableField(exist = false)

blade-service-api/blade-rkxx-api/src/main/java/org/springblade/modules/feign/RkxxFeign.java

@@ -1,10 +1,10 @@
 package org.springblade.modules.feign;
 
 import org.springblade.common.constant.CommonConstant;
-import org.springblade.core.tool.api.R;
 import org.springblade.modules.entity.RkxxEntity;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
@@ -14,6 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface RkxxFeign {
 	String API_PREFIX = "/api/bzdz";
 
-	@GetMapping(API_PREFIX + "/rkxx")
-	RkxxEntity rkxx(String fzSfzh);
+	@PostMapping(API_PREFIX + "/rkxx")
+	RkxxEntity rkxx(@RequestBody String fzSfzh);
 }

blade-service/blade-rkxx/pom.xml

@@ -30,5 +30,9 @@
             <artifactId>blade-rkxx-api</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
     </dependencies>
 </project>

blade-service/blade-rkxx/src/main/java/org/springblade/modules/controller/RkxxController.java

@@ -3,9 +3,7 @@ package org.springblade.modules.controller;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tool.api.R;
 import org.springblade.modules.service.RkxxService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @AllArgsConstructor

blade-service/blade-rkxx/src/main/java/org/springblade/modules/feign/RkxxClientImpl.java

@@ -6,6 +6,7 @@ import org.springblade.modules.entity.RkxxEntity;
 import org.springblade.modules.service.RkxxService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -15,8 +16,8 @@ public class RkxxClientImpl implements RkxxFeign {
 	private RkxxService rkxxService;
 
 	@Override
-	@GetMapping(API_PREFIX + "/rkxx")
-	public RkxxEntity rkxx(String fzSfzh) {
+	@PostMapping(API_PREFIX + "/rkxx")
+	public RkxxEntity rkxx(@RequestBody String fzSfzh) {
 		return rkxxService.selectRyxxBySfzh(fzSfzh);
 	}
 }

blade-service/blade-rkxx/src/main/java/org/springblade/modules/mapper/RkxxMapper.xml

@@ -13,11 +13,24 @@
             rydzxz as hjdz,
             gzdw as fzDw,
             ryzp as fzZp,
-            ryxb, rydz,
+            ryxb,
+            rydz,
             rd.pcsjgdm,
             rd.dqm,
             rd.pcsjgmc,
-            br.province_name || br.city_name || br.name as hjdssq
+            br.province_name || br.city_name || br.name as hjdssq,
+            ry_mz,
+            ry_mz_dm,
+            ry_hyzk,
+            ry_hyzk_dm,
+            ry_whcd,
+            ry_whcd_dm,
+            ry_zzmm,
+            ry_zzmm_dm,
+            ry_byzk,
+            ry_byzk_dm,
+            jzdpcs,
+            jzdpcsdm
         from sspt.ybss_xx yx
         left join sspt.rk_dzxx rd on yx.rydz = rd.dzbm
         left join jdrh.blade_region br on rd.ssxq = br.code

blade-service/blade-rkxx/src/main/java/org/springblade/modules/service/impl/RkxxServiceImpl.java

@@ -1,6 +1,5 @@
 package org.springblade.modules.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.modules.entity.ClxxEntity;
 import org.springblade.modules.entity.RkxxEntity;