提交

blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -36,27 +36,7 @@ public interface CommonConstant {
 
 	String APPLICATION_RKXX_NAME = "rkxx";
 
-	String APPLICATION_RHZFFW_NAME = "rhzffw";
-
-	String APPLICATION_RHZFFWLS_NAME = "rhzffwls";
-
-	String APPLICATION_RHZFFZ_NAME = "rhzffz";
-
-	String APPLICATION_RHZFFZLS_NAME = "rhzffzls";
-
-	String APPLICATION_RHZFFWRY_NAME = "rhzffwry";
-
-	String APPLICATION_RHZFRYCZRK_NAME = "rhzfryczrk";
-
-	String APPLICATION_RHZFRYJWRK_NAME = "rhzfryjwrk";
-
-	String APPLICATION_RHZFRYJZRK_NAME = "rhzfryjzrk";
-
-	String APPLICATION_RHZFRYWLRK_NAME = "rhzfrywlrk";
-
-	String APPLICATION_RHZFRYZZRK_NAME = "rhzfryzzrk";
-
-	String APPLICATION_RHZFRYLS_NAME = "rhzfryls";
+	String APPLICATION_RHZF_NAME = "rhzf";
 
 	String APPLICATION_BZDZ_NAME = "bzdz";
 

blade-service-api/blade-bzdz-api/src/main/java/org/springblade/modules/entity/BzdzEntity.java

@@ -45,7 +45,7 @@ public class BzdzEntity extends BaseEntity {
 	// 房主id
 	private Long fzid;
 	// 是否在此居住
-	private String sfzcjz;
+	private Integer sfzcjz;
 	// 房主历史记录
 	private List<FzLsVO> fzls;
 	// 房主照片
@@ -66,4 +66,11 @@ public class BzdzEntity extends BaseEntity {
 	private String createDeptName;
 	private String pcsjgdm;
 	private String dqm;
+	private String ryXb;
+	private String rydz;
+	private String ryXm;
+	private String ryDh;
+	private String deptName;
+	private String ryZjhm;
+	private String newType;
 }

blade-service-api/blade-bzdz-api/src/main/java/org/springblade/modules/entity/FwFzEntity.java

@@ -1,6 +1,7 @@
 package org.springblade.modules.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 
@@ -11,6 +12,7 @@ import org.springblade.core.mp.base.BaseEntity;
  * @since 2023-12-15
  */
 @Data
+@TableName("jdrh.rhzf_fw_fz")
 public class FwFzEntity extends BaseEntity {
 
 	/**
@@ -91,4 +93,10 @@ public class FwFzEntity extends BaseEntity {
 	private String ryTsLb;
 	@TableField(exist = false)
 	private Long fzid;
+	@TableField(exist = false)
+	private String ryxb;
+	@TableField(exist = false)
+	private String ryType;
+	@TableField(exist = false)
+	private String rydz;
 }

blade-service-api/blade-bzdz-api/src/main/java/org/springblade/modules/entity/SydwEntity.java

@@ -116,4 +116,6 @@ public class SydwEntity extends BaseEntity {
 	private List<CyryEntity> cyryList;
 	@TableField(exist = false)
 	private List<CyryEntity> cyrylsList;
+	@TableField(exist = false)
+	private List<SydwEntity> sdydwlsList;
 }

blade-service-api/blade-bzdz-api/src/main/java/org/springblade/modules/vo/SyjzryVO.java

@@ -270,4 +270,5 @@ public class SyjzryVO {
 	private String updateDeptName;
 	private String newDzbm;
 	private Long newFwId;
+	private String newType;
 }

blade-service-api/blade-rhzfFzLs-api/pom.xml → blade-service-api/blade-rhzf-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blade-rhzfFzLs-api</artifactId>
+    <artifactId>blade-rhzf-api</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

blade-service-api/blade-rhzfFz-api/src/main/java/org/springblade/modules/entity/FwFzEntity.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/entity/FwFzEntity.java

@@ -3,7 +3,6 @@ package org.springblade.modules.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
 /**
@@ -14,7 +13,6 @@ import org.springblade.core.mp.base.BaseEntity;
  */
 @Data
 @TableName("jdrh.rhzf_fw_fz")
-@EqualsAndHashCode(callSuper = true)
 public class FwFzEntity extends BaseEntity {
 
 	/**

blade-service-api/blade-rhzfFw-api/src/main/java/org/springblade/modules/entity/FwInfoEntity.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/entity/FwInfoEntity.java

@@ -3,7 +3,6 @@ package org.springblade.modules.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
 import java.util.Date;
@@ -16,7 +15,6 @@ import java.util.Date;
  */
 @Data
 @TableName("jdrh.rhzf_fw_info")
-@EqualsAndHashCode(callSuper = true)
 public class FwInfoEntity extends BaseEntity {
 
 	/**

blade-service-api/blade-rhzfRyCzrk-api/src/main/java/org/springblade/modules/entity/RyCzrkEntity.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/entity/RyCzrkEntity.java

@@ -172,4 +172,8 @@ public class RyCzrkEntity extends BaseEntity {
 	 * 人员照片
 	 */
 	private String ryZp;
+	private String newDzbm;
+	private Long newFwId;
+	private String newType;
+	private String updateDept;
 }

blade-service-api/blade-rhzfRyJwrk-api/src/main/java/org/springblade/modules/entity/RyJwrkEntity.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/entity/RyJwrkEntity.java

@@ -172,4 +172,8 @@ public class RyJwrkEntity extends BaseEntity {
 	 * 人员照片
 	 */
 	private String ryZp;
+	private String newDzbm;
+	private Long newFwId;
+	private String newType;
+	private String updateDept;
 }

blade-service-api/blade-rhzfRyJzrk-api/src/main/java/org/springblade/modules/entity/RyJzrkEntity.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/entity/RyJzrkEntity.java

@@ -164,4 +164,8 @@ public class RyJzrkEntity extends BaseEntity {
 	 * 人员照片
 	 */
 	private String ryZp;
+	private String newDzbm;
+	private Long newFwId;
+	private String newType;
+	private String updateDept;
 }

blade-service-api/blade-rhzfRyWlrk-api/src/main/java/org/springblade/modules/entity/RyWlrkEntity.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/entity/RyWlrkEntity.java

@@ -168,4 +168,8 @@ public class RyWlrkEntity extends BaseEntity {
 	 * 人员照片
 	 */
 	private String ryZp;
+	private String newDzbm;
+	private Long newFwId;
+	private String newType;
+	private String updateDept;
 }

blade-service-api/blade-rhzfRyZzrk-api/src/main/java/org/springblade/modules/entity/RyZzrkEntity.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/entity/RyZzrkEntity.java

@@ -184,4 +184,8 @@ public class RyZzrkEntity extends BaseEntity {
 	 * 人员照片
 	 */
 	private String ryZp;
+	private String newDzbm;
+	private Long newFwId;
+	private String newType;
+	private String updateDept;
 }

blade-service-api/blade-rhzfRyCzrk-api/src/main/java/org/springblade/modules/feign/RhzfCzrkFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfCzrkFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFRYCZRK_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfCzrkFeign {
 	String API_PREFIX = "/api/bzdz";

blade-service-api/blade-rhzfFw-api/src/main/java/org/springblade/modules/feign/RhzfFwFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfFwFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFFW_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfFwFeign {
 	String API_PREFIX = "/api/rhzfFw";

blade-service-api/blade-rhzfFwLs-api/src/main/java/org/springblade/modules/feign/RhzfFwLsFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfFwLsFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFFWLS_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfFwLsFeign {
 	String API_PREFIX = "/api/bzdz";

blade-service-api/blade-rhzfFwRy-api/src/main/java/org/springblade/modules/feign/RhzfFwRyFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfFwRyFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFFWRY_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfFwRyFeign {
 	String API_PREFIX = "/api/bzdz";

blade-service-api/blade-rhzfFz-api/src/main/java/org/springblade/modules/feign/RhzfFzFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfFzFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFFZ_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfFzFeign {
 	String API_PREFIX = "/api/rhzfFz";

blade-service-api/blade-rhzfFzLs-api/src/main/java/org/springblade/modules/feign/RhzfFzLsFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfFzLsFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFFZLS_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfFzLsFeign {
 	String API_PREFIX = "/api/bzdz";

blade-service-api/blade-rhzfRyJwrk-api/src/main/java/org/springblade/modules/feign/RhzfJwrkFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfJwrkFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFRYJWRK_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfJwrkFeign {
 	String API_PREFIX = "/api/bzdz";

blade-service-api/blade-rhzfRyJzrk-api/src/main/java/org/springblade/modules/feign/RhzfJzrkFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfJzrkFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFRYJZRK_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfJzrkFeign {
 	String API_PREFIX = "/api/bzdz";

blade-service-api/blade-rhzfRyLs-api/src/main/java/org/springblade/modules/feign/RhzfRyLsFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfRyLsFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFRYLS_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfRyLsFeign {
 	String API_PREFIX = "/api/bzdz";

blade-service-api/blade-rhzfRyWlrk-api/src/main/java/org/springblade/modules/feign/RhzfWlrkFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfWlrkFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFRYWLRK_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfWlrkFeign {
 	String API_PREFIX = "/api/bzdz";

blade-service-api/blade-rhzfRyZzrk-api/src/main/java/org/springblade/modules/feign/RhzfZzrkFeign.java → blade-service-api/blade-rhzf-api/src/main/java/org/springblade/modules/feign/RhzfZzrkFeign.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(
 	//定义Feign指向的service-id
-	value = CommonConstant.APPLICATION_RHZFRYZZRK_NAME
+	value = CommonConstant.APPLICATION_RHZF_NAME
 )
 public interface RhzfZzrkFeign {
 	String API_PREFIX = "/api/bzdz";

blade-service-api/blade-sydw-api/src/main/java/org/springblade/modules/entity/CyryEntity.java

@@ -1,5 +1,6 @@
 package org.springblade.modules.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
@@ -7,7 +8,7 @@ import org.springblade.core.mp.base.BaseEntity;
 @Data
 @TableName("jdrh.ybss_cyry")
 public class CyryEntity extends BaseEntity {
-	// 单位地址名称
+	// 单位地址编码
 	private String dwdzbm;
 	// 统一社会信用代码
 	private String tyshxydm;
@@ -36,4 +37,6 @@ public class CyryEntity extends BaseEntity {
 	private String xm;
 	private String xb;
 	private String xz;
+	@TableField(exist = false)
+	private String dwmc;
 }

blade-service-api/blade-syry-api/src/main/java/org/springblade/modules/entity/SyryEntity.java

@@ -268,4 +268,5 @@ public class SyryEntity extends BaseEntity {
 	private String updateDeptName;
 	private String newDzbm;
 	private Long newFwId;
+	private String newType;
 }

blade-service-api/blade-rhzfFwLs-api/pom.xml → blade-service-api/blade-tdry-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blade-rhzfFwLs-api</artifactId>
+    <artifactId>blade-tdry-api</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/entity/CcxqEntity.java

@@ -0,0 +1,24 @@
+package org.springblade.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("tdry_ccxq")
+public class CcxqEntity extends BaseEntity {
+	// 特定人员id
+	private Long tdryId;
+	// 财产类型
+	private String tdryCclx;
+	// 财产详情
+	private String tdryCcxq;
+	// 财产所有人
+	private String tdryCcsyr;
+	// 财产所有人证件号码
+	private String tdryCcsyrZjhm;
+	// 财产所有人证件类型
+	private String tdryCcsyrZjlx;
+	// 财产所有人联系电话
+	private String tdryCcsyrLxdh;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/entity/CzjlEntity.java

@@ -0,0 +1,22 @@
+package org.springblade.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("tdry_czjl")
+public class CzjlEntity extends BaseEntity {
+	// 特定人员id
+	private Long tdryId;
+	// 处置时间
+	private String czSj;
+	// 处置方式
+	private String czFs;
+	// 处置内容
+	private String czNr;
+	// 处置民警警号
+	private String czMjjh;
+	// 处置现场照片
+	private String czXczp;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/entity/GzzEntity.java

@@ -0,0 +1,24 @@
+package org.springblade.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("tdry_gzz")
+public class GzzEntity extends BaseEntity {
+	// 特定人员id
+	private Long tdryId;
+	// 工作组名称
+	private String gzzMc;
+	// 工作组类型
+	private String gzzLx;
+	// 工作组负责人
+	private String gzzFzr;
+	// 负责人联系电话
+	private String fzrLxdh;
+	// 工作组照片
+	private String gzzZp;
+	// 工作组成立时间
+	private String gzzClsj;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/entity/GzzcyEntity.java

@@ -0,0 +1,24 @@
+package org.springblade.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("tdry_gzzcy")
+public class GzzcyEntity extends BaseEntity {
+	// 工作组id
+	private Long gzzId;
+	// 工作组成员姓名
+	private String gzzCyxm;
+	// 工作组成员联系电话
+	private String gzzCylxdh;
+	// 工作组成员证件号码
+	private String gzzCyzjhm;
+	// 工作组成员单位
+	private String gzzCydw;
+	// 工作组成员职务
+	private String gzzCyzw;
+	// 工作组成员照片
+	private String gzzCyzp;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/entity/HdcsEntity.java

@@ -0,0 +1,22 @@
+package org.springblade.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("tdry_hdcs")
+public class HdcsEntity extends BaseEntity {
+	// 特定人员id
+	private String tdryId;
+	// 活动场所名称
+	private String tdryHdcsMc;
+	// 活动场所地址
+	private String tdryHdcsDz;
+	// 活动场所类型
+	private String tdryHdcsLx;
+	// 活动时间
+	private String tdryHdsj;
+	// 活动场所管辖单位
+	private String tdryHdcsGxdw;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/entity/HkblEntity.java

@@ -0,0 +1,16 @@
+package org.springblade.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("tdry_hkbl")
+public class HkblEntity extends BaseEntity {
+	// 特定人员id
+	private Long tdryId;
+	// 办理过程照片
+	private String blgczp;
+	// 结果照片
+	private String jgzp;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/entity/JbxxEntity.java

@@ -0,0 +1,52 @@
+package org.springblade.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("tdry_jbxx")
+public class JbxxEntity extends BaseEntity {
+	// 姓名
+	private String tdryXm;
+	// 性别
+	private String tdryXb;
+	// 人员照片
+	private String tdryZp;
+	// 证件号码
+	private String tdryZjhm;
+	// 证件类型
+	private String tdryZjlx;
+	// 国籍
+	private String tdryGj;
+	// 民族
+	private String tdryMz;
+	// 出生日期
+	private String tdryCsrq;
+	// 联系电话
+	private String tdryLxdh;
+	// 职业
+	private String tdryZy;
+	// 文化程度
+	private String tdryWhcd;
+	// 宗教信仰
+	private String tdryZjxy;
+	// 经济来源
+	private String tdryJjly;
+	// 家庭年收入
+	private String tdryJtnsr;
+	// 实际居住地
+	private String tdrySjjzd;
+	// 户籍
+	private String tdryHj;
+	// 涉事地
+	private String tdrySsd;
+	// 特定对象类型
+	private String tddxlx;
+	// 风险等级
+	private String ryfxdj;
+	// 是否涉及单位
+	private String sfsjdw;
+	// 工作单位
+	private String gzdw;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/entity/ShgxEntity.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("tdry_shgx")
+public class ShgxEntity extends BaseEntity {
+	// 特定人员id
+	private String tdryId;
+	// 关系人姓名
+	private String gxrXm;
+	// 关系人性别
+	private String gxrXb;
+	// 关系人证件号码
+	private String gxrZjhm;
+	// 关系人证件种类
+	private String gxrZjlx;
+	// 关系人国籍
+	private String gxrGj;
+	// 关系人民族
+	private String gxrMz;
+	// 关系人与本人关系大类
+	private String gxrYbrgxdl;
+	// 关系人与本人关系细类
+	private String gxrYbrgxxl;
+	// 关系人国籍
+	private String gxrHj;
+	// 关系人实际居住地
+	private String gxrSjjzd;
+	// 关系人联系电话
+	private String gxrLxdh;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/entity/TdxwEntity.java

@@ -0,0 +1,16 @@
+package org.springblade.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("tdry_tdxw")
+public class TdxwEntity extends BaseEntity {
+	// 特定人员id
+	private Long tdryId;
+	// 特定行为
+	private String tdxw;
+	// 特定行为发生时间
+	private String tdxwffssj;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/entity/XsbxEntity.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("tdry_xsbx")
+public class XsbxEntity extends BaseEntity {
+	// 特定人员id
+	private String tdryId;
+	// 思想动态
+	private String sxdt;
+	// 工作表现
+	private String gzbx;
+	// 参与社会活动情况
+	private String cyshhdqk;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/vo/BfshVO.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.vo;
+
+import lombok.Data;
+import org.springblade.modules.entity.GzzcyEntity;
+
+import java.util.List;
+
+@Data
+public class BfshVO {
+	// 特定人员id
+	private Long tdryId;
+	// 风险等级
+	private String ryfxdj;
+	// 处置时间
+	private String czSj;
+	// 处置方式
+	private String czFs;
+	// 处置内容
+	private String czNr;
+	// 处置民警警号
+	private String czMjjh;
+	// 处置现场照片
+	private String czXczp;
+	// 工作组名称
+	private String gzzMc;
+	// 工作组类型
+	private String gzzLx;
+	// 工作组负责人
+	private String gzzFzr;
+	// 负责人联系电话
+	private String fzrLxdh;
+	// 工作组照片
+	private String gzzZp;
+	// 工作组成立时间
+	private String gzzClsj;
+	// 工作组成员
+	private List<GzzcyEntity> gzzcyList;
+}

blade-service-api/blade-tdry-api/src/main/java/org/springblade/modules/vo/TdryVO.java

@@ -0,0 +1,121 @@
+package org.springblade.modules.vo;
+
+import lombok.Data;
+
+@Data
+public class TdryVO {
+	// 特定人员id
+	private Long tdryId;
+	// 姓名
+	private String tdryXm;
+	// 性别
+	private String tdryXb;
+	// 人员照片
+	private String tdryZp;
+	// 证件号码
+	private String tdryZjhm;
+	// 证件类型
+	private String tdryZjlx;
+	// 国籍
+	private String tdryGj;
+	// 民族
+	private String tdryMz;
+	// 出生日期
+	private String tdryCsrq;
+	// 联系电话
+	private String tdryLxdh;
+	// 职业
+	private String tdryZy;
+	// 文化程度
+	private String tdryWhcd;
+	// 宗教信仰
+	private String tdryZjxy;
+	// 经济来源
+	private String tdryJjly;
+	// 家庭年收入
+	private String tdryJtnsr;
+	// 实际居住地
+	private String tdrySjjzd;
+	// 户籍
+	private String tdryHj;
+	// 涉事地
+	private String tdrySsd;
+	// 特定对象类型
+	private String tddxlx;
+	// 风险等级
+	private String ryfxdj;
+	// 是否涉及单位
+	private String sfsjdw;
+	// 工作单位
+	private String gzdw;
+	// 财产类型
+	private String tdryCclx;
+	// 财产详情
+	private String tdryCcxq;
+	// 财产所有人
+	private String tdryCcsyr;
+	// 财产所有人证件号码
+	private String tdryCcsyrZjhm;
+	// 财产所有人证件类型
+	private String tdryCcsyrZjlx;
+	// 财产所有人联系电话
+	private String tdryCcsyrLxdh;
+	// 活动场所名称
+	private String tdryHdcsMc;
+	// 活动场所地址
+	private String tdryHdcsDz;
+	// 活动场所类型
+	private String tdryHdcsLx;
+	// 活动时间
+	private String tdryHdsj;
+	// 活动场所管辖单位
+	private String tdryHdcsGxdw;
+	// 关系人姓名
+	private String gxrXm;
+	// 关系人性别
+	private String gxrXb;
+	// 关系人证件号码
+	private String gxrZjhm;
+	// 关系人证件种类
+	private String gxrZjlx;
+	// 关系人国籍
+	private String gxrGj;
+	// 关系人民族
+	private String gxrMz;
+	// 关系人与本人关系大类
+	private String gxrYbrgxdl;
+	// 关系人与本人关系细类
+	private String gxrYbrgxxl;
+	// 关系人国籍
+	private String gxrHj;
+	// 关系人实际居住地
+	private String gxrSjjzd;
+	// 关系人联系电话
+	private String gxrLxdh;
+	// 思想动态
+	private String sxdt;
+	// 工作表现
+	private String gzbx;
+	// 参与社会活动情况
+	private String cyshhdqk;
+	// 首次见面
+	private String scjm;
+	// 是否限业
+	private String sfxy;
+	// 是否有户口
+	private String sfyhk;
+	// 办理过程照片
+	private String blgczp;
+	// 结果照片
+	private String jgzp;
+	// 处置时间
+	private String czSj;
+	// 处置方式
+	private String czFs;
+	// 处置内容
+	private String czNr;
+	// 处置民警警号
+	private String czMjjh;
+	// 处置现场照片
+	private String czXczp;
+}

blade-service/blade-bzdz/pom.xml

@@ -26,67 +26,22 @@
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfFw-api</artifactId>
+            <artifactId>blade-rhzf-api</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfFz-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfRyCzrk-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfRyJwrk-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfRyJzrk-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfRyWlrk-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfRyZzrk-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfFwRy-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfFzLs-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfFwLs-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfRyLs-api</artifactId>
+            <artifactId>blade-bzdz-api</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-bzdz-api</artifactId>
+            <artifactId>blade-sydw-api</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-sydw-api</artifactId>
+            <artifactId>blade-rkxx-api</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>

blade-service/blade-bzdz/src/main/java/org/springblade/modules/controller/BzdzController.java

@@ -4,6 +4,7 @@ import com.alibaba.cloud.commons.lang.StringUtils;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.modules.entity.*;
 import org.springblade.modules.feign.*;
 import org.springblade.modules.service.BzdzService;
@@ -25,6 +26,8 @@ public class BzdzController {
 
 	private BzdzService bzdzService;
 
+	private RkxxFeign rkxxFeign;
+
 	private SydwFeign sydwFeign;
 
 	private RhzfFwFeign rhzfFwFeign;
@@ -54,7 +57,12 @@ public class BzdzController {
 	 */
 	@GetMapping("/getLdList-pt")
 	public R getLdListPt(@RequestParam Map<String, Object> params) {
-		params.put("gajgdm", AuthUtil.getDeptId());
+		Dept byId = bzdzService.selectDeptById(AuthUtil.getDeptId().split(",")[0]);
+		if (byId.getDeptCategory() == 7) {
+			params.put("gajgdm", byId.getFjId());
+		} else {
+			params.put("gajgdm", AuthUtil.getDeptId());
+		}
 		List<LdBzdzVO> ldList = bzdzService.getJzwList(params);
 		return R.data(GsonUtils.toGsonStr(ldList));
 	}
@@ -87,7 +95,7 @@ public class BzdzController {
 	public R bzdzDetail(@RequestParam Map<String, Object> params) {
 		BzdzEntity bzdz = bzdzService.bzdzDetail(params);
 		if (bzdz != null) {
-			List<FzLsVO> list = bzdzService.selectFzLs(bzdz.getFzid());
+			List<FzLsVO> list = bzdzService.selectFzLs(bzdz.getId());
 			bzdz.setFzls(list);
 		}
 		return R.data(bzdz);
@@ -98,17 +106,7 @@ public class BzdzController {
 	 */
 	@PostMapping("fzUpdate")
 	public R fzUpdate(@RequestBody BzdzEntity bzdzEntity) {
-		FwFzEntity fz = bzdzService.selectByFzId(bzdzEntity.getFzid());
-		if (fz != null) {
-			FzLsEntity fzLsEntity = new FzLsEntity();
-			BeanUtils.copyProperties(fz, fzLsEntity);
-			fz.setCreateUser(AuthUtil.getUserId());
-			fz.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-			fz.setCreateTime(new Date());
-			rhzfFzLsFeign.fzlsSave(fzLsEntity);
-		}
 		bzdzEntity.setUpdateUser(AuthUtil.getUserId());
-		bzdzEntity.setJz(Integer.valueOf(bzdzEntity.getSfzcjz()));
 		return R.data(bzdzService.fzUpdate(bzdzEntity));
 	}
 
@@ -126,7 +124,7 @@ public class BzdzController {
 		fwLsEntity.setFwMj(fwInfoEntity.getFwMj());
 		fwLsEntity.setFwJs(fwInfoEntity.getFwJs());
 		fwLsEntity.setCreateUser(AuthUtil.getUserId());
-		fwLsEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+		fwLsEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
 		rhzfFwLsFeign.fwlsSave(fwLsEntity);
 		fwInfoEntity.setUpdateUser(AuthUtil.getUserId());
 		fwInfoEntity.setUpdateTime(new Date());
@@ -171,14 +169,14 @@ public class BzdzController {
 		} else {
 			fwInfo.setDzType(0);
 			fwInfo.setCreateUser(AuthUtil.getUserId());
-			fwInfo.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+			fwInfo.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
 			rhzfFwFeign.fwSave(fwInfo);
 			if (rhzfSaveVO.getFzInfo() != null){
 				BzdzEntity bzdz = bzdzService.selectFw(fwInfo.getDzbm());
 				rhzfSaveVO.getFzInfo().setFwId(bzdz.getId());
 				rhzfSaveVO.getFzInfo().setType(0);
 				rhzfSaveVO.getFzInfo().setCreateUser(AuthUtil.getUserId());
-				rhzfSaveVO.getFzInfo().setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+				rhzfSaveVO.getFzInfo().setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
 				rhzfFzFeign.fzSave(rhzfSaveVO.getFzInfo());
 			}
 		}
@@ -192,18 +190,18 @@ public class BzdzController {
 //			fwInfo.setTimes(oldRecord.getTimes() + 1);
 //			fwInfoService.updateById(fwInfo);
 //		}
-		// 保存房屋操作记录
+//		// 保存房屋操作记录
 //		RhzfFwEntity fwLogEntity = new RhzfFwEntity();
 //		BeanUtils.copyProperties(fwInfo, fwLogEntity);
 //		fwLogEntity.setMjId(mjId);
 //		fwLogService.save(fwLogEntity);
-		// 保存房主信息
+//		// 保存房主信息
 //		if (null == oldRecord) {
 //			rhzfSaveVO.getFzInfo().setFwId(fwInfo.getId());
 //			rhzfSaveVO.getFzInfo().setMjId(mjId);
 //			rhzfFzFeign.fzSave(rhzfSaveVO.getFzInfo());
 //		}
-		// 保存房主操作记录
+//		// 保存房主操作记录
 //		RhzfFzEntity fzLogEntity = new RhzfFzEntity();
 //		BeanUtils.copyProperties(rhzfSaveVO.getFzInfo(), fzLogEntity);
 //		fzLogEntity.setMjId(mjId);
@@ -222,230 +220,230 @@ public class BzdzController {
 			return R.fail("请先创建实有房屋");
 		}
 		//if (null != rhzfSaveVO.getSyjzryList() && !rhzfSaveVO.getSyjzryList().isEmpty()) {
-			//for (SyjzryVO syjzryVO : rhzfSaveVO.getSyjzryList()) {
-				if (syjzryVO.getIsDeleted() != 1 && !syjzryVO.getRyType().equals("境外人口") && StringUtils.isBlank(syjzryVO.getRySfzh())) {
-					return R.fail("请填写身份证号");
-				}
-				Long ryId = 0L;
-				int type = 1; // 1=新增 2=修改 3=删除
-				if (syjzryVO.getRyType().equals("常住人口")) {
-					// 常住人口
-					RyCzrkEntity czrkEntity = new RyCzrkEntity();
-					BeanUtils.copyProperties(syjzryVO, czrkEntity);
-					czrkEntity.setFwId(bzdz.getId());
-					czrkEntity.setDzbm(syjzryVO.getDzbm());
-					czrkEntity.setCreateUser(AuthUtil.getUserId());
-					czrkEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-					czrkEntity.setUpdateUser(AuthUtil.getUserId());
-					BzdzEntity czrk = bzdzService.selectCzrkBySfzh(czrkEntity.getRySfzh());
-					if (czrk == null) {
-						czrkEntity.setMjId(mjId);
-						rhzfCzrkFeign.czrkSave(czrkEntity);
-					} else if (!czrkEntity.getDzbm().equals(czrk.getDzbm())) {
-						RhzfRyLsEntity ryLs = new RhzfRyLsEntity();
-						ryLs.setFwId(czrk.getFwId());
-						ryLs.setRyId(czrk.getId());
-						ryLs.setDzbm(czrk.getDzbm());
-						ryLs.setRyType(syjzryVO.getRyType());
-						ryLs.setRyXm(syjzryVO.getRyXm());
-						ryLs.setRyXb(syjzryVO.getRyXb());
-						ryLs.setRySfzh(syjzryVO.getRySfzh());
-						ryLs.setRyDh(syjzryVO.getRyDh());
-						ryLs.setRyTsLb(syjzryVO.getRyTsLb());
-						ryLs.setZxyy(syjzryVO.getZxyy());
-						ryLs.setZxrq(syjzryVO.getZxrq());
-						ryLs.setRyXs(syjzryVO.getRyXs());
-						ryLs.setRyMz(syjzryVO.getRyYwm());
-						ryLs.setRyZjhm(syjzryVO.getRyZjhm());
-						ryLs.setCreateUser(AuthUtil.getUserId());
-						ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-						ryLs.setUpdateUser(AuthUtil.getUserId());
-						ryLs.setIsDeleted(1);
-						rhzfRyLsFeign.rylsSave(ryLs);
-						czrkEntity.setId(czrk.getId());
-						rhzfCzrkFeign.czrkUpdate(czrkEntity);
-					}
-					ryId = bzdzService.selectCzrkId(czrkEntity);
-				} else if (syjzryVO.getRyType().equals("境外人口")) {
-					// 境外人口
-					RyJwrkEntity jwrkEntity = new RyJwrkEntity();
-					BeanUtils.copyProperties(syjzryVO, jwrkEntity);
-					jwrkEntity.setFwId(bzdz.getId());
-					jwrkEntity.setRyMz(syjzryVO.getRyYwm());
-					jwrkEntity.setDzbm(syjzryVO.getDzbm());
-					jwrkEntity.setCreateUser(AuthUtil.getUserId());
-					jwrkEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-					jwrkEntity.setUpdateUser(AuthUtil.getUserId());
-					BzdzEntity jwrk = bzdzService.selectJwrkByZjhm(jwrkEntity.getRyZjhm());
-					if (jwrk == null) {
-						jwrkEntity.setMjId(mjId);
-						rhzfJwrkFeign.jwrkSave(jwrkEntity);
-					} else if (!jwrkEntity.getDzbm().equals(jwrk.getDzbm())) {
-						RhzfRyLsEntity ryLs = new RhzfRyLsEntity();
-						ryLs.setFwId(jwrk.getFwId());
-						ryLs.setRyId(jwrk.getId());
-						ryLs.setDzbm(jwrk.getDzbm());
-						ryLs.setRyType(syjzryVO.getRyType());
-						ryLs.setRyXm(syjzryVO.getRyXm());
-						ryLs.setRyXb(syjzryVO.getRyXb());
-						ryLs.setRySfzh(syjzryVO.getRySfzh());
-						ryLs.setRyDh(syjzryVO.getRyDh());
-						ryLs.setRyTsLb(syjzryVO.getRyTsLb());
-						ryLs.setZxyy(syjzryVO.getZxyy());
-						ryLs.setZxrq(syjzryVO.getZxrq());
-						ryLs.setRyXs(syjzryVO.getRyXs());
-						ryLs.setRyMz(syjzryVO.getRyYwm());
-						ryLs.setRyZjhm(syjzryVO.getRyZjhm());
-						ryLs.setCreateUser(AuthUtil.getUserId());
-						ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-						ryLs.setUpdateUser(AuthUtil.getUserId());
-						ryLs.setIsDeleted(1);
-						rhzfRyLsFeign.rylsSave(ryLs);
-						jwrkEntity.setId(jwrk.getId());
-						rhzfJwrkFeign.jwrkUpdate(jwrkEntity);
-					}
-					ryId = bzdzService.selectJwrkId(jwrkEntity);
-				} else if (syjzryVO.getRyType().equals("寄住人口")) {
-					// 寄住人口
-					RyJzrkEntity jzrkEntity = new RyJzrkEntity();
-					BeanUtils.copyProperties(syjzryVO, jzrkEntity);
-					jzrkEntity.setFwId(bzdz.getId());
-					jzrkEntity.setDzbm(syjzryVO.getDzbm());
-					jzrkEntity.setCreateUser(AuthUtil.getUserId());
-					jzrkEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-					jzrkEntity.setUpdateUser(AuthUtil.getUserId());
-					BzdzEntity jzrk = bzdzService.selectJzrkBySfzh(jzrkEntity.getRySfzh());
-					if (jzrk == null) {
-						jzrkEntity.setMjId(mjId);
-						rhzfJzrkFeign.jzrkSave(jzrkEntity);
-					} else if (!jzrkEntity.getDzbm().equals(jzrk.getDzbm())) {
-						RhzfRyLsEntity ryLs = new RhzfRyLsEntity();
-						ryLs.setFwId(jzrk.getFwId());
-						ryLs.setRyId(jzrk.getId());
-						ryLs.setDzbm(jzrk.getDzbm());
-						ryLs.setRyType(syjzryVO.getRyType());
-						ryLs.setRyXm(syjzryVO.getRyXm());
-						ryLs.setRyXb(syjzryVO.getRyXb());
-						ryLs.setRySfzh(syjzryVO.getRySfzh());
-						ryLs.setRyDh(syjzryVO.getRyDh());
-						ryLs.setRyTsLb(syjzryVO.getRyTsLb());
-						ryLs.setZxyy(syjzryVO.getZxyy());
-						ryLs.setZxrq(syjzryVO.getZxrq());
-						ryLs.setRyXs(syjzryVO.getRyXs());
-						ryLs.setRyMz(syjzryVO.getRyYwm());
-						ryLs.setRyZjhm(syjzryVO.getRyZjhm());
-						ryLs.setCreateUser(AuthUtil.getUserId());
-						ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-						ryLs.setUpdateUser(AuthUtil.getUserId());
-						ryLs.setIsDeleted(1);
-						rhzfRyLsFeign.rylsSave(ryLs);
-						jzrkEntity.setId(jzrk.getId());
-						rhzfJzrkFeign.jzrkUpdate(jzrkEntity);
-					}
-					ryId = bzdzService.selectJzrkId(jzrkEntity);
-				} else if (syjzryVO.getRyType().equals("未落人口")) {
-					// 未落常口
-					RyWlrkEntity wlrkEntity = new RyWlrkEntity();
-					BeanUtils.copyProperties(syjzryVO, wlrkEntity);
-					wlrkEntity.setFwId(bzdz.getId());
-					wlrkEntity.setDzbm(syjzryVO.getDzbm());
-					wlrkEntity.setCreateUser(AuthUtil.getUserId());
-					wlrkEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-					wlrkEntity.setUpdateUser(AuthUtil.getUserId());
-					BzdzEntity wlrk = bzdzService.selectWlrkBySfzh(wlrkEntity.getRySfzh());
-					if (wlrk == null) {
-						wlrkEntity.setMjId(mjId);
-						rhzfWlrkFeign.wlrkSave(wlrkEntity);
-					} else if (!wlrkEntity.getDzbm().equals(wlrk.getDzbm())) {
-						RhzfRyLsEntity ryLs = new RhzfRyLsEntity();
-						ryLs.setFwId(wlrk.getFwId());
-						ryLs.setRyId(wlrk.getId());
-						ryLs.setDzbm(wlrk.getDzbm());
-						ryLs.setRyType(syjzryVO.getRyType());
-						ryLs.setRyXm(syjzryVO.getRyXm());
-						ryLs.setRyXb(syjzryVO.getRyXb());
-						ryLs.setRySfzh(syjzryVO.getRySfzh());
-						ryLs.setRyDh(syjzryVO.getRyDh());
-						ryLs.setRyTsLb(syjzryVO.getRyTsLb());
-						ryLs.setZxyy(syjzryVO.getZxyy());
-						ryLs.setZxrq(syjzryVO.getZxrq());
-						ryLs.setRyXs(syjzryVO.getRyXs());
-						ryLs.setRyMz(syjzryVO.getRyYwm());
-						ryLs.setRyZjhm(syjzryVO.getRyZjhm());
-						ryLs.setCreateUser(AuthUtil.getUserId());
-						ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-						ryLs.setUpdateUser(AuthUtil.getUserId());
-						ryLs.setIsDeleted(1);
-						rhzfRyLsFeign.rylsSave(ryLs);
-						wlrkEntity.setId(wlrk.getId());
-						rhzfWlrkFeign.wlrkUpdate(wlrkEntity);
-					}
-					ryId = bzdzService.selectWlrkId(wlrkEntity);
-				} else if (syjzryVO.getRyType().equals("暂住人口")) {
-					// 暂住人口
-					RyZzrkEntity zzrkEntity = new RyZzrkEntity();
-					BeanUtils.copyProperties(syjzryVO, zzrkEntity);
-					zzrkEntity.setFwId(bzdz.getId());
-					zzrkEntity.setDzbm(syjzryVO.getDzbm());
-					zzrkEntity.setCreateUser(AuthUtil.getUserId());
-					zzrkEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-					zzrkEntity.setUpdateUser(AuthUtil.getUserId());
-					BzdzEntity zzrk = bzdzService.selectZzrkBySfzh(zzrkEntity.getRySfzh());
-					if (zzrk == null) {
-						zzrkEntity.setMjId(mjId);
-						rhzfZzrkFeign.zzrkSave(zzrkEntity);
-					} else if (!zzrkEntity.getDzbm().equals(zzrk.getDzbm())) {
-						RhzfRyLsEntity ryLs = new RhzfRyLsEntity();
-						ryLs.setFwId(zzrk.getFwId());
-						ryLs.setRyId(zzrk.getId());
-						ryLs.setDzbm(zzrk.getDzbm());
-						ryLs.setRyType(syjzryVO.getRyType());
-						ryLs.setRyXm(syjzryVO.getRyXm());
-						ryLs.setRyXb(syjzryVO.getRyXb());
-						ryLs.setRySfzh(syjzryVO.getRySfzh());
-						ryLs.setRyDh(syjzryVO.getRyDh());
-						ryLs.setRyTsLb(syjzryVO.getRyTsLb());
-						ryLs.setZxyy(syjzryVO.getZxyy());
-						ryLs.setZxrq(syjzryVO.getZxrq());
-						ryLs.setRyXs(syjzryVO.getRyXs());
-						ryLs.setRyMz(syjzryVO.getRyYwm());
-						ryLs.setRyZjhm(syjzryVO.getRyZjhm());
-						ryLs.setCreateUser(AuthUtil.getUserId());
-						ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-						ryLs.setUpdateUser(AuthUtil.getUserId());
-						ryLs.setIsDeleted(1);
-						rhzfRyLsFeign.rylsSave(ryLs);
-						zzrkEntity.setId(zzrk.getId());
-						rhzfZzrkFeign.zzrkUpdate(zzrkEntity);
-					}
-					ryId = bzdzService.selectZzrkId(zzrkEntity);
-				}
-				// 新增人员 需要 保存房屋_人员关系
-				if (type == 1) {
-					FwRyEntity fwRyEntity = new FwRyEntity();
-					fwRyEntity.setFwId(bzdz.getId());
-					fwRyEntity.setRyId(ryId);
-					if (syjzryVO.getRyType().equals("常住人口")) {
-						syjzryVO.setRyType("czrk");
-					} else if (syjzryVO.getRyType().equals("境外人口")) {
-						syjzryVO.setRyType("jwrk");
-					} else if (syjzryVO.getRyType().equals("寄住人口")) {
-						syjzryVO.setRyType("jzrk");
-					} else if (syjzryVO.getRyType().equals("未落人口")) {
-						syjzryVO.setRyType("wlrk");
-					} else if (syjzryVO.getRyType().equals("暂住人口")) {
-						syjzryVO.setRyType("zzrk");
-					}
-					fwRyEntity.setRyType(syjzryVO.getRyType());
-					fwRyEntity.setDzbm(syjzryVO.getDzbm());
-					fwRyEntity.setMjId(mjId);
-					fwRyEntity.setCreateUser(AuthUtil.getUserId());
-					fwRyEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-					fwRyEntity.setUpdateUser(AuthUtil.getUserId());
-					bzdzService.updateFwRy(fwRyEntity);
-					rhzfFwRyFeign.fwrySave(fwRyEntity);
-				}
-			//}
+		//for (SyjzryVO syjzryVO : rhzfSaveVO.getSyjzryList()) {
+		if (syjzryVO.getIsDeleted() != 1 && !syjzryVO.getRyType().equals("境外人口") && StringUtils.isBlank(syjzryVO.getRySfzh())) {
+			return R.fail("请填写身份证号");
+		}
+		Long ryId = 0L;
+		int type = 1; // 1=新增 2=修改 3=删除
+		if (syjzryVO.getRyType().equals("常住人口")) {
+			// 常住人口
+			RyCzrkEntity czrkEntity = new RyCzrkEntity();
+			BeanUtils.copyProperties(syjzryVO, czrkEntity);
+			czrkEntity.setFwId(bzdz.getId());
+			czrkEntity.setDzbm(syjzryVO.getDzbm());
+			czrkEntity.setCreateUser(AuthUtil.getUserId());
+			czrkEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+			czrkEntity.setUpdateUser(AuthUtil.getUserId());
+			BzdzEntity czrk = bzdzService.selectCzrkBySfzh(czrkEntity.getRySfzh());
+			if (czrk == null) {
+				czrkEntity.setMjId(mjId);
+				rhzfCzrkFeign.czrkSave(czrkEntity);
+			} else if (!czrkEntity.getDzbm().equals(czrk.getDzbm())) {
+				RhzfRyLsEntity ryLs = new RhzfRyLsEntity();
+				ryLs.setFwId(czrk.getFwId());
+				ryLs.setRyId(czrk.getId());
+				ryLs.setDzbm(czrk.getDzbm());
+				ryLs.setRyType(syjzryVO.getRyType());
+				ryLs.setRyXm(syjzryVO.getRyXm());
+				ryLs.setRyXb(syjzryVO.getRyXb());
+				ryLs.setRySfzh(syjzryVO.getRySfzh());
+				ryLs.setRyDh(syjzryVO.getRyDh());
+				ryLs.setRyTsLb(syjzryVO.getRyTsLb());
+				ryLs.setZxyy(syjzryVO.getZxyy());
+				ryLs.setZxrq(syjzryVO.getZxrq());
+				ryLs.setRyXs(syjzryVO.getRyXs());
+				ryLs.setRyMz(syjzryVO.getRyYwm());
+				ryLs.setRyZjhm(syjzryVO.getRyZjhm());
+				ryLs.setCreateUser(AuthUtil.getUserId());
+				ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+				ryLs.setUpdateUser(AuthUtil.getUserId());
+				ryLs.setIsDeleted(1);
+				rhzfRyLsFeign.rylsSave(ryLs);
+				czrkEntity.setId(czrk.getId());
+				rhzfCzrkFeign.czrkUpdate(czrkEntity);
+			}
+			ryId = bzdzService.selectCzrkId(czrkEntity);
+		} else if (syjzryVO.getRyType().equals("境外人口")) {
+			// 境外人口
+			RyJwrkEntity jwrkEntity = new RyJwrkEntity();
+			BeanUtils.copyProperties(syjzryVO, jwrkEntity);
+			jwrkEntity.setFwId(bzdz.getId());
+			jwrkEntity.setRyMz(syjzryVO.getRyYwm());
+			jwrkEntity.setDzbm(syjzryVO.getDzbm());
+			jwrkEntity.setCreateUser(AuthUtil.getUserId());
+			jwrkEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+			jwrkEntity.setUpdateUser(AuthUtil.getUserId());
+			BzdzEntity jwrk = bzdzService.selectJwrkByZjhm(jwrkEntity.getRyZjhm());
+			if (jwrk == null) {
+				jwrkEntity.setMjId(mjId);
+				rhzfJwrkFeign.jwrkSave(jwrkEntity);
+			} else if (!jwrkEntity.getDzbm().equals(jwrk.getDzbm())) {
+				RhzfRyLsEntity ryLs = new RhzfRyLsEntity();
+				ryLs.setFwId(jwrk.getFwId());
+				ryLs.setRyId(jwrk.getId());
+				ryLs.setDzbm(jwrk.getDzbm());
+				ryLs.setRyType(syjzryVO.getRyType());
+				ryLs.setRyXm(syjzryVO.getRyXm());
+				ryLs.setRyXb(syjzryVO.getRyXb());
+				ryLs.setRySfzh(syjzryVO.getRySfzh());
+				ryLs.setRyDh(syjzryVO.getRyDh());
+				ryLs.setRyTsLb(syjzryVO.getRyTsLb());
+				ryLs.setZxyy(syjzryVO.getZxyy());
+				ryLs.setZxrq(syjzryVO.getZxrq());
+				ryLs.setRyXs(syjzryVO.getRyXs());
+				ryLs.setRyMz(syjzryVO.getRyYwm());
+				ryLs.setRyZjhm(syjzryVO.getRyZjhm());
+				ryLs.setCreateUser(AuthUtil.getUserId());
+				ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+				ryLs.setUpdateUser(AuthUtil.getUserId());
+				ryLs.setIsDeleted(1);
+				rhzfRyLsFeign.rylsSave(ryLs);
+				jwrkEntity.setId(jwrk.getId());
+				rhzfJwrkFeign.jwrkUpdate(jwrkEntity);
+			}
+			ryId = bzdzService.selectJwrkId(jwrkEntity);
+		} else if (syjzryVO.getRyType().equals("寄住人口")) {
+			// 寄住人口
+			RyJzrkEntity jzrkEntity = new RyJzrkEntity();
+			BeanUtils.copyProperties(syjzryVO, jzrkEntity);
+			jzrkEntity.setFwId(bzdz.getId());
+			jzrkEntity.setDzbm(syjzryVO.getDzbm());
+			jzrkEntity.setCreateUser(AuthUtil.getUserId());
+			jzrkEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+			jzrkEntity.setUpdateUser(AuthUtil.getUserId());
+			BzdzEntity jzrk = bzdzService.selectJzrkBySfzh(jzrkEntity.getRySfzh());
+			if (jzrk == null) {
+				jzrkEntity.setMjId(mjId);
+				rhzfJzrkFeign.jzrkSave(jzrkEntity);
+			} else if (!jzrkEntity.getDzbm().equals(jzrk.getDzbm())) {
+				RhzfRyLsEntity ryLs = new RhzfRyLsEntity();
+				ryLs.setFwId(jzrk.getFwId());
+				ryLs.setRyId(jzrk.getId());
+				ryLs.setDzbm(jzrk.getDzbm());
+				ryLs.setRyType(syjzryVO.getRyType());
+				ryLs.setRyXm(syjzryVO.getRyXm());
+				ryLs.setRyXb(syjzryVO.getRyXb());
+				ryLs.setRySfzh(syjzryVO.getRySfzh());
+				ryLs.setRyDh(syjzryVO.getRyDh());
+				ryLs.setRyTsLb(syjzryVO.getRyTsLb());
+				ryLs.setZxyy(syjzryVO.getZxyy());
+				ryLs.setZxrq(syjzryVO.getZxrq());
+				ryLs.setRyXs(syjzryVO.getRyXs());
+				ryLs.setRyMz(syjzryVO.getRyYwm());
+				ryLs.setRyZjhm(syjzryVO.getRyZjhm());
+				ryLs.setCreateUser(AuthUtil.getUserId());
+				ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+				ryLs.setUpdateUser(AuthUtil.getUserId());
+				ryLs.setIsDeleted(1);
+				rhzfRyLsFeign.rylsSave(ryLs);
+				jzrkEntity.setId(jzrk.getId());
+				rhzfJzrkFeign.jzrkUpdate(jzrkEntity);
+			}
+			ryId = bzdzService.selectJzrkId(jzrkEntity);
+		} else if (syjzryVO.getRyType().equals("未落人口")) {
+			// 未落常口
+			RyWlrkEntity wlrkEntity = new RyWlrkEntity();
+			BeanUtils.copyProperties(syjzryVO, wlrkEntity);
+			wlrkEntity.setFwId(bzdz.getId());
+			wlrkEntity.setDzbm(syjzryVO.getDzbm());
+			wlrkEntity.setCreateUser(AuthUtil.getUserId());
+			wlrkEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+			wlrkEntity.setUpdateUser(AuthUtil.getUserId());
+			BzdzEntity wlrk = bzdzService.selectWlrkBySfzh(wlrkEntity.getRySfzh());
+			if (wlrk == null) {
+				wlrkEntity.setMjId(mjId);
+				rhzfWlrkFeign.wlrkSave(wlrkEntity);
+			} else if (!wlrkEntity.getDzbm().equals(wlrk.getDzbm())) {
+				RhzfRyLsEntity ryLs = new RhzfRyLsEntity();
+				ryLs.setFwId(wlrk.getFwId());
+				ryLs.setRyId(wlrk.getId());
+				ryLs.setDzbm(wlrk.getDzbm());
+				ryLs.setRyType(syjzryVO.getRyType());
+				ryLs.setRyXm(syjzryVO.getRyXm());
+				ryLs.setRyXb(syjzryVO.getRyXb());
+				ryLs.setRySfzh(syjzryVO.getRySfzh());
+				ryLs.setRyDh(syjzryVO.getRyDh());
+				ryLs.setRyTsLb(syjzryVO.getRyTsLb());
+				ryLs.setZxyy(syjzryVO.getZxyy());
+				ryLs.setZxrq(syjzryVO.getZxrq());
+				ryLs.setRyXs(syjzryVO.getRyXs());
+				ryLs.setRyMz(syjzryVO.getRyYwm());
+				ryLs.setRyZjhm(syjzryVO.getRyZjhm());
+				ryLs.setCreateUser(AuthUtil.getUserId());
+				ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+				ryLs.setUpdateUser(AuthUtil.getUserId());
+				ryLs.setIsDeleted(1);
+				rhzfRyLsFeign.rylsSave(ryLs);
+				wlrkEntity.setId(wlrk.getId());
+				rhzfWlrkFeign.wlrkUpdate(wlrkEntity);
+			}
+			ryId = bzdzService.selectWlrkId(wlrkEntity);
+		} else if (syjzryVO.getRyType().equals("暂住人口")) {
+			// 暂住人口
+			RyZzrkEntity zzrkEntity = new RyZzrkEntity();
+			BeanUtils.copyProperties(syjzryVO, zzrkEntity);
+			zzrkEntity.setFwId(bzdz.getId());
+			zzrkEntity.setDzbm(syjzryVO.getDzbm());
+			zzrkEntity.setCreateUser(AuthUtil.getUserId());
+			zzrkEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+			zzrkEntity.setUpdateUser(AuthUtil.getUserId());
+			BzdzEntity zzrk = bzdzService.selectZzrkBySfzh(zzrkEntity.getRySfzh());
+			if (zzrk == null) {
+				zzrkEntity.setMjId(mjId);
+				rhzfZzrkFeign.zzrkSave(zzrkEntity);
+			} else if (!zzrkEntity.getDzbm().equals(zzrk.getDzbm())) {
+				RhzfRyLsEntity ryLs = new RhzfRyLsEntity();
+				ryLs.setFwId(zzrk.getFwId());
+				ryLs.setRyId(zzrk.getId());
+				ryLs.setDzbm(zzrk.getDzbm());
+				ryLs.setRyType(syjzryVO.getRyType());
+				ryLs.setRyXm(syjzryVO.getRyXm());
+				ryLs.setRyXb(syjzryVO.getRyXb());
+				ryLs.setRySfzh(syjzryVO.getRySfzh());
+				ryLs.setRyDh(syjzryVO.getRyDh());
+				ryLs.setRyTsLb(syjzryVO.getRyTsLb());
+				ryLs.setZxyy(syjzryVO.getZxyy());
+				ryLs.setZxrq(syjzryVO.getZxrq());
+				ryLs.setRyXs(syjzryVO.getRyXs());
+				ryLs.setRyMz(syjzryVO.getRyYwm());
+				ryLs.setRyZjhm(syjzryVO.getRyZjhm());
+				ryLs.setCreateUser(AuthUtil.getUserId());
+				ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+				ryLs.setUpdateUser(AuthUtil.getUserId());
+				ryLs.setIsDeleted(1);
+				rhzfRyLsFeign.rylsSave(ryLs);
+				zzrkEntity.setId(zzrk.getId());
+				rhzfZzrkFeign.zzrkUpdate(zzrkEntity);
+			}
+			ryId = bzdzService.selectZzrkId(zzrkEntity);
+		}
+		// 新增人员 需要 保存房屋_人员关系
+		if (type == 1) {
+			FwRyEntity fwRyEntity = new FwRyEntity();
+			fwRyEntity.setFwId(bzdz.getId());
+			fwRyEntity.setRyId(ryId);
+			if (syjzryVO.getRyType().equals("常住人口")) {
+				syjzryVO.setRyType("czrk");
+			} else if (syjzryVO.getRyType().equals("境外人口")) {
+				syjzryVO.setRyType("jwrk");
+			} else if (syjzryVO.getRyType().equals("寄住人口")) {
+				syjzryVO.setRyType("jzrk");
+			} else if (syjzryVO.getRyType().equals("未落人口")) {
+				syjzryVO.setRyType("wlrk");
+			} else if (syjzryVO.getRyType().equals("暂住人口")) {
+				syjzryVO.setRyType("zzrk");
+			}
+			fwRyEntity.setRyType(syjzryVO.getRyType());
+			fwRyEntity.setDzbm(syjzryVO.getDzbm());
+			fwRyEntity.setMjId(mjId);
+			fwRyEntity.setCreateUser(AuthUtil.getUserId());
+			fwRyEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+			fwRyEntity.setUpdateUser(AuthUtil.getUserId());
+			bzdzService.updateFwRy(fwRyEntity);
+			rhzfFwRyFeign.fwrySave(fwRyEntity);
+		}
+		//}
 		//}
 		return R.success("操作成功");
 	}
@@ -471,7 +469,7 @@ public class BzdzController {
 		ryLs.setRyMz(syrkzxVO.getRyYwm());
 		ryLs.setRyZjhm(syrkzxVO.getRyZjhm());
 		ryLs.setCreateUser(AuthUtil.getUserId());
-		ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+		ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
 		ryLs.setUpdateUser(AuthUtil.getUserId());
 		ryLs.setIsDeleted(1);
 		syrkzxVO.setUpdateUser(AuthUtil.getUserId());
@@ -509,7 +507,7 @@ public class BzdzController {
 		if (sydw == null) {
 			UserVO user = bzdzService.djxx(AuthUtil.getUserId());
 			sydwEntity.setCreateUser(AuthUtil.getUserId());
-			sydwEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+			sydwEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
 			sydwEntity.setDjrxm(AuthUtil.getUserName());
 			sydwEntity.setDjrjh(AuthUtil.getUserAccount());
 			sydwEntity.setDjrsfzh(user.getSfzh());
@@ -518,7 +516,7 @@ public class BzdzController {
 			sydwFeign.sydwSave(sydwEntity);
 			for (CyryEntity cyryEntity:sydwEntity.getCyryList()) {
 				cyryEntity.setCreateUser(AuthUtil.getUserId());
-				cyryEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+				cyryEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
 				cyryEntity.setDwdzbm(sydwEntity.getDzbm());
 				sydwFeign.cyrySave(cyryEntity);
 			}
@@ -554,7 +552,7 @@ public class BzdzController {
 	@PostMapping("fzzx")
 	public R fzzx(@RequestBody FwFzEntity fwFzEntity) {
 		fwFzEntity.setCreateUser(AuthUtil.getUserId());
-		fwFzEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+		fwFzEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
 		fwFzEntity.setCreateTime(new Date());
 		fwFzEntity.setUpdateTime(new Date());
 		fwFzEntity.setIsDeleted(1);
@@ -568,7 +566,7 @@ public class BzdzController {
 	@PostMapping("saveFz")
 	public R saveFz(@RequestBody FwFzEntity fwFzEntity) {
 		fwFzEntity.setCreateUser(AuthUtil.getUserId());
-		fwFzEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+		fwFzEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
 		return R.data(rhzfFzFeign.fzSave(fwFzEntity));
 	}
 
@@ -589,7 +587,10 @@ public class BzdzController {
 	public R sydwLsjl(String dzbm) {
 		List<SydwEntity> list = bzdzService.sydwLsjl(dzbm);
 		for (SydwEntity sydw:list) {
-			List<CyryEntity> cyry = bzdzService.cyryLsjl(sydw.getDzbm());
+			if (sydw.getDjrsfzh() != null) {
+				sydw.setDjrsfzh(AESUtil.decrypt(sydw.getDjrsfzh(), "2SexR1rfjZ8CD3M6"));
+			}
+			List<CyryEntity> cyry = bzdzService.cyryLsjl(sydw.getTyshxydm());
 			sydw.setCyryList(cyry);
 		}
 		return R.data(list);
@@ -600,19 +601,18 @@ public class BzdzController {
 	 */
 	@GetMapping("selectXxBySfzh")
 	public R selectXxBySfzh(String fzSfzh) {
-		FwFzEntity ryxx = bzdzService.selectXxBySfzh(fzSfzh);
-		Dept dept = bzdzService.selectDeptById(AuthUtil.getDeptId());
-		BzdzEntity dzpcs = bzdzService.selectRyxxBySfzh(fzSfzh);
-		if (dzpcs != null && !dept.getPcsId().equals(dzpcs.getPcsjgdm()) && dept.getSjId().contains(dzpcs.getDqm())) {
-			ryxx.setRyType("寄住人口");
+		RkxxEntity rkxx = rkxxFeign.rkxx(fzSfzh);
+		Dept dept = bzdzService.selectDeptById(AuthUtil.getDeptId().split(",")[0]);
+		if (rkxx != null && !dept.getPcsId().equals(rkxx.getPcsjgdm()) && dept.getSjId().contains(rkxx.getDqm())) {
+			rkxx.setRyType("寄住人口");
 		}
-		if (dzpcs != null && !dept.getSjId().contains(dzpcs.getDqm())) {
-			ryxx.setRyType("暂住人口");
+		if (rkxx != null && !dept.getSjId().contains(rkxx.getDqm())) {
+			rkxx.setRyType("暂住人口");
 		}
-		if (dzpcs != null && dept.getPcsId().equals(dzpcs.getPcsjgdm())) {
-			ryxx.setRyType("常住人口");
+		if (rkxx != null && dept.getPcsId().equals(rkxx.getPcsjgdm())) {
+			rkxx.setRyType("常住人口");
 		}
-		return R.data(ryxx);
+		return R.data(rkxx);
 	}
 
 	/**
@@ -621,7 +621,7 @@ public class BzdzController {
 	@GetMapping("selectDzByDeptId")
 	public R selectDzByDeptId() {
 		List<DwdzVO> list = new ArrayList<>();
-		List<String> dzbm = bzdzService.selectFwInfo(AuthUtil.getDeptId());
+		List<String> dzbm = bzdzService.selectFwInfo(AuthUtil.getDeptId().split(",")[0]);
 		for (String dz:dzbm) {
 			DwdzVO dwdzVO = bzdzService.selectDwDz(dz);
 			list.add(dwdzVO);
@@ -635,10 +635,10 @@ public class BzdzController {
 	@GetMapping("selectSyrkBySfzh")
 	public R selectSyrkBySfzh(BzdzEntity bzdzEntity) {
 		BzdzEntity bzdz = bzdzService.selectSyrkBySfzh(bzdzEntity, AuthUtil.getDeptId());
-		if (bzdz == null) {
+		if (bzdz == null || bzdzEntity.getFwId().equals(bzdz.getFwId())) {
 			return R.data(null);
 		}
-		if (bzdz.getCreateDept().toString().equals(AuthUtil.getDeptId())) {
+		if (bzdz.getCreateDept().toString().equals(AuthUtil.getDeptId().split(",")[0])) {
 			return R.data("你已在其他房屋录入此人口，是否将他迁入到此房屋");
 		}
 		BzdzEntity pcs = bzdzService.selectPcsByCreateDept(bzdz.getCreateDept());
@@ -650,23 +650,17 @@ public class BzdzController {
 	 */
 	@PostMapping("updateSyrkStatus")
 	public R updateSyrkStatus(@RequestBody BzdzEntity bzdzEntity) {
-		bzdzEntity.setUpdateDept(AuthUtil.getDeptId());
-		if (bzdzEntity.getRyType().equals("常住人口")) {
-			// 常住人口
-			bzdzService.czrkUpdate(bzdzEntity);
-		} else if (bzdzEntity.getRyType().equals("境外人口")) {
-			// 境外人口
-			bzdzService.jwrkUpdate(bzdzEntity);
-		} else if (bzdzEntity.getRyType().equals("寄住人口")) {
-			// 寄住人口
-			bzdzService.jzrkUpdate(bzdzEntity);
-		} else if (bzdzEntity.getRyType().equals("未落人口")) {
-			// 未落常口
-			bzdzService.wlrkUpdate(bzdzEntity);
-		} else if (bzdzEntity.getRyType().equals("暂住人口")) {
-			// 暂住人口
-			bzdzService.zzrkUpdate(bzdzEntity);
-		}
+		bzdzEntity.setUpdateDept(AuthUtil.getDeptId().split(",")[0]);
+		// 常住人口
+		bzdzService.czrkUpdate(bzdzEntity);
+		// 境外人口
+		bzdzService.jwrkUpdate(bzdzEntity);
+		// 寄住人口
+		bzdzService.jzrkUpdate(bzdzEntity);
+		// 未落常口
+		bzdzService.wlrkUpdate(bzdzEntity);
+		// 暂住人口
+		bzdzService.zzrkUpdate(bzdzEntity);
 		return R.data("操作成功");
 	}
 
@@ -691,7 +685,7 @@ public class BzdzController {
 		ryLs.setRyMz(syjzryVO.getRyYwm());
 		ryLs.setRyZjhm(syjzryVO.getRyZjhm());
 		ryLs.setCreateUser(AuthUtil.getUserId());
-		ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+		ryLs.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
 		ryLs.setUpdateUser(AuthUtil.getUserId());
 		ryLs.setIsDeleted(1);
 		rhzfRyLsFeign.rylsSave(ryLs);
@@ -700,35 +694,161 @@ public class BzdzController {
 		fwRyEntity.setRyId(syjzryVO.getId());
 		fwRyEntity.setDzbm(syjzryVO.getNewDzbm());
 		fwRyEntity.setCreateUser(AuthUtil.getUserId());
-		fwRyEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+		fwRyEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
 		fwRyEntity.setUpdateUser(AuthUtil.getUserId());
 		bzdzService.updateFwRy(fwRyEntity);
-		if (syjzryVO.getRyType().equals("常住人口")) {
-			// 常住人口
-			fwRyEntity.setRyType("czrk");
-			rhzfFwRyFeign.fwrySave(fwRyEntity);
-			bzdzService.updatePcsCzrk(syjzryVO);
-		} else if (syjzryVO.getRyType().equals("境外人口")) {
-			// 境外人口
-			fwRyEntity.setRyType("jwrk");
-			rhzfFwRyFeign.fwrySave(fwRyEntity);
-			bzdzService.updatePcsJwrk(syjzryVO);
-		} else if (syjzryVO.getRyType().equals("寄住人口")) {
-			// 寄住人口
-			fwRyEntity.setRyType("jzrk");
-			rhzfFwRyFeign.fwrySave(fwRyEntity);
-			bzdzService.updatePcsJzrk(syjzryVO);
-		} else if (syjzryVO.getRyType().equals("未落人口")) {
-			// 未落常口
-			fwRyEntity.setRyType("wlrk");
-			rhzfFwRyFeign.fwrySave(fwRyEntity);
-			bzdzService.updatePcsWlrk(syjzryVO);
-		} else if (syjzryVO.getRyType().equals("暂住人口")) {
-			// 暂住人口
-			fwRyEntity.setRyType("zzrk");
-			rhzfFwRyFeign.fwrySave(fwRyEntity);
-			bzdzService.updatePcsZzrk(syjzryVO);
+		if (syjzryVO.getRyType().equals(syjzryVO.getNewType())) {
+			if (syjzryVO.getRyType().equals("常住人口")) {
+				// 常住人口
+				fwRyEntity.setRyType("czrk");
+				rhzfFwRyFeign.fwrySave(fwRyEntity);
+				bzdzService.updatePcsCzrk(syjzryVO);
+			} else if (syjzryVO.getRyType().equals("境外人口")) {
+				// 境外人口
+				fwRyEntity.setRyType("jwrk");
+				rhzfFwRyFeign.fwrySave(fwRyEntity);
+				bzdzService.updatePcsJwrk(syjzryVO);
+			} else if (syjzryVO.getRyType().equals("寄住人口")) {
+				// 寄住人口
+				fwRyEntity.setRyType("jzrk");
+				rhzfFwRyFeign.fwrySave(fwRyEntity);
+				bzdzService.updatePcsJzrk(syjzryVO);
+			} else if (syjzryVO.getRyType().equals("未落人口")) {
+				// 未落常口
+				fwRyEntity.setRyType("wlrk");
+				rhzfFwRyFeign.fwrySave(fwRyEntity);
+				bzdzService.updatePcsWlrk(syjzryVO);
+			} else if (syjzryVO.getRyType().equals("暂住人口")) {
+				// 暂住人口
+				fwRyEntity.setRyType("zzrk");
+				rhzfFwRyFeign.fwrySave(fwRyEntity);
+				bzdzService.updatePcsZzrk(syjzryVO);
+			}
+		} else {
+			// 人口类型变化，将其他人口迁移到选择的人口
+			if (syjzryVO.getNewType().equals("常住人口")) {
+				// 常住人口
+				fwRyEntity.setRyType("czrk");
+				rhzfFwRyFeign.fwrySave(fwRyEntity);
+				RyCzrkEntity ryCzrk = new RyCzrkEntity();
+				BeanUtil.copyProperties(syjzryVO, ryCzrk);
+				ryCzrk.setFwId(syjzryVO.getNewFwId());
+				ryCzrk.setCreateDept(Long.valueOf(syjzryVO.getUpdateDept()));
+				ryCzrk.setDzbm(syjzryVO.getNewDzbm());
+				ryCzrk.setStatus(1);
+				ryCzrk.setNewFwId(null);
+				ryCzrk.setUpdateDept(null);
+				ryCzrk.setNewDzbm(null);
+				ryCzrk.setNewType(null);
+				rhzfCzrkFeign.czrkSave(ryCzrk);
+			} else if (syjzryVO.getNewType().equals("境外人口")) {
+				// 境外人口
+				fwRyEntity.setRyType("jwrk");
+				rhzfFwRyFeign.fwrySave(fwRyEntity);
+				RyJwrkEntity ryJwrk = new RyJwrkEntity();
+				BeanUtil.copyProperties(syjzryVO, ryJwrk);
+				ryJwrk.setFwId(syjzryVO.getNewFwId());
+				ryJwrk.setCreateDept(Long.valueOf(syjzryVO.getUpdateDept()));
+				ryJwrk.setDzbm(syjzryVO.getNewDzbm());
+				ryJwrk.setStatus(1);
+				ryJwrk.setNewFwId(null);
+				ryJwrk.setUpdateDept(null);
+				ryJwrk.setNewDzbm(null);
+				ryJwrk.setNewType(null);
+				rhzfJwrkFeign.jwrkSave(ryJwrk);
+			} else if (syjzryVO.getNewType().equals("寄住人口")) {
+				// 寄住人口
+				fwRyEntity.setRyType("jzrk");
+				rhzfFwRyFeign.fwrySave(fwRyEntity);
+				RyJzrkEntity ryJzrk = new RyJzrkEntity();
+				BeanUtil.copyProperties(syjzryVO, ryJzrk);
+				ryJzrk.setFwId(syjzryVO.getNewFwId());
+				ryJzrk.setCreateDept(Long.valueOf(syjzryVO.getUpdateDept()));
+				ryJzrk.setDzbm(syjzryVO.getNewDzbm());
+				ryJzrk.setStatus(1);
+				ryJzrk.setNewFwId(null);
+				ryJzrk.setUpdateDept(null);
+				ryJzrk.setNewDzbm(null);
+				ryJzrk.setNewType(null);
+				rhzfJzrkFeign.jzrkSave(ryJzrk);
+			} else if (syjzryVO.getNewType().equals("未落人口")) {
+				// 未落常口
+				fwRyEntity.setRyType("wlrk");
+				rhzfFwRyFeign.fwrySave(fwRyEntity);
+				RyWlrkEntity ryWlrk = new RyWlrkEntity();
+				BeanUtil.copyProperties(syjzryVO, ryWlrk);
+				ryWlrk.setFwId(syjzryVO.getNewFwId());
+				ryWlrk.setCreateDept(Long.valueOf(syjzryVO.getUpdateDept()));
+				ryWlrk.setDzbm(syjzryVO.getNewDzbm());
+				ryWlrk.setStatus(1);
+				ryWlrk.setNewFwId(null);
+				ryWlrk.setUpdateDept(null);
+				ryWlrk.setNewDzbm(null);
+				ryWlrk.setNewType(null);
+				rhzfWlrkFeign.wlrkSave(ryWlrk);
+			} else if (syjzryVO.getNewType().equals("暂住人口")) {
+				// 暂住人口
+				fwRyEntity.setRyType("zzrk");
+				rhzfFwRyFeign.fwrySave(fwRyEntity);
+				RyZzrkEntity ryZzrk = new RyZzrkEntity();
+				BeanUtil.copyProperties(syjzryVO, ryZzrk);
+				ryZzrk.setFwId(syjzryVO.getNewFwId());
+				ryZzrk.setCreateDept(Long.valueOf(syjzryVO.getUpdateDept()));
+				ryZzrk.setDzbm(syjzryVO.getNewDzbm());
+				ryZzrk.setStatus(1);
+				ryZzrk.setNewFwId(null);
+				ryZzrk.setUpdateDept(null);
+				ryZzrk.setNewDzbm(null);
+				ryZzrk.setNewType(null);
+				rhzfZzrkFeign.zzrkSave(ryZzrk);
+			}
+			// 人口迁移之后，将老数据删除
+			if (syjzryVO.getRyType().equals("常住人口")) {
+				// 常住人口
+				bzdzService.detelePcsCzrk(syjzryVO);
+			} else if (syjzryVO.getRyType().equals("境外人口")) {
+				// 境外人口
+				bzdzService.detelePcsJwrk(syjzryVO);
+			} else if (syjzryVO.getRyType().equals("寄住人口")) {
+				// 寄住人口
+				bzdzService.detelePcsJzrk(syjzryVO);
+			} else if (syjzryVO.getRyType().equals("未落人口")) {
+				// 未落常口
+				bzdzService.detelePcsWlrk(syjzryVO);
+			} else if (syjzryVO.getRyType().equals("暂住人口")) {
+				// 暂住人口
+				bzdzService.detelePcsZzrk(syjzryVO);
+			}
 		}
 		return R.data("操作成功");
 	}
+
+	/**
+	 * 从业人员查询
+	 */
+	@GetMapping("cyrycx")
+	public R cyrycx(String fzSfzh) {
+		BzdzEntity cyrycx = bzdzService.cyrycx(fzSfzh);
+		if (cyrycx != null) {
+			return R.data(cyrycx);
+		}
+		return R.data("该人员没在实有人口登记");
+	}
+
+	/**
+	 * 查询人口迁移数据
+	 */
+	@GetMapping("selectRkqy")
+	public R selectRkqy() {
+		List<BzdzEntity> list = bzdzService.selectRkqy(AuthUtil.getDeptId());
+		return R.data(list);
+	}
+
+	/**
+	 * 通过地址编码获取房屋id
+	 */
+	@GetMapping("fwIdByDzbm")
+	public R fwIdByDzbm(String dzbm) {
+		return R.data(bzdzService.fwIdByDzbm(dzbm));
+	}
 }

blade-service/blade-bzdz/src/main/java/org/springblade/modules/mapper/BzdzMapper.java

@@ -25,7 +25,7 @@ public interface BzdzMapper extends BaseMapper<BzdzEntity> {
 
 	void fzlsSave(BzdzEntity fz);
 
-	List<FzLsVO> selectFzLs(Long fzid);
+	List<FzLsVO> selectFzLs(Long id);
 
     List<SyjzryVO> syrkDetail(String dzbm);
 
@@ -134,4 +134,24 @@ public interface BzdzMapper extends BaseMapper<BzdzEntity> {
 	Dept selectDeptById(String deptId);
 
 	BzdzEntity selectRyxxBySfzh(String rySfzh);
+
+	BzdzEntity cyrycx(String fzSfzh);
+
+	List<BzdzEntity> selectRkqy(String deptId);
+
+	void detelePcsCzrk(SyjzryVO syjzryVO);
+
+	void detelePcsJwrk(SyjzryVO syjzryVO);
+
+	void detelePcsJzrk(SyjzryVO syjzryVO);
+
+	void detelePcsWlrk(SyjzryVO syjzryVO);
+
+	void detelePcsZzrk(SyjzryVO syjzryVO);
+
+	List<SydwEntity> sydwlsDetail(SydwEntity sydwEntity);
+
+	Long fwIdByDzbm(String dzbm);
+
+	Long selectParentIdByDeptId(String deptId);
 }

blade-service/blade-bzdz/src/main/java/org/springblade/modules/mapper/BzdzMapper.xml

@@ -124,7 +124,7 @@
             rff.sfzcjz
         from jdrh.rhzf_fw_info rfi
         left join sspt.rk_dzxx rd on rfi.dzbm = rd.dzbm
-        left join jdrh.rhzf_fw_fz rff on rfi.id = rff.fw_id
+        left join jdrh.rhzf_fw_fz rff on rfi.id = rff.fw_id and rff.is_deleted = 0
         where rfi.is_deleted = 0 and rfi.dzbm = #{params.dzbm}
     </select>
 
@@ -136,7 +136,7 @@
             <if test="fzDh != null and fzDh != ''">fz_dh = #{fzDh},</if>
             <if test="fzDw != null and fzDw != ''">fz_dw = #{fzDw},</if>
             <if test="fzJzd != null and fzJzd != ''">fz_jzd = #{fzJzd},</if>
-            <if test="sfzcjz != null and sfzcjz != ''">sfzcjz = #{jz},</if>
+            <if test="sfzcjz != null">sfzcjz = #{sfzcjz},</if>
             <if test="fzGj != null and fzGj != ''">fz_gj = #{fzGj},</if>
             <if test="fzYwx != null and fzYwx != ''">fz_ywx = #{fzYwx},</if>
             <if test="fzYwm != null and fzYwm != ''">fz_ywm = #{fzYwm},</if>
@@ -159,7 +159,7 @@
     </insert>
 
     <select id="selectFzLs" resultType="org.springblade.modules.vo.FzLsVO">
-        select * from jdrh.rhzf_fz_ls where is_deleted = 1 and id = #{fzid}
+        select * from jdrh.rhzf_fz_ls where is_deleted = 1 and fw_id = #{id}
     </select>
 
     <select id="syrkDetail" resultType="org.springblade.modules.vo.SyjzryVO">
@@ -514,6 +514,8 @@
             update_time = now(),
             zxyy = #{zxyy},
             zxrq = #{zxrq},
+            bcyy = #{bcyy},
+            bcrq = #{bcrq},
             qwdzssxq = #{qwdzssxq},
             qwdzxz = #{qwdzxz},
         </set>
@@ -540,6 +542,7 @@
             update_time = now(),
             zxyy = #{zxyy},
             zxrq = #{zxrq},
+            bcrq = #{bcrq},
             qwdzssxq = #{qwdzssxq},
             qwdzxz = #{qwdzxz},
         </set>
@@ -584,6 +587,7 @@
             <if test="null != sfzcjz and '' != sfzcjz">sfzcjz,</if>
             <if test="null != isDeleted and '' != isDeleted">is_deleted,</if>
             <if test="null != bz and '' != bz">bz,</if>
+            <if test="null != hjdz and '' != hjdz">hjdz,</if>
             <if test="null != zjzl and '' != zjzl">zjzl,</if>
             <if test="null != fzGj and '' != fzGj">fz_gj,</if>
             <if test="null != fzYwx and '' != fzYwx">fz_ywx,</if>
@@ -605,6 +609,7 @@
             <if test="null != sfzcjz and '' != sfzcjz">#{sfzcjz},</if>
             <if test="null != isDeleted and '' != isDeleted">#{isDeleted},</if>
             <if test="null != bz and '' != bz">#{bz},</if>
+            <if test="null != hjdz and '' != hjdz">#{hjdz},</if>
             <if test="null != zjzl and '' != zjzl">#{zjzl},</if>
             <if test="null != fzGj and '' != fzGj">#{fzGj},</if>
             <if test="null != fzYwx and '' != fzYwx">#{fzYwx},</if>
@@ -682,7 +687,7 @@
     </select>
 
     <select id="cyryLsjl" resultType="org.springblade.modules.entity.CyryEntity">
-        select * from jdrh.ybss_cyry where dwdzbm = #{dzbm} and is_deleted = 1
+        select distinct * from jdrh.ybss_cyry where tyshxydm = #{dzbm} and is_deleted = 1
     </select>
 
     <select id="selectXxBySfzh" resultType="org.springblade.modules.entity.FwFzEntity">
@@ -757,6 +762,7 @@
         FROM
             (
                 SELECT
+                    cz.fw_id,
                     cz.create_dept
                 FROM
                     jdrh.rhzf_ry_czrk cz
@@ -765,6 +771,7 @@
                 and cz.ry_sfzh = #{bzdzEntity.rySfzh}
                 UNION ALL
                 SELECT
+                    jw.fw_id,
                     jw.create_dept
                 FROM
                     jdrh.rhzf_ry_jwrk jw
@@ -773,6 +780,7 @@
                   and jw.ry_zjhm = #{bzdzEntity.rySfzh}
                 UNION ALL
                 SELECT
+                    jz.fw_id,
                     jz.create_dept
                 FROM
                     jdrh.rhzf_ry_jzrk jz
@@ -781,6 +789,7 @@
                   and jz.ry_sfzh = #{bzdzEntity.rySfzh}
                 UNION ALL
                 SELECT
+                    wl.fw_id,
                     wl.create_dept
                 FROM
                     jdrh.rhzf_ry_wlrk wl
@@ -789,6 +798,7 @@
                   and wl.ry_sfzh = #{bzdzEntity.rySfzh}
                 UNION ALL
                 SELECT
+                    zz.fw_id,
                     zz.create_dept
                 FROM
                     jdrh.rhzf_ry_zzrk zz
@@ -823,23 +833,23 @@
     </select>
 
     <update id="czrkUpdate">
-        update jdrh.rhzf_ry_czrk set status = 2, update_dept = #{updateDept}, new_dzbm = #{dzbm}, new_fw_id = #{fwId} where ry_sfzh = #{rySfzh}
+        update jdrh.rhzf_ry_czrk set status = 2, update_dept = #{updateDept}, new_dzbm = #{dzbm}, new_fw_id = #{fwId}, new_type = #{ryType} where ry_sfzh = #{rySfzh} and is_deleted = 0
     </update>
 
     <update id="jwrkUpdate">
-        update jdrh.rhzf_ry_jwrk set status = 2, update_dept = #{updateDept}, new_dzbm = #{dzbm}, new_fw_id = #{fwId} where ry_zjhm = #{rySfzh}
+        update jdrh.rhzf_ry_jwrk set status = 2, update_dept = #{updateDept}, new_dzbm = #{dzbm}, new_fw_id = #{fwId}, new_type = #{ryType} where ry_zjhm = #{rySfzh} and is_deleted = 0
     </update>
 
     <update id="jzrkUpdate">
-        update jdrh.rhzf_ry_jzrk set status = 2, update_dept = #{updateDept}, new_dzbm = #{dzbm}, new_fw_id = #{fwId} where ry_sfzh = #{rySfzh}
+        update jdrh.rhzf_ry_jzrk set status = 2, update_dept = #{updateDept}, new_dzbm = #{dzbm}, new_fw_id = #{fwId}, new_type = #{ryType} where ry_sfzh = #{rySfzh} and is_deleted = 0
     </update>
 
     <update id="wlrkUpdate">
-        update jdrh.rhzf_ry_wlrk set status = 2, update_dept = #{updateDept}, new_dzbm = #{dzbm}, new_fw_id = #{fwId} where ry_sfzh = #{rySfzh}
+        update jdrh.rhzf_ry_wlrk set status = 2, update_dept = #{updateDept}, new_dzbm = #{dzbm}, new_fw_id = #{fwId}, new_type = #{ryType} where ry_sfzh = #{rySfzh} and is_deleted = 0
     </update>
 
     <update id="zzrkUpdate">
-        update jdrh.rhzf_ry_zzrk set status = 2, update_dept = #{updateDept}, new_dzbm = #{dzbm}, new_fw_id = #{fwId} where ry_sfzh = #{rySfzh}
+        update jdrh.rhzf_ry_zzrk set status = 2, update_dept = #{updateDept}, new_dzbm = #{dzbm}, new_fw_id = #{fwId}, new_type = #{ryType} where ry_sfzh = #{rySfzh} and is_deleted = 0
     </update>
 
     <update id="updatePcsCzrk">
@@ -874,7 +884,8 @@
         select
             bd.id as pcsId,
             fj.id as fjId,
-            sj.id as sjId
+            sj.id as sjId,
+            bd.dept_category
         from
         jdrh.blade_dept bd
         left join jdrh.blade_dept fj on bd.parent_id = fj.id
@@ -885,4 +896,175 @@
     <select id="selectRyxxBySfzh" resultType="org.springblade.modules.entity.BzdzEntity">
         select rd.pcsjgdm, rd.dqm from sspt.ybss_xx yx left join sspt.rk_dzxx rd on yx.rydz = rd.dzbm where rysfzh = #{rySfzh}
     </select>
+
+    <select id="cyrycx" resultType="org.springblade.modules.entity.BzdzEntity">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    cz.ry_xm as fzXm,
+                    cz.ry_xb,
+                    cz.ry_dh as fzDh,
+                    cz.dzbm as rydz
+                FROM
+                    jdrh.rhzf_ry_czrk cz
+                WHERE
+                    cz.is_deleted = 0
+                  and cz.ry_sfzh = #{bzdzEntity.fzSfzh}
+                UNION ALL
+                SELECT
+                    jw.ry_xs || jw.ry_mz as fzXm,
+                    jw.ry_xb,
+                    jw.ry_dh as fzDh,
+                    jw.dzbm as rydz
+                FROM
+                    jdrh.rhzf_ry_jwrk jw
+                WHERE
+                    jw.is_deleted = 0
+                  and jw.ry_zjhm = #{bzdzEntity.fzSfzh}
+                UNION ALL
+                SELECT
+                    jz.ry_xm as fzXm,
+                    jz.ry_xb,
+                    jz.ry_dh as fzDh,
+                    jz.dzbm as rydz
+                FROM
+                    jdrh.rhzf_ry_jzrk jz
+                WHERE
+                    jz.is_deleted = 0
+                  and jz.ry_sfzh = #{bzdzEntity.fzSfzh}
+                UNION ALL
+                SELECT
+                    wl.ry_xm as fzXm,
+                    wl.ry_xb,
+                    wl.ry_dh as fzDh,
+                    wl.dzbm as rydz
+                FROM
+                    jdrh.rhzf_ry_wlrk wl
+                WHERE
+                    wl.is_deleted = 0
+                  and wl.ry_sfzh = #{bzdzEntity.fzSfzh}
+                UNION ALL
+                SELECT
+                    zz.ry_xm as fzXm,
+                    zz.ry_xb,
+                    zz.ry_dh as fzDh,
+                    zz.dzbm as rydz
+                FROM
+                    jdrh.rhzf_ry_zzrk zz
+                WHERE
+                    zz.is_deleted = 0
+                  and zz.ry_sfzh = #{bzdzEntity.fzSfzh}
+            ) rys
+    </select>
+
+    <select id="selectRkqy" resultType="org.springblade.modules.entity.BzdzEntity">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    cz.ry_xm,
+                    cz.ry_xb,
+                    cz.ry_sfzh,
+                    cz.ry_dh,
+                    bd.dept_name
+                FROM
+                    jdrh.rhzf_ry_czrk cz
+                LEFT JOIN jdrh.blade_dept bd on cz.create_dept = bd.id
+                WHERE
+                    cz.is_deleted = 0
+                and cz.status = 2
+                and (bd.id :: text = any(string_to_array(#{deptId},',')) or bd.ancestors like '%' || #{deptId} || '%')
+                UNION ALL
+                SELECT
+                    jw.ry_xs || jw.ry_mz as ryXm,
+                    jw.ry_xb,
+                    jw.ry_zjhm,
+                    jw.ry_dh,
+                    bd.dept_name
+                FROM
+                    jdrh.rhzf_ry_jwrk jw
+                LEFT JOIN jdrh.blade_dept bd on jw.create_dept = bd.id
+                WHERE
+                    jw.is_deleted = 0
+                and jw.status = 2
+                and (bd.id :: text = any(string_to_array(#{deptId},',')) or bd.ancestors like '%' || #{deptId} || '%')
+                UNION ALL
+                SELECT
+                    jz.ry_xm,
+                    jz.ry_xb,
+                    jz.ry_sfzh,
+                    jz.ry_dh,
+                    bd.dept_name
+                FROM
+                    jdrh.rhzf_ry_jzrk jz
+                LEFT JOIN jdrh.blade_dept bd on jz.create_dept = bd.id
+                WHERE
+                    jz.is_deleted = 0
+                and jz.status = 2
+                and (bd.id :: text = any(string_to_array(#{deptId},',')) or bd.ancestors like '%' || #{deptId} || '%')
+                UNION ALL
+                SELECT
+                    wl.ry_xm,
+                    wl.ry_xb,
+                    wl.ry_sfzh,
+                    wl.ry_dh,
+                    bd.dept_name
+                FROM
+                    jdrh.rhzf_ry_wlrk wl
+                LEFT JOIN jdrh.blade_dept bd on wl.create_dept = bd.id
+                WHERE
+                    wl.is_deleted = 0
+                and wl.status = 2
+                and (bd.id :: text = any(string_to_array(#{deptId},',')) or bd.ancestors like '%' || #{deptId} || '%')
+                UNION ALL
+                SELECT
+                    zz.ry_xm,
+                    zz.ry_xb,
+                    zz.ry_sfzh,
+                    zz.ry_dh,
+                    bd.dept_name
+                FROM
+                    jdrh.rhzf_ry_zzrk zz
+                LEFT JOIN jdrh.blade_dept bd on zz.create_dept = bd.id
+                WHERE
+                    zz.is_deleted = 0
+                and zz.status = 2
+                and (bd.id :: text = any(string_to_array(#{deptId},',')) or bd.ancestors like '%' || #{deptId} || '%')
+            ) rys
+    </select>
+
+    <update id="detelePcsCzrk">
+        update jdrh.rhzf_ry_czrk set is_deleted = 1, status = 1, update_dept = null, new_dzbm = null, new_fw_id = null where id = #{id}
+    </update>
+
+    <update id="detelePcsJwrk">
+        update jdrh.rhzf_ry_jwrk set is_deleted = 1, status = 1, update_dept = null, new_dzbm = null, new_fw_id = null where id = #{id}
+    </update>
+
+    <update id="detelePcsJzrk">
+        update jdrh.rhzf_ry_jzrk set is_deleted = 1, status = 1, update_dept = null, new_dzbm = null, new_fw_id = null where id = #{id}
+    </update>
+
+    <update id="detelePcsWlrk">
+        update jdrh.rhzf_ry_wlrk set is_deleted = 1, status = 1, update_dept = null, new_dzbm = null, new_fw_id = null where id = #{id}
+    </update>
+
+    <update id="detelePcsZzrk">
+        update jdrh.rhzf_ry_zzrk set is_deleted = 1, status = 1, update_dept = null, new_dzbm = null, new_fw_id = null where id = #{id}
+    </update>
+
+    <select id="sydwlsDetail" resultType="org.springblade.modules.entity.SydwEntity">
+        select * from jdrh.ybss_sydw where is_deleted = 1 and dzbm = #{dzbm}
+    </select>
+
+    <select id="fwIdByDzbm" resultType="java.lang.Long">
+        select id from jdrh.rhzf_fw_info where is_deleted = 0 and dzbm = #{dzbm}
+    </select>
+
+    <select id="selectParentIdByDeptId" resultType="java.lang.Long">
+        select parent_id from jdrh.blade_dept where id = #{deptId} :: int8
+    </select>
 </mapper>

blade-service/blade-bzdz/src/main/java/org/springblade/modules/service/BzdzService.java

@@ -1,13 +1,14 @@
 package org.springblade.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.core.mp.base.BaseService;
 import org.springblade.modules.entity.*;
 import org.springblade.modules.vo.*;
 
 import java.util.List;
 import java.util.Map;
 
-public interface BzdzService extends IService<BzdzEntity> {
+public interface BzdzService extends BaseService<BzdzEntity> {
 	List<LdBzdzVO> getJzwList(Map<String, Object> params);
 
 	List<DyVO> getDyList(Map<String, Object> params);
@@ -24,7 +25,7 @@ public interface BzdzService extends IService<BzdzEntity> {
 
 	void fzlsSave(BzdzEntity fz);
 
-	List<FzLsVO> selectFzLs(Long fzid);
+	List<FzLsVO> selectFzLs(Long id);
 
     List<SyjzryVO> syrkDetail(String dzbm);
 
@@ -129,4 +130,24 @@ public interface BzdzService extends IService<BzdzEntity> {
 	Dept selectDeptById(String deptId);
 
 	BzdzEntity selectRyxxBySfzh(String rySfzh);
+
+	BzdzEntity cyrycx(String fzSfzh);
+
+	List<BzdzEntity> selectRkqy(String deptId);
+
+	void detelePcsCzrk(SyjzryVO syjzryVO);
+
+	void detelePcsJwrk(SyjzryVO syjzryVO);
+
+	void detelePcsJzrk(SyjzryVO syjzryVO);
+
+	void detelePcsWlrk(SyjzryVO syjzryVO);
+
+	void detelePcsZzrk(SyjzryVO syjzryVO);
+
+	List<SydwEntity> sydwlsDetail(SydwEntity sydwEntity);
+
+	Long fwIdByDzbm(String dzbm);
+
+	Long selectParentIdByDeptId(String deptId);
 }

blade-service/blade-bzdz/src/main/java/org/springblade/modules/service/impl/BzdzServiceImpl.java

@@ -1,6 +1,6 @@
 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.*;
 import org.springblade.modules.mapper.BzdzMapper;
 import org.springblade.modules.service.BzdzService;
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-public class BzdzServiceImpl extends ServiceImpl<BzdzMapper, BzdzEntity> implements BzdzService {
+public class BzdzServiceImpl extends BaseServiceImpl<BzdzMapper, BzdzEntity> implements BzdzService {
 	@Override
 	public List<LdBzdzVO> getJzwList(Map<String, Object> params) {
 		return baseMapper.getJzwList(params);
@@ -53,8 +53,8 @@ public class BzdzServiceImpl extends ServiceImpl<BzdzMapper, BzdzEntity> impleme
 	}
 
 	@Override
-	public List<FzLsVO> selectFzLs(Long fzid) {
-		return baseMapper.selectFzLs(fzid);
+	public List<FzLsVO> selectFzLs(Long id) {
+		return baseMapper.selectFzLs(id);
 	}
 
 	@Override
@@ -169,7 +169,14 @@ public class BzdzServiceImpl extends ServiceImpl<BzdzMapper, BzdzEntity> impleme
 
 	@Override
 	public List<CyryEntity> cyryLsjl(String dzbm) {
-		return baseMapper.cyryLsjl(dzbm);
+		List<CyryEntity> cyryEntities = baseMapper.cyryLsjl(dzbm);
+		if (cyryEntities.size() > 0) {
+			for (CyryEntity cyry:cyryEntities) {
+				String dzbms = cyry.getXz();
+				cyry.setXz(baseMapper.getFwxzByRkDzxx(dzbms));
+			}
+		}
+		return cyryEntities;
 	}
 
 	@Override
@@ -338,4 +345,59 @@ public class BzdzServiceImpl extends ServiceImpl<BzdzMapper, BzdzEntity> impleme
 	public BzdzEntity selectRyxxBySfzh(String rySfzh) {
 		return baseMapper.selectRyxxBySfzh(rySfzh);
 	}
+
+	@Override
+	public BzdzEntity cyrycx(String fzSfzh) {
+		BzdzEntity cyrycx = baseMapper.cyrycx(fzSfzh);
+		if (cyrycx != null) {
+			String dzbm = cyrycx.getRydz();
+			cyrycx.setHjdz(baseMapper.getFwxzByRkDzxx(dzbm));
+		}
+		return cyrycx;
+	}
+
+	@Override
+	public List<BzdzEntity> selectRkqy(String deptId) {
+		return baseMapper.selectRkqy(deptId);
+	}
+
+	@Override
+	public void detelePcsCzrk(SyjzryVO syjzryVO) {
+		baseMapper.detelePcsCzrk(syjzryVO);
+	}
+
+	@Override
+	public void detelePcsJwrk(SyjzryVO syjzryVO) {
+		baseMapper.detelePcsJwrk(syjzryVO);
+	}
+
+	@Override
+	public void detelePcsJzrk(SyjzryVO syjzryVO) {
+		baseMapper.detelePcsJzrk(syjzryVO);
+	}
+
+	@Override
+	public void detelePcsWlrk(SyjzryVO syjzryVO) {
+		baseMapper.detelePcsWlrk(syjzryVO);
+	}
+
+	@Override
+	public void detelePcsZzrk(SyjzryVO syjzryVO) {
+		baseMapper.detelePcsZzrk(syjzryVO);
+	}
+
+	@Override
+	public List<SydwEntity> sydwlsDetail(SydwEntity sydwEntity) {
+		return baseMapper.sydwlsDetail(sydwEntity);
+	}
+
+	@Override
+	public Long fwIdByDzbm(String dzbm) {
+		return baseMapper.fwIdByDzbm(dzbm);
+	}
+
+	@Override
+	public Long selectParentIdByDeptId(String deptId) {
+		return baseMapper.selectParentIdByDeptId(deptId);
+	}
 }

blade-service/blade-rhzfFwLs/pom.xml → blade-service/blade-rhzf/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blade-rhzfFwLs</artifactId>
+    <artifactId>blade-rhzf</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-rhzfFwLs-api</artifactId>
+            <artifactId>blade-rhzf-api</artifactId>
             <version>${revision}</version>
         </dependency>
     </dependencies>

blade-service/blade-rhzfFz/src/main/java/org/springblade/modules/RhzfFzApplication.java → blade-service/blade-rhzf/src/main/java/org/springblade/modules/RhzfApplication.java

@@ -35,10 +35,10 @@ import org.springblade.core.launch.BladeApplication;
  * @author Chill
  */
 @BladeCloudApplication
-public class RhzfFzApplication {
+public class RhzfApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(CommonConstant.APPLICATION_RHZFFZ_NAME, RhzfFzApplication.class, args);
+		BladeApplication.run(CommonConstant.APPLICATION_RHZF_NAME, RhzfApplication.class, args);
 	}
 
 }

blade-service/blade-rhzfFw/src/main/java/org/springblade/modules/feign/RhzfFwClientImpl.java → blade-service/blade-rhzf/src/main/java/org/springblade/modules/feign/RhzfFwClientImpl.java

@@ -22,7 +22,7 @@ public class RhzfFwClientImpl implements RhzfFwFeign{
 
 	@Override
 	@PostMapping(API_PREFIX + "/fwUpdateById")
-	public R fwUpdateById(FwInfoEntity fwInfoEntity) {
+	public R fwUpdateById(@RequestBody FwInfoEntity fwInfoEntity) {
 		return R.data(rhzfFwInfoService.updateById(fwInfoEntity));
 	}
 }

blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfFwInfoService.java

@@ -0,0 +1,7 @@
+package org.springblade.modules.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.entity.FwInfoEntity;
+
+public interface RhzfFwInfoService extends BaseService<FwInfoEntity> {
+}

blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfFwLsService.java

@@ -0,0 +1,7 @@
+package org.springblade.modules.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.entity.FwLsEntity;
+
+public interface RhzfFwLsService extends BaseService<FwLsEntity> {
+}

blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfFwRyService.java

@@ -0,0 +1,7 @@
+package org.springblade.modules.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.entity.FwRyEntity;
+
+public interface RhzfFwRyService extends BaseService<FwRyEntity> {
+}

blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfFzLsService.java

@@ -0,0 +1,7 @@
+package org.springblade.modules.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.entity.FzLsEntity;
+
+public interface RhzfFzLsService extends BaseService<FzLsEntity> {
+}

blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfFzService.java

@@ -0,0 +1,7 @@
+package org.springblade.modules.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.entity.FwFzEntity;
+
+public interface RhzfFzService extends BaseService<FwFzEntity> {
+}

blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfRyCzrkService.java

@@ -0,0 +1,7 @@
+package org.springblade.modules.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.entity.RyCzrkEntity;
+
+public interface RhzfRyCzrkService extends BaseService<RyCzrkEntity> {
+}

blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfRyJwrkService.java

@@ -0,0 +1,7 @@
+package org.springblade.modules.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.entity.RyJwrkEntity;
+
+public interface RhzfRyJwrkService extends BaseService<RyJwrkEntity> {
+}

blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfRyJzrkService.java

@@ -0,0 +1,7 @@
+package org.springblade.modules.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.entity.RyJzrkEntity;
+
+public interface RhzfRyJzrkService extends BaseService<RyJzrkEntity> {
+}

blade-service/blade-rhzfRyLs/src/main/java/org/springblade/modules/service/RhzfRyLsService.java → blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfRyLsService.java

@@ -1,6 +1,7 @@
 package org.springblade.modules.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.core.mp.base.BaseService;
 import org.springblade.modules.entity.RhzfRyLsEntity;
 
 public interface RhzfRyLsService extends IService<RhzfRyLsEntity> {

blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfRyWlrkService.java

@@ -0,0 +1,7 @@
+package org.springblade.modules.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.entity.RyWlrkEntity;
+
+public interface RhzfRyWlrkService extends BaseService<RyWlrkEntity> {
+}

blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/RhzfRyZzrkService.java

@@ -0,0 +1,7 @@
+package org.springblade.modules.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.entity.RyZzrkEntity;
+
+public interface RhzfRyZzrkService extends BaseService<RyZzrkEntity> {
+}

blade-service/blade-rhzfFw/src/main/java/org/springblade/modules/service/impl/RhzfFwInfoServiceImpl.java → blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/impl/RhzfFwInfoServiceImpl.java

@@ -1,11 +1,11 @@
 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.FwInfoEntity;
 import org.springblade.modules.mapper.RhzfFwInfoMapper;
 import org.springblade.modules.service.RhzfFwInfoService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class RhzfFwInfoServiceImpl extends ServiceImpl<RhzfFwInfoMapper, FwInfoEntity> implements RhzfFwInfoService {
+public class RhzfFwInfoServiceImpl extends BaseServiceImpl<RhzfFwInfoMapper, FwInfoEntity> implements RhzfFwInfoService {
 }

blade-service/blade-rhzfFwLs/src/main/java/org/springblade/modules/service/impl/RhzfFwLsServiceImpl.java → blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/impl/RhzfFwLsServiceImpl.java

@@ -1,11 +1,11 @@
 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.FwLsEntity;
 import org.springblade.modules.mapper.RhzfFwLsMapper;
 import org.springblade.modules.service.RhzfFwLsService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class RhzfFwLsServiceImpl extends ServiceImpl<RhzfFwLsMapper, FwLsEntity> implements RhzfFwLsService {
+public class RhzfFwLsServiceImpl extends BaseServiceImpl<RhzfFwLsMapper, FwLsEntity> implements RhzfFwLsService {
 }

blade-service/blade-rhzfFwRy/src/main/java/org/springblade/modules/service/impl/RhzfFwRyServiceImpl.java → blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/impl/RhzfFwRyServiceImpl.java

@@ -1,11 +1,11 @@
 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.FwRyEntity;
 import org.springblade.modules.mapper.RhzfFwRyMapper;
 import org.springblade.modules.service.RhzfFwRyService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class RhzfFwRyServiceImpl extends ServiceImpl<RhzfFwRyMapper, FwRyEntity> implements RhzfFwRyService {
+public class RhzfFwRyServiceImpl extends BaseServiceImpl<RhzfFwRyMapper, FwRyEntity> implements RhzfFwRyService {
 }

blade-service/blade-rhzfFzLs/src/main/java/org/springblade/modules/service/impl/RhzfFzLsServiceImpl.java → blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/impl/RhzfFzLsServiceImpl.java

@@ -1,11 +1,11 @@
 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.FzLsEntity;
 import org.springblade.modules.mapper.RhzfFzLsMapper;
 import org.springblade.modules.service.RhzfFzLsService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class RhzfFzLsServiceImpl extends ServiceImpl<RhzfFzLsMapper, FzLsEntity> implements RhzfFzLsService {
+public class RhzfFzLsServiceImpl extends BaseServiceImpl<RhzfFzLsMapper, FzLsEntity> implements RhzfFzLsService {
 }

blade-service/blade-rhzfFz/src/main/java/org/springblade/modules/service/impl/RhzfFzServiceImpl.java → blade-service/blade-rhzf/src/main/java/org/springblade/modules/service/impl/RhzfFzServiceImpl.java

@@ -1,11 +1,11 @@
 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.FwFzEntity;
 import org.springblade.modules.mapper.RhzfFzMapper;
 import org.springblade.modules.service.RhzfFzService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class RhzfFzServiceImpl extends ServiceImpl<RhzfFzMapper, FwFzEntity> implements RhzfFzService {
+public class RhzfFzServiceImpl extends BaseServiceImpl<RhzfFzMapper, FwFzEntity> implements RhzfFzService {
 }