提交

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

@@ -27,4 +27,8 @@ public class RkxxEntity extends BaseEntity {
 	private String fzZp;
 	@TableField(exist = false)
 	private String ryType;
+	@TableField(exist = false)
+	private String pcsjgmc;
+	@TableField(exist = false)
+	private String hjdssq;
 }

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

@@ -7,7 +7,21 @@
     </resultMap>
 
     <select id="selectRyxxBySfzh" resultType="org.springblade.modules.entity.RkxxEntity">
-        select ryxm as fzXm, rydh as fzDh, rydzxz as hjdz, gzdw as fzDw, ryzp as fzZp, ryxb, rydz, rd.pcsjgdm, rd.dqm from sspt.ybss_xx yx left join sspt.rk_dzxx rd on yx.rydz = rd.dzbm where rysfzh = #{rySfzh}
+        select
+            ryxm as fzXm,
+            rydh as fzDh,
+            rydzxz as hjdz,
+            gzdw as fzDw,
+            ryzp as fzZp,
+            ryxb, rydz,
+            rd.pcsjgdm,
+            rd.dqm,
+            rd.pcsjgmc,
+            br.province_name || br.city_name || br.name as hjdssq
+        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
+        where rysfzh = #{rySfzh}
     </select>
 
     <select id="selectClxxByCphm" resultType="org.springblade.modules.entity.ClxxEntity">

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

@@ -1,10 +1,11 @@
 package org.springblade.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.core.mp.base.BaseService;
 import org.springblade.modules.entity.ClxxEntity;
 import org.springblade.modules.entity.RkxxEntity;
 
-public interface RkxxService extends IService<RkxxEntity> {
+public interface RkxxService extends BaseService<RkxxEntity> {
 	RkxxEntity selectRyxxBySfzh(String fzSfzh);
 
 	ClxxEntity selectClxxByCphm(String cphm);

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

@@ -1,6 +1,7 @@
 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;
 import org.springblade.modules.mapper.RkxxMapper;
@@ -8,7 +9,7 @@ import org.springblade.modules.service.RkxxService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class RkxxServiceImpl extends ServiceImpl<RkxxMapper, RkxxEntity> implements RkxxService {
+public class RkxxServiceImpl extends BaseServiceImpl<RkxxMapper, RkxxEntity> implements RkxxService {
 	@Override
 	public RkxxEntity selectRyxxBySfzh(String fzSfzh) {
 		return baseMapper.selectRyxxBySfzh(fzSfzh);