很多

src/main/java/org/springblade/common/controller/ParamsConvert.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import org.springblade.core.mp.support.Query;
 import org.springblade.modules.JlrhJws.entity.JlrhJwsEntity;
 import org.springblade.modules.appmenu.entity.AppMenu;
+import org.springblade.modules.bq.pojo.entity.BqInfoEntity;
+import org.springblade.modules.bq.pojo.entity.BqSpEntity;
 import org.springblade.modules.bzdz.entity.BzdzEntity;
 import org.springblade.modules.csInfo.entity.CsInfoEntity;
 import org.springblade.modules.csjcInfo.entity.CsjcInfoEntity;
@@ -25,6 +27,8 @@ import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
 import org.springblade.modules.rwxffkb.vo.RwxffkbVO;
 import org.springblade.modules.sign.entity.SignEntity;
 import org.springblade.modules.sign.vo.SignVO;
+import org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity;
+import org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity;
 import org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity;
 import org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity;
 import org.springblade.modules.sqmy.pojo.entity.SqmyInfoEntity;
@@ -648,7 +652,7 @@ public class ParamsConvert {
 				SqmyInfoVO sqmyInfoVO = jsonObject.toJavaObject(SqmyInfoVO.class);
 				return method.invoke(proxyObject, sqmyInfoVO);
 			} else if (method.getName().equals("remove")) {
-				String ids = params.get("ids").toString();
+				String ids = params.get("id").toString();
 				return method.invoke(proxyObject, ids);
 			} else if (method.getName().equals("update")) {
 				jsonObject.putAll(params);
@@ -690,7 +694,7 @@ public class ParamsConvert {
 				FzrhyInfoEntity fzrhyInfoEntity = jsonObject.toJavaObject(FzrhyInfoEntity.class);
 				return method.invoke(proxyObject, fzrhyInfoEntity);
 			} else if (method.getName().equals("remove")) {
-				String ids = params.get("ids").toString();
+				String ids = params.get("id").toString();
 				return method.invoke(proxyObject, ids);
 			} else if (method.getName().equals("update")) {
 				jsonObject.putAll(params);
@@ -702,6 +706,69 @@ public class ParamsConvert {
 				query.setCurrent(Integer.valueOf(params.get("current").toString()));
 				return method.invoke(proxyObject, params, query);
 			}
+		} else if (className.equals("sydwController")) { // ********************************************* sydwController
+			if (method.getName().equals("sydwSave")) {
+				jsonObject.putAll(params);
+				SydwEntity sydwEntity = jsonObject.toJavaObject(SydwEntity.class);
+				return method.invoke(proxyObject, sydwEntity);
+			} else if (method.getName().equals("saveCyry")) {
+				jsonObject.putAll(params);
+				CyryEntity cyryEntity = jsonObject.toJavaObject(CyryEntity.class);
+				return method.invoke(proxyObject, cyryEntity);
+			} else if (method.getName().equals("sydwzx")) {
+				jsonObject.putAll(params);
+				SydwEntity sydwEntity = jsonObject.toJavaObject(SydwEntity.class);
+				return method.invoke(proxyObject, sydwEntity);
+			} else if (method.getName().equals("cyryzx")) {
+				jsonObject.putAll(params);
+				CyryEntity cyryEntity = jsonObject.toJavaObject(CyryEntity.class);
+				return method.invoke(proxyObject, cyryEntity);
+			} else if (method.getName().equals("update")) {
+				jsonObject.putAll(params);
+				SydwEntity sydwEntity = jsonObject.toJavaObject(SydwEntity.class);
+				return method.invoke(proxyObject, sydwEntity);
+			} else if (method.getName().equals("updateCyry")) {
+				jsonObject.putAll(params);
+				CyryEntity cyryEntity = jsonObject.toJavaObject(CyryEntity.class);
+				return method.invoke(proxyObject, cyryEntity);
+			} else if (method.getName().equals("cdPage")) {
+				return method.invoke(proxyObject, params);
+			}  else if (method.getName().equals("page")) {
+				Query query = new Query();
+				query.setSize(Integer.valueOf(params.get("size").toString()));
+				query.setCurrent(Integer.valueOf(params.get("current").toString()));
+				return method.invoke(proxyObject, params, query);
+			} else if (method.getName().equals("detail")) {
+				jsonObject.putAll(params);
+				SydwEntity sydwEntity = jsonObject.toJavaObject(SydwEntity.class);
+				return method.invoke(proxyObject, sydwEntity);
+			} else if (method.getName().equals("cyryDetail")) {
+				jsonObject.putAll(params);
+				CyryEntity cyryEntity = jsonObject.toJavaObject(CyryEntity.class);
+				return method.invoke(proxyObject, cyryEntity);
+			} else if (method.getName().equals("cyryHistory")) {
+				return method.invoke(proxyObject, params);
+			} else if (method.getName().equals("selectCyryByXydm")) {
+				String tyshxydm = params.get("tyshxydm").toString();
+				return method.invoke(proxyObject, tyshxydm);
+			} else if (method.getName().equals("selectCyryBySfzh")) {
+				String gmsfhm = params.get("gmsfhm").toString();
+				return method.invoke(proxyObject, gmsfhm);
+			}
+		} else if (className.equals("bqInfoController")) { // ***************************************** bqInfoController
+			if (method.getName().equals("page")) {
+				return method.invoke(proxyObject, params);
+			} else if (method.getName().equals("save")) {
+				jsonObject.putAll(params);
+				BqInfoEntity bqInfoEntity = jsonObject.toJavaObject(BqInfoEntity.class);
+				return method.invoke(proxyObject, bqInfoEntity);
+			}
+		} else if (className.equals("bqSpController")) { // ********************************************* bqSpController
+			if (method.getName().equals("save")) {
+				jsonObject.putAll(params);
+				BqSpEntity bqSpEntity = jsonObject.toJavaObject(BqSpEntity.class);
+				return method.invoke(proxyObject, bqSpEntity);
+			}
 		}
 		return null;
 	}

src/main/java/org/springblade/modules/bq/controller/BqInfoController.java

@@ -0,0 +1,204 @@
+package org.springblade.modules.bq.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.RoleConstant;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.bq.excel.BqInfoExcel;
+import org.springblade.modules.bq.pojo.entity.BqInfoEntity;
+import org.springblade.modules.bq.pojo.entity.BqSpEntity;
+import org.springblade.modules.bq.pojo.vo.BqInfoVO;
+import org.springblade.modules.bq.pojo.vo.EjbqVO;
+import org.springblade.modules.bq.pojo.vo.SjbqVO;
+import org.springblade.modules.bq.pojo.vo.YjbqVO;
+import org.springblade.modules.bq.service.IBqInfoService;
+import org.springblade.modules.bq.service.IBqSpService;
+import org.springblade.modules.bq.wrapper.BqInfoWrapper;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 标签表 控制器
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/bqInfo")
+@Api(value = "标签表", tags = "标签表接口")
+public class BqInfoController extends BladeController {
+
+	private final IBqInfoService bqInfoService;
+
+	private final IBqSpService bqSpService;
+
+	/**
+	 * 标签表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入bqInfo")
+	public R<BqInfoVO> detail(BqInfoEntity bqInfo) {
+		BqInfoEntity detail = bqInfoService.getOne(Condition.getQueryWrapper(bqInfo));
+		return R.data(BqInfoWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 标签表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入bqInfo")
+	public R<IPage<BqInfoVO>> list(@RequestParam Map<String, Object> bqInfo, Query query) {
+		IPage<BqInfoEntity> pages = bqInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(bqInfo, BqInfoEntity.class));
+		return R.data(BqInfoWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 标签表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入bqInfo")
+	public R page(@RequestParam Map<String, Object> params) {
+		params.put("parentId", 0L);
+		// 查询一级标签
+		List<BqInfoVO> yjbqList = bqInfoService.selectBqInfoPage(params);
+		for (BqInfoVO yjbqVO : yjbqList) {
+			params.put("parentId", yjbqVO.getId());
+			// 查询二级标签
+			List<BqInfoVO> ejbqList = bqInfoService.selectBqInfoPage(params);
+			for (BqInfoVO ejbqVO : ejbqList) {
+				params.put("parentId", ejbqVO.getId());
+				// 查询三级标签
+				List<BqInfoVO> sjbqList = bqInfoService.selectBqInfoPage(params);
+				ejbqVO.setChildren(sjbqList);
+			}
+			yjbqVO.setChildren(ejbqList);
+		}
+		return R.data(yjbqList);
+	}
+
+	/**
+	 * 标签 新增
+	 */
+	@Transactional
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入bqInfo")
+	public R save(@Valid @RequestBody BqInfoEntity bqInfo) {
+		// 默认审批通过
+		bqInfo.setXzzt(1);
+		bqInfoService.save(bqInfo);
+		BqSpEntity bqSpEntity = new BqSpEntity();
+		bqSpEntity.setBqId(bqInfo.getId());
+		bqSpEntity.setSplx(1);
+		// 默认审批通过
+		bqSpEntity.setSpjg(1);
+		return R.status(bqSpService.save(bqSpEntity));
+	}
+
+	/**
+	 * 标签 新增
+	 */
+	@PostMapping("/saveBatch")
+	public R saveBatch(@RequestBody List<YjbqVO> yjbqList) {
+		for (YjbqVO yjbqVO : yjbqList) {
+			// 一级标签
+			BqInfoEntity yjbqEntity = new BqInfoEntity();
+			yjbqEntity.setBqlx(1);
+			yjbqEntity.setParentId(0L);
+			yjbqEntity.setName(yjbqVO.getYjbq());
+			yjbqEntity.setXzzt(1);
+			yjbqEntity.setBqdj(1);
+			bqInfoService.save(yjbqEntity);
+			for (EjbqVO ejbqVO : yjbqVO.getEjList()) {
+				// 二级标签
+				BqInfoEntity ejbqEntity = new BqInfoEntity();
+				ejbqEntity.setBqlx(1);
+				ejbqEntity.setParentId(yjbqEntity.getId());
+				ejbqEntity.setName(ejbqVO.getEjbq());
+				ejbqEntity.setXzzt(1);
+				ejbqEntity.setBqdj(2);
+				bqInfoService.save(ejbqEntity);
+				for (SjbqVO sjbqVO : ejbqVO.getSjList()) {
+					// 三级标签
+					BqInfoEntity sjbqEntity = new BqInfoEntity();
+					sjbqEntity.setBqlx(1);
+					sjbqEntity.setParentId(ejbqEntity.getId());
+					sjbqEntity.setName(sjbqVO.getSjbq());
+					sjbqEntity.setXzzt(1);
+					sjbqEntity.setBqdj(3);
+					bqInfoService.save(sjbqEntity);
+				}
+			}
+		}
+		return R.status(true);
+	}
+
+	/**
+	 * 标签表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入bqInfo")
+	public R update(@Valid @RequestBody BqInfoEntity bqInfo) {
+		return R.status(bqInfoService.updateById(bqInfo));
+	}
+
+	/**
+	 * 标签表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入bqInfo")
+	public R submit(@Valid @RequestBody BqInfoEntity bqInfo) {
+		return R.status(bqInfoService.saveOrUpdate(bqInfo));
+	}
+
+	/**
+	 * 标签表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@RequestParam String ids) {
+		return R.status(bqInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-bqInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出数据", notes = "传入bqInfo")
+	public void exportBqInfo(@RequestParam Map<String, Object> bqInfo, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BqInfoEntity> queryWrapper = Condition.getQueryWrapper(bqInfo, BqInfoEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BqInfoEntity::getTenantId, bladeUser.getTenantId());
+		//}
+		//queryWrapper.lambda().eq(BqInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BqInfoExcel> list = bqInfoService.exportBqInfo(queryWrapper);
+		ExcelUtil.export(response, "标签表数据" + DateUtil.time(), "标签表数据表", list, BqInfoExcel.class);
+	}
+
+}

src/main/java/org/springblade/modules/bq/controller/BqSpController.java

@@ -0,0 +1,144 @@
+package org.springblade.modules.bq.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.RoleConstant;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.bq.excel.BqSpExcel;
+import org.springblade.modules.bq.pojo.entity.BqSpEntity;
+import org.springblade.modules.bq.pojo.vo.BqSpVO;
+import org.springblade.modules.bq.service.IBqInfoService;
+import org.springblade.modules.bq.service.IBqSpService;
+import org.springblade.modules.bq.wrapper.BqSpWrapper;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 标签_审批 控制器
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/bqSp")
+@Api(value = "标签_审批", tags = "标签_审批接口")
+public class BqSpController extends BladeController {
+
+	private final IBqSpService bqSpService;
+
+	private final IBqInfoService bqInfoService;
+
+	/**
+	 * 标签_审批 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入bqSp")
+	public R<BqSpVO> detail(BqSpEntity bqSp) {
+		BqSpEntity detail = bqSpService.getOne(Condition.getQueryWrapper(bqSp));
+		return R.data(BqSpWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 标签_审批 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入bqSp")
+	public R<IPage<BqSpVO>> list(@RequestParam Map<String, Object> bqSp, Query query) {
+		IPage<BqSpEntity> pages = bqSpService.page(Condition.getPage(query), Condition.getQueryWrapper(bqSp, BqSpEntity.class));
+		return R.data(BqSpWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 标签_审批 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入bqSp")
+	public R<IPage<BqSpVO>> page(BqSpVO bqSp, Query query) {
+		IPage<BqSpVO> pages = bqSpService.selectBqSpPage(Condition.getPage(query), bqSp);
+		return R.data(pages);
+	}
+
+	/**
+	 * 标签_删除审批
+	 */
+	@Transactional
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入bqSp")
+	public R save(@Valid @RequestBody BqSpEntity bqSp) {
+		// 默认审批通过  平台端需删除
+		bqSp.setSpjg(1);
+		bqSpService.save(bqSp);
+		// 默认审批通过  平台端需删除
+		return R.status(bqInfoService.removeById(bqSp.getBqId()));
+	}
+
+	/**
+	 * 标签_审批 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入bqSp")
+	public R update(@Valid @RequestBody BqSpEntity bqSp) {
+		return R.status(bqSpService.updateById(bqSp));
+	}
+
+	/**
+	 * 标签_审批 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入bqSp")
+	public R submit(@Valid @RequestBody BqSpEntity bqSp) {
+		return R.status(bqSpService.saveOrUpdate(bqSp));
+	}
+
+	/**
+	 * 标签_审批 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@RequestParam String ids) {
+		return R.status(bqSpService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-bqSp")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出数据", notes = "传入bqSp")
+	public void exportBqSp(@RequestParam Map<String, Object> bqSp, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BqSpEntity> queryWrapper = Condition.getQueryWrapper(bqSp, BqSpEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BqSpEntity::getTenantId, bladeUser.getTenantId());
+		//}
+		//queryWrapper.lambda().eq(BqSpEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BqSpExcel> list = bqSpService.exportBqSp(queryWrapper);
+		ExcelUtil.export(response, "标签_审批数据" + DateUtil.time(), "标签_审批数据表", list, BqSpExcel.class);
+	}
+
+}

src/main/java/org/springblade/modules/bq/excel/BqInfoExcel.java

@@ -0,0 +1,50 @@
+package org.springblade.modules.bq.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 标签表 Excel实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BqInfoExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 标签类型 1=人口标签
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("标签类型 1=人口标签")
+	private Integer bqlx;
+	/**
+	 * 上级id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上级id")
+	private Long parentId;
+	/**
+	 * 标签名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("标签名称")
+	private String name;
+	/**
+	 * 新增状态 0=待审批 1=已通过 2=已拒绝
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("新增状态 0=待审批 1=已通过 2=已拒绝")
+	private Integer xzzt;
+
+}

src/main/java/org/springblade/modules/bq/excel/BqSpExcel.java

@@ -0,0 +1,44 @@
+package org.springblade.modules.bq.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 标签_审批 Excel实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BqSpExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * bq_info表id
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("bq_info表id")
+	private Long bqId;
+	/**
+	 * 审批类型1=新增 2=删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("审批类型1=新增 2=删除")
+	private Integer splx;
+	/**
+	 * 审批结果 0=待审批 1=已同意 2=已拒绝
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("审批结果 0=待审批 1=已同意 2=已拒绝")
+	private Integer spjg;
+
+}

src/main/java/org/springblade/modules/bq/mapper/BqInfoMapper.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.bq.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.bq.excel.BqInfoExcel;
+import org.springblade.modules.bq.pojo.entity.BqInfoEntity;
+import org.springblade.modules.bq.pojo.vo.BqInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 标签表 Mapper 接口
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+public interface BqInfoMapper extends BaseMapper<BqInfoEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param params   分页参数
+	 * @param params 查询参数
+	 * @return List<BqInfoVO>
+	 */
+	List<BqInfoVO> selectBqInfoPage(@Param("params") Map<String, Object> params);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<BqInfoExcel>
+	 */
+	List<BqInfoExcel> exportBqInfo(@Param("ew") Wrapper<BqInfoEntity> queryWrapper);
+
+}

src/main/java/org/springblade/modules/bq/mapper/BqInfoMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.bq.mapper.BqInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="bqInfoResultMap" type="org.springblade.modules.bq.pojo.entity.BqInfoEntity">
+        <result column="bqlx" property="bqlx"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="name" property="name"/>
+        <result column="xzzt" property="xzzt"/>
+        <result column="bqdj" property="bqdj"/>
+    </resultMap>
+
+    <select id="selectBqInfoPage" resultType="org.springblade.modules.bq.pojo.vo.BqInfoVO">
+        SELECT
+            *
+        FROM
+            bq.bq_info
+        WHERE
+            is_deleted = 0
+          AND xzzt = 1
+        <if test="null != params.parentId">
+          AND parent_id = #{params.parentId} :: int8
+        </if>
+    </select>
+
+    <select id="exportBqInfo" resultType="org.springblade.modules.bq.excel.BqInfoExcel">
+        SELECT * FROM bq_info ${ew.customSqlSegment}
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/bq/mapper/BqSpMapper.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.bq.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.bq.excel.BqSpExcel;
+import org.springblade.modules.bq.pojo.entity.BqSpEntity;
+import org.springblade.modules.bq.pojo.vo.BqSpVO;
+
+import java.util.List;
+
+/**
+ * 标签_审批 Mapper 接口
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+public interface BqSpMapper extends BaseMapper<BqSpEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param bqSp 查询参数
+	 * @return List<BqSpVO>
+	 */
+	List<BqSpVO> selectBqSpPage(IPage page, BqSpVO bqSp);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<BqSpExcel>
+	 */
+	List<BqSpExcel> exportBqSp(@Param("ew") Wrapper<BqSpEntity> queryWrapper);
+
+}

src/main/java/org/springblade/modules/bq/mapper/BqSpMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.bq.mapper.BqSpMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="bqSpResultMap" type="org.springblade.modules.bq.pojo.entity.BqSpEntity">
+        <result column="bq_id" property="bqId"/>
+        <result column="splx" property="splx"/>
+        <result column="spjg" property="spjg"/>
+    </resultMap>
+
+    <select id="selectBqSpPage" resultMap="bqSpResultMap">
+        select * from bq_sp where is_deleted = 0
+    </select>
+
+    <select id="exportBqSp" resultType="org.springblade.modules.bq.excel.BqSpExcel">
+        SELECT * FROM bq_sp ${ew.customSqlSegment}
+    </select>
+
+</mapper>

src/main/java/org/springblade/modules/bq/pojo/dto/BqInfoDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.bq.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.bq.pojo.entity.BqInfoEntity;
+
+/**
+ * 标签表 数据传输对象实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BqInfoDTO extends BqInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/bq/pojo/dto/BqSpDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.bq.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.bq.pojo.entity.BqSpEntity;
+
+/**
+ * 标签_审批 数据传输对象实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BqSpDTO extends BqSpEntity {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/bq/pojo/entity/BqInfoEntity.java

@@ -0,0 +1,48 @@
+package org.springblade.modules.bq.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+
+/**
+ * 标签表 实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+@TableName("bq.bq_info")
+@EqualsAndHashCode(callSuper = true)
+public class BqInfoEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 标签类型 1=人口标签
+	 */
+	@ApiModelProperty(value = "标签类型 1=人口标签")
+	private Integer bqlx;
+	/**
+	 * 上级id
+	 */
+	@ApiModelProperty(value = "上级id")
+	private Long parentId;
+	/**
+	 * 标签名称
+	 */
+	@ApiModelProperty(value = "标签名称")
+	private String name;
+	/**
+	 * 新增状态 0=待审批 1=已通过 2=已拒绝
+	 */
+	@ApiModelProperty(value = "新增状态 0=待审批 1=已通过 2=已拒绝")
+	private Integer xzzt;
+	/**
+	 * 标签等级 1=1级标签 2=2级标签 3=3级标签
+	 */
+	@ApiModelProperty(value = "标签等级 1=1级标签 2=2级标签 3=3级标签")
+	private Integer bqdj;
+}

src/main/java/org/springblade/modules/bq/pojo/entity/BqSpEntity.java

@@ -0,0 +1,39 @@
+package org.springblade.modules.bq.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+
+/**
+ * 标签_审批 实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+@TableName("bq.bq_sp")
+@EqualsAndHashCode(callSuper = true)
+public class BqSpEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * bq_info表id
+	 */
+	@ApiModelProperty(value = "bq_info表id")
+	private Long bqId;
+	/**
+	 * 审批类型1=新增 2=删除
+	 */
+	@ApiModelProperty(value = "审批类型1=新增 2=删除")
+	private Integer splx;
+	/**
+	 * 审批结果 0=待审批 1=已同意 2=已拒绝
+	 */
+	@ApiModelProperty(value = "审批结果 0=待审批 1=已同意 2=已拒绝")
+	private Integer spjg;
+
+}

src/main/java/org/springblade/modules/bq/pojo/vo/BqInfoVO.java

@@ -0,0 +1,21 @@
+package org.springblade.modules.bq.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.bq.pojo.entity.BqInfoEntity;
+
+import java.util.List;
+
+/**
+ * 标签表 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BqInfoVO extends BqInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+	private List<BqInfoVO> children;
+}

src/main/java/org/springblade/modules/bq/pojo/vo/BqSpVO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.bq.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.bq.pojo.entity.BqSpEntity;
+
+/**
+ * 标签_审批 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BqSpVO extends BqSpEntity {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/springblade/modules/bq/pojo/vo/EjbqVO.java

@@ -0,0 +1,20 @@
+package org.springblade.modules.bq.pojo.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 标签_审批 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+public class EjbqVO {
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	private String ejbq;
+	private List<SjbqVO> sjList;
+}

src/main/java/org/springblade/modules/bq/pojo/vo/SjbqVO.java

@@ -0,0 +1,17 @@
+package org.springblade.modules.bq.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * 标签_审批 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+public class SjbqVO {
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	private String sjbq;
+}

src/main/java/org/springblade/modules/bq/pojo/vo/YjbqVO.java

@@ -0,0 +1,20 @@
+package org.springblade.modules.bq.pojo.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 标签_审批 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Data
+public class YjbqVO {
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	private String yjbq;
+	private List<EjbqVO> ejList;
+}

src/main/java/org/springblade/modules/bq/service/IBqInfoService.java

@@ -0,0 +1,36 @@
+package org.springblade.modules.bq.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.bq.excel.BqInfoExcel;
+import org.springblade.modules.bq.pojo.entity.BqInfoEntity;
+import org.springblade.modules.bq.pojo.vo.BqInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 标签表 服务类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+public interface IBqInfoService extends BaseService<BqInfoEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param params   分页参数
+	 * @param params 查询参数
+	 * @return IPage<BqInfoVO>
+	 */
+	List<BqInfoVO> selectBqInfoPage(Map<String, Object> params);
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<BqInfoExcel>
+	 */
+	List<BqInfoExcel> exportBqInfo(Wrapper<BqInfoEntity> queryWrapper);
+
+}

src/main/java/org/springblade/modules/bq/service/IBqSpService.java

@@ -0,0 +1,36 @@
+package org.springblade.modules.bq.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.bq.excel.BqSpExcel;
+import org.springblade.modules.bq.pojo.entity.BqSpEntity;
+import org.springblade.modules.bq.pojo.vo.BqSpVO;
+
+import java.util.List;
+
+/**
+ * 标签_审批 服务类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+public interface IBqSpService extends BaseService<BqSpEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param bqSp 查询参数
+	 * @return IPage<BqSpVO>
+	 */
+	IPage<BqSpVO> selectBqSpPage(IPage<BqSpVO> page, BqSpVO bqSp);
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<BqSpExcel>
+	 */
+	List<BqSpExcel> exportBqSp(Wrapper<BqSpEntity> queryWrapper);
+
+}

src/main/java/org/springblade/modules/bq/service/impl/BqInfoServiceImpl.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.bq.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.bq.excel.BqInfoExcel;
+import org.springblade.modules.bq.mapper.BqInfoMapper;
+import org.springblade.modules.bq.pojo.entity.BqInfoEntity;
+import org.springblade.modules.bq.pojo.vo.BqInfoVO;
+import org.springblade.modules.bq.service.IBqInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 标签表 服务实现类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Service
+public class BqInfoServiceImpl extends BaseServiceImpl<BqInfoMapper, BqInfoEntity> implements IBqInfoService {
+
+	@Override
+	public List<BqInfoVO> selectBqInfoPage(Map<String, Object> params) {
+		return baseMapper.selectBqInfoPage(params);
+	}
+
+	@Override
+	public List<BqInfoExcel> exportBqInfo(Wrapper<BqInfoEntity> queryWrapper) {
+		List<BqInfoExcel> bqInfoList = baseMapper.exportBqInfo(queryWrapper);
+		//bqInfoList.forEach(bqInfo -> {
+		//	bqInfo.setTypeName(DictCache.getValue(DictEnum.YES_NO, BqInfoEntity.getType()));
+		//});
+		return bqInfoList;
+	}
+
+}

src/main/java/org/springblade/modules/bq/service/impl/BqSpServiceImpl.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.bq.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.bq.excel.BqSpExcel;
+import org.springblade.modules.bq.mapper.BqSpMapper;
+import org.springblade.modules.bq.pojo.entity.BqSpEntity;
+import org.springblade.modules.bq.pojo.vo.BqSpVO;
+import org.springblade.modules.bq.service.IBqSpService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 标签_审批 服务实现类
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+@Service
+public class BqSpServiceImpl extends BaseServiceImpl<BqSpMapper, BqSpEntity> implements IBqSpService {
+
+	@Override
+	public IPage<BqSpVO> selectBqSpPage(IPage<BqSpVO> page, BqSpVO bqSp) {
+		return page.setRecords(baseMapper.selectBqSpPage(page, bqSp));
+	}
+
+	@Override
+	public List<BqSpExcel> exportBqSp(Wrapper<BqSpEntity> queryWrapper) {
+		List<BqSpExcel> bqSpList = baseMapper.exportBqSp(queryWrapper);
+		//bqSpList.forEach(bqSp -> {
+		//	bqSp.setTypeName(DictCache.getValue(DictEnum.YES_NO, BqSpEntity.getType()));
+		//});
+		return bqSpList;
+	}
+
+}

src/main/java/org/springblade/modules/bq/wrapper/BqInfoWrapper.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.bq.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.bq.pojo.entity.BqInfoEntity;
+import org.springblade.modules.bq.pojo.vo.BqInfoVO;
+
+import java.util.Objects;
+
+/**
+ * 标签表 包装类,返回视图层所需的字段
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+public class BqInfoWrapper extends BaseEntityWrapper<BqInfoEntity, BqInfoVO> {
+
+	public static BqInfoWrapper build() {
+		return new BqInfoWrapper();
+	}
+
+	@Override
+	public BqInfoVO entityVO(BqInfoEntity bqInfo) {
+		BqInfoVO bqInfoVO = Objects.requireNonNull(BeanUtil.copyProperties(bqInfo, BqInfoVO.class));
+
+		//User createUser = UserCache.getUser(bqInfo.getCreateUser());
+		//User updateUser = UserCache.getUser(bqInfo.getUpdateUser());
+		//bqInfoVO.setCreateUserName(createUser.getName());
+		//bqInfoVO.setUpdateUserName(updateUser.getName());
+
+		return bqInfoVO;
+	}
+
+}

src/main/java/org/springblade/modules/bq/wrapper/BqSpWrapper.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.bq.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.bq.pojo.entity.BqSpEntity;
+import org.springblade.modules.bq.pojo.vo.BqSpVO;
+
+import java.util.Objects;
+
+/**
+ * 标签_审批 包装类,返回视图层所需的字段
+ *
+ * @author wth
+ * @since 2024-11-25
+ */
+public class BqSpWrapper extends BaseEntityWrapper<BqSpEntity, BqSpVO> {
+
+	public static BqSpWrapper build() {
+		return new BqSpWrapper();
+	}
+
+	@Override
+	public BqSpVO entityVO(BqSpEntity bqSp) {
+		BqSpVO bqSpVO = Objects.requireNonNull(BeanUtil.copyProperties(bqSp, BqSpVO.class));
+
+		//User createUser = UserCache.getUser(bqSp.getCreateUser());
+		//User updateUser = UserCache.getUser(bqSp.getUpdateUser());
+		//bqSpVO.setCreateUserName(createUser.getName());
+		//bqSpVO.setUpdateUserName(updateUser.getName());
+
+		return bqSpVO;
+	}
+
+}

src/main/java/org/springblade/modules/cdglinfos/controller/GlInfoController.java

@@ -17,36 +17,32 @@
 package org.springblade.modules.cdglinfos.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.api.crypto.annotation.crypto.ApiCrypto;
-import org.springblade.core.api.crypto.annotation.decrypt.ApiDecryptAes;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.cdglinfos.entity.GlInfoEntity;
 import org.springblade.modules.cdglinfos.service.CdUserRoleGxbService;
+import org.springblade.modules.cdglinfos.service.IGlInfoService;
+import org.springblade.modules.cdglinfos.vo.GlInfoVO;
+import org.springblade.modules.cdglinfos.wrapper.GlInfoWrapper;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.Role;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.cdglinfos.entity.GlInfoEntity;
-import org.springblade.modules.cdglinfos.vo.GlInfoVO;
-import org.springblade.modules.cdglinfos.wrapper.GlInfoWrapper;
-import org.springblade.modules.cdglinfos.service.IGlInfoService;
-import org.springblade.core.boot.ctrl.BladeController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -155,9 +151,9 @@ public class GlInfoController extends BladeController {
 //	@ApiEncrypt(CryptoType.AES)
 //	@ApiDecrypt(CryptoType.AES)
 	@GetMapping("getAppByUserRole")
-	public R<List<GlInfoEntity>> getAppByUserRole(){
+	public R<List<GlInfoEntity>> getAppByUserRole(@RequestParam Map<String, String> params){
 		Dept dept = deptService.getById(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
-		return R.data(glinfoService.getAppByUserRole(dept.getAncestors(), AuthUtil.getUser().getRoleName()));
+		return R.data(glinfoService.getAppByUserRole(dept.getAncestors(), AuthUtil.getUser().getRoleName(), params.get("appName")));
 	}
 
 	/**

src/main/java/org/springblade/modules/cdglinfos/mapper/GlInfoMapper.java

@@ -3,8 +3,10 @@ package org.springblade.modules.cdglinfos.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.cdglinfos.entity.GlInfoEntity;
 import org.springblade.modules.cdglinfos.vo.GlInfoVO;
+import org.springblade.modules.sqjw.sydw.pojo.vo.SydwMenuVO;
 
 import java.util.List;
 
@@ -18,7 +20,8 @@ public interface GlInfoMapper  extends BaseMapper<GlInfoEntity> {
 	 */
 	List<GlInfoVO> selectGlInfoPage(IPage page, GlInfoVO glinfo);
 
-	List<GlInfoEntity> getAppByUserRole(String ancestors, String userRole);
+	List<GlInfoEntity> getAppByUserRole(@Param("ancestors")String ancestors, @Param("userRole")String userRole, @Param("appName")String appName);
 
+    List<SydwMenuVO> getSydwMenu(@Param("flag") String flag, @Param("appName") String appName);
 }
 

src/main/java/org/springblade/modules/cdglinfos/mapper/GlinfoMapper.xml

@@ -36,6 +36,28 @@
            flag
         FROM
             cd_glinfo
+        WHERE 1 = 1
+        <if test="null != appName and '' != appName">
+            AND name LIKE '%' || #{appName} || '%'
+        </if>
+            AND flag = '1'
+    </select>
+
+    <select id="getSydwMenu" resultType="org.springblade.modules.sqjw.sydw.pojo.vo.SydwMenuVO">
+        SELECT
+            zd.id,
+            cg.name,
+            cg.img AS icon
+        FROM
+            jdrh.cd_glinfo cg
+        LEFT JOIN jdrh.blade_dict_biz zd ON zd.dict_value = cg.name
+        WHERE
+            cg.is_deleted = 0
+        AND cg.flag = #{flag}
+        <if test="null != appName and '' != appName">
+        AND cg.name LIKE '%' || #{appName} || '%'
+        </if>
+        ORDER BY cg.sort
     </select>
 
 </mapper>

src/main/java/org/springblade/modules/cdglinfos/service/IGlInfoService.java

@@ -4,6 +4,7 @@ import org.springblade.modules.cdglinfos.entity.GlInfoEntity;
 import org.springblade.modules.cdglinfos.vo.GlInfoVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.sqjw.sydw.pojo.vo.SydwMenuVO;
 
 import java.util.List;
 
@@ -24,6 +25,7 @@ public interface IGlInfoService extends BaseService<GlInfoEntity> {
 	IPage<GlInfoVO> selectGlInfoPage(IPage<GlInfoVO> page, GlInfoVO glinfo);
 
 
-	List<GlInfoEntity> getAppByUserRole(String ancestors, String userRole);
+	List<GlInfoEntity> getAppByUserRole(String ancestors, String userRole, String appName);
 
+	List<SydwMenuVO> getSydwMenu(String flag, String appName);
 }

src/main/java/org/springblade/modules/cdglinfos/service/impl/GlinfoServiceImpl.java

@@ -6,6 +6,7 @@ import org.springblade.modules.cdglinfos.entity.GlInfoEntity;
 import org.springblade.modules.cdglinfos.mapper.GlInfoMapper;
 import org.springblade.modules.cdglinfos.service.IGlInfoService;
 import org.springblade.modules.cdglinfos.vo.GlInfoVO;
+import org.springblade.modules.sqjw.sydw.pojo.vo.SydwMenuVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,7 +23,12 @@ public class GlinfoServiceImpl extends BaseServiceImpl<GlInfoMapper, GlInfoEntit
 	}
 
 	@Override
-	public List<GlInfoEntity> getAppByUserRole(String ancestors, String userRole) {
-		return glInfoMapper.getAppByUserRole(ancestors, userRole);
+	public List<GlInfoEntity> getAppByUserRole(String ancestors, String userRole, String appName) {
+		return glInfoMapper.getAppByUserRole(ancestors, userRole, appName);
+	}
+
+	@Override
+	public List<SydwMenuVO> getSydwMenu(String flag, String appName) {
+		return baseMapper.getSydwMenu(flag, appName);
 	}
 }

src/main/java/org/springblade/modules/csInfo/mapper/CsInfoMapper.java

@@ -201,4 +201,6 @@ public interface CsInfoMapper extends BaseMapper<CsInfoEntity> {
 
 	@DS("jl")
 	void updateByIdToJl(CsInfoEntity csInfoEntity);
+
+	int countBySqBm(@Param("params") Map<String, Object> params);
 }

src/main/java/org/springblade/modules/csInfo/mapper/CsInfoMapper.xml

@@ -2612,4 +2612,15 @@
         WHERE
             id = #{id}
     </update>
+
+    <select id="countBySqBm" resultType="int">
+        SELECT
+            COUNT(*)
+        FROM
+            jdrh.cs_info ci
+        LEFT JOIN jdrh.blade_dept sq ON sq.ID = ci.sssq_bm
+        WHERE
+            ci.is_deleted = 0
+        AND (#{params.deptId} LIKE '%' || sq.id || '%' OR sq.ancestors LIKE '%' || #{params.deptId} || '%')
+    </select>
 </mapper>

src/main/java/org/springblade/modules/csInfo/service/ICsInfoService.java

@@ -156,4 +156,5 @@ public interface ICsInfoService extends BaseService<CsInfoEntity> {
 
 	void updateByIdToJl(CsInfoEntity csInfoEntity);
 
+    int countBySqBm(Map<String, Object> params);
 }

src/main/java/org/springblade/modules/csInfo/service/impl/CsInfoServiceImpl.java

@@ -490,4 +490,9 @@ public class CsInfoServiceImpl extends BaseServiceImpl<CsInfoMapper, CsInfoEntit
 	public void updateByIdToJl(CsInfoEntity csInfoEntity) {
 		baseMapper.updateByIdToJl(csInfoEntity);
 	}
+
+	@Override
+	public int countBySqBm(Map<String, Object> params) {
+		return baseMapper.countBySqBm(params);
+	}
 }

src/main/java/org/springblade/modules/rhzf/fwInfo/controller/FwInfoController.java

@@ -94,6 +94,9 @@ import org.springblade.modules.rhzf.ryZzrk.entity.RyZzrkEntity;
 import org.springblade.modules.rhzf.ryZzrk.service.IRyZzrkService;
 import org.springblade.modules.rhzf.wtfy.pojo.entity.RhzfWtfyEntity;
 import org.springblade.modules.rhzf.wtfy.service.IRhzfWtfyService;
+import org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity;
+import org.springblade.modules.sqjw.sydw.pojo.vo.HylxVO;
+import org.springblade.modules.sqjw.sydw.service.SydwService;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
@@ -200,6 +203,8 @@ public class FwInfoController extends BladeController {
 
 	private final HcbdService hcbdService;
 
+	private final SydwService sydwService;
+
 	/**
 	 * 入户走访_房屋_基本信息 详情
 	 */
@@ -531,6 +536,9 @@ public class FwInfoController extends BladeController {
 				} else if (fwRyVO.getRyType().equals("zzrk")) {
 					syjzryVO = fwInfoService.getZzrk(params);
 				}
+				// 根据身份证号查询户籍接口，补充照片等信息
+				String zp = "HttpRequest.post().";
+				syjzryVO.setZp(zp);
 				syjzryList.add(syjzryVO);
 			}
 			rhzfSaveVO.setSyjzryList(syjzryList);
@@ -549,6 +557,9 @@ public class FwInfoController extends BladeController {
 			// 安全宣传防范
 			List<RhzfAqxcffEntity> aqxcffHistory = aqxcffService.getByDzbm(params);
 			rhzfSaveVO.setAqxcffHistory(aqxcffHistory);
+			// 实有单位
+			SydwEntity sydwEntity = sydwService.getByDzbm(params);
+			rhzfSaveVO.setSydw(sydwEntity);
 		} else {
 			rhzfSaveVO = new RhzfSaveVO();
 		}
@@ -626,7 +637,7 @@ public class FwInfoController extends BladeController {
 		Long mjId = rhzfSaveVO.getMjId();
 		// 根据dzbm 查rhzf_fw_info是否已有数据
 		FwInfoEntity oldRecord = fwInfoService.getFwIsExist(fwInfo);
-		if (StringUtils.isNotBlank(rhzfSaveVO.getFwSyyt())) {
+		if (StringUtils.isNotBlank(rhzfSaveVO.getFwSyyt()) || StringUtils.isNotBlank(fwInfo.getQzzp())) {
 			if (null == oldRecord) {
 				fwInfo.setTimes(1);
 				fwInfo.setMjId(mjId);
@@ -1178,6 +1189,26 @@ public class FwInfoController extends BladeController {
 		List<ZdVO> yyfwlx = dictService.getDictList(code);
 		data.setYyfwlx(yyfwlx);
 
+		code = "jyfs"; // 经营方式
+		List<ZdVO> jyfs = dictService.getDictList(code);
+		data.setJyfs(jyfs);
+
+		code = "zylb"; // 职业类别
+		List<ZdVO> zylb = dictService.getDictList(code);
+		data.setZylb(zylb);
+
+		// 实有单位行业类型
+		List<HylxVO> hylx = dictService.getHylx();
+		for (HylxVO hylxVO : hylx) {
+			List<ZdVO> dwlx = dictService.getDwlx(hylxVO.getId());
+			hylxVO.setDwlxList(dwlx);
+		}
+		data.setHylx(hylx);
+
+		code = "xslx"; // 职业类别
+		List<ZdVO> xslx = dictService.getDictList(code);
+		data.setXslx(xslx);
+
 		List<XzqhVO> cityList = regionService.getCity("22");
 		for (XzqhVO city : cityList) {
 			String[] area = regionService.getArea(city.getCode());

src/main/java/org/springblade/modules/rhzf/fwInfo/vo/RhzfSaveVO.java

@@ -7,6 +7,7 @@ import org.springblade.modules.rhzf.fwqz.pojo.entity.RhzfFwqzEntity;
 import org.springblade.modules.rhzf.gzyj.pojo.entity.RhzfGzyjEntity;
 import org.springblade.modules.rhzf.jxcs.vo.JxcsVO;
 import org.springblade.modules.rhzf.wtfy.pojo.entity.RhzfWtfyEntity;
+import org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity;
 
 import java.util.Date;
 import java.util.List;
@@ -168,4 +169,8 @@ public class RhzfSaveVO {
 	 * 安全宣传防范历史
 	 */
 	private List<RhzfAqxcffEntity> aqxcffHistory;
+	/**
+	 * 实有单位
+	 */
+	private SydwEntity sydw;
 }

src/main/java/org/springblade/modules/rhzf/fwInfo/vo/SyjzryVO.java

@@ -26,6 +26,10 @@ public class SyjzryVO {
 	 */
 	private String dzbm;
 	/**
+	 * 人员照片
+	 */
+	private String zp;
+	/**
 	 * 人员基本信息序列号
 	 */
 	private String ryjbxxxlh;

src/main/java/org/springblade/modules/sqjw/sydw/controller/SydwController.java

@@ -0,0 +1,264 @@
+package org.springblade.modules.sqjw.sydw.controller;
+
+import lombok.AllArgsConstructor;
+import org.springblade.common.utils.AESUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.modules.cdglinfos.service.IGlInfoService;
+import org.springblade.modules.csInfo.service.ICsInfoService;
+import org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity;
+import org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity;
+import org.springblade.modules.sqjw.sydw.pojo.vo.SydwMenuVO;
+import org.springblade.modules.sqjw.sydw.pojo.vo.UserVO;
+import org.springblade.modules.sqjw.sydw.service.CyryService;
+import org.springblade.modules.sqjw.sydw.service.SydwService;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.DeptAllVO;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sydw")
+public class SydwController {
+
+	private final SydwService sydwService;
+
+	private final CyryService cyryService;
+
+	private final ICsInfoService csInfoService;
+
+	private final IUserService userService;
+
+	private final IGlInfoService cdGlinfoService;
+
+
+	/**
+	 * 实有单位新增
+	 */
+	@PostMapping("/sydwSave")
+	public R sydwSave(@RequestBody SydwEntity sydwEntity) {
+		SydwEntity sydw = sydwService.selectSydwByDzbm(sydwEntity.getDzbm());
+		if (sydw == null) {
+			User user = userService.getById(AuthUtil.getUserId());
+			DeptAllVO deptAll = csInfoService.getParentInfo(sydwEntity.getSssqBm());
+			sydwEntity.setCreateUser(AuthUtil.getUserId());
+			sydwEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+			sydwEntity.setDjrxm(AuthUtil.getUserName());
+			sydwEntity.setDjrjh(AuthUtil.getUserAccount());
+			sydwEntity.setDjrsfzh(user.getSfzh());
+			sydwEntity.setSssq(deptAll.getSqMc());
+			sydwEntity.setSspcsBm(deptAll.getPcsId());
+			sydwEntity.setSspcs(deptAll.getPcsMc());
+			sydwService.save(sydwEntity);
+			if (null != sydwEntity.getCyryList() && sydwEntity.getCyryList().size() > 0) {
+				for (CyryEntity cyryEntity : sydwEntity.getCyryList()) {
+					cyryEntity.setCreateUser(AuthUtil.getUserId());
+					cyryEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+					cyryEntity.setDwdzbm(sydwEntity.getDzbm());
+					cyryEntity.setTyshxydm(sydwEntity.getTyshxydm());
+					cyryService.save(cyryEntity);
+				}
+			}
+		} else {
+			return R.fail("该地址已有实有单位");
+		}
+		return R.success("新增成功");
+	}
+
+	/**
+	 * 实有单位注销
+	 */
+	@PostMapping("/sydwzx")
+	public R sydwzx(@RequestBody SydwEntity sydw) {
+		sydwService.updateSydwzx(sydw, AuthUtil.getUserId());
+		sydwService.updateCyryzx(sydw, AuthUtil.getUserId());
+		return R.data("操作成功");
+	}
+
+	/**
+	 * 实有单位——菜单列表
+	 */
+	@GetMapping("/cdPage")
+	public R cdPage(@RequestParam Map<String, Object> params) {
+		params.put("deptId", AuthUtil.getDeptId());
+		List<SydwMenuVO> sydwMenuList = cdGlinfoService.getSydwMenu("2", null);
+		for (SydwMenuVO sydwMenu : sydwMenuList) {
+			if (sydwMenu.getName().equals("娱乐服务场所")) {
+				params.put("hylbDm", 1853611429036111902L);
+				int num = sydwService.countByHylb(params);
+				sydwMenu.setNum(num);
+			} else if (sydwMenu.getName().equals("危险物品行业")) {
+				params.put("hylbDm", 1853611429036111908L);
+				int num = sydwService.countByHylb(params);
+				sydwMenu.setNum(num);
+			} else if (sydwMenu.getName().equals("新兴重点行业")) {
+				params.put("hylbDm", 1853611429036111911L);
+				int num = sydwService.countByHylb(params);
+				sydwMenu.setNum(num);
+			} else if (sydwMenu.getName().equals("九小场所管理")) {
+				int num = csInfoService.countBySqBm(params);
+				sydwMenu.setNum(num);
+			} else if (sydwMenu.getName().equals("特种行业")) {
+				params.put("hylbDm", 1853611429036111905L);
+				int num = sydwService.countByHylb(params);
+				sydwMenu.setNum(num);
+			} else if (sydwMenu.getName().equals("非法集资信息采集")) {
+
+			}
+		}
+		return R.data(sydwMenuList);
+	}
+
+	/**
+	 * 实有单位——单位列表
+	 */
+	@GetMapping("/page")
+	public R page(@RequestParam Map<String, Object> params, Query query) {
+		params.put("deptId", AuthUtil.getDeptId());
+//		List<SydwEntity> list = sydwService.getMphxlhByLdphxlh(sydwEntity.getLdphxlh());
+//		if (list.size() > 0) {
+//			IPage<SydwEntity> page = new Page<>();
+//			List<SydwEntity> fwList = new ArrayList<>();
+//			for (SydwEntity fwInfoVO : list) {
+//				SydwEntity fw = sydwService.selectFwInfo(sydwEntity, fwInfoVO.getDzbm());
+//				if (fw != null) {
+//					fwList.add(fw);
+//				}
+//			}
+//			List<SydwEntity> subList = fwList.stream().skip((query.getCurrent() - 1) * query.getSize()).limit(query.getSize()).collect(Collectors.toList());
+//			page.setRecords(subList).setTotal(fwList.size()).setSize(query.getSize()).setCurrent(query.getCurrent());
+//			return R.data(page);
+//		}
+		return R.data(sydwService.selectSydwPage(Condition.getPage(query), params));
+	}
+
+	/**
+	 * 实有单位详情
+	 */
+	@GetMapping("/detail")
+	public R detail(SydwEntity sydwEntity) {
+		SydwEntity sydw = sydwService.sydwDetail(sydwEntity);
+		if (sydw != null) {
+			if (sydw.getDjrsfzh() != null) {
+				sydw.setDjrsfzh(AESUtil.decrypt(sydw.getDjrsfzh(), "2SexR1rfjZ8CD3M6"));
+			}
+			List<CyryEntity> cyry = sydwService.selectCyryByDzbm(sydw.getTyshxydm());
+			sydw.setCyryList(cyry);
+		}
+		return R.data(sydw);
+	}
+
+	/**
+	 * 从业人员详情
+	 */
+	@GetMapping("/cyryDetail")
+	public R cyryDetail(CyryEntity cyryEntity) {
+		return R.data(sydwService.cyryDetail(cyryEntity));
+	}
+
+	/**
+	 * 历史从业人员列表
+	 */
+	@GetMapping("/cyryHistory")
+	public R cyryHistory(@RequestParam Map<String, Object> params) {
+		List<CyryEntity> cyryls = sydwService.selectCyrylsByDzbm(params.get("dzbm").toString());
+		return R.data(cyryls);
+	}
+
+	/**
+	 * 单位地址
+	 */
+	@GetMapping("/dwDz")
+	public R dwDz(String dzbm) {
+		String deptId;
+		if (AuthUtil.getDeptId().contains(",")) {
+			deptId = String.valueOf(sydwService.selectParentIdByDeptId(AuthUtil.getDeptId().split(",")[0]));
+		} else {
+			deptId = AuthUtil.getDeptId();
+		}
+		return R.data(sydwService.selectDwDz(deptId, dzbm));
+	}
+
+	/**
+	 * 实有单位修改
+	 */
+	@PostMapping("/update")
+	public R update(@RequestBody SydwEntity sydwEntity) {
+		return R.data(sydwService.updateById(sydwEntity));
+	}
+
+	/**
+	 * 从业人员新增
+	 */
+	@PostMapping("/saveCyry")
+	public R saveCyry(@RequestBody CyryEntity cyryEntity) {
+		UserVO user = sydwService.djxx(AuthUtil.getUserId());
+		if (user != null) {
+			cyryEntity.setDjrsfzh(user.getSfzh());
+		}
+		cyryEntity.setDjrjh(AuthUtil.getUserAccount());
+		cyryEntity.setDjrxm(AuthUtil.getUserName());
+		cyryEntity.setSjgxbs("0");
+		cyryEntity.setCreateUser(AuthUtil.getUserId());
+		cyryEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId().split(",")[0]));
+		CyryEntity cyry = cyryService.selectCyryBySfzh(cyryEntity.getGmsfhm());
+		if (cyry != null) {
+			cyryService.updateCyry(cyryEntity);
+		}
+		return R.data(cyryService.save(cyryEntity));
+	}
+
+	/**
+	 * 从业人员修改
+	 */
+	@PostMapping("/updateCyry")
+	public R updateCyry(@RequestBody CyryEntity cyryEntity) {
+		// 获取当前日期和时间
+		LocalDateTime now = LocalDateTime.now();
+		// 定义日期时间格式
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
+		// 将当前日期时间格式化为14位字符串
+		String formattedDate = now.format(formatter);
+		cyryEntity.setSjgxbs("1");
+		cyryEntity.setSjgxsj(formattedDate);
+		cyryEntity.setUpdateUser(AuthUtil.getUserId());
+		return R.data(cyryService.updateById(cyryEntity));
+	}
+
+	/**
+	 * 从业人员注销
+	 */
+	@PostMapping("/cyryzx")
+	public R cyryzx(@RequestBody CyryEntity cyryEntity) {
+		cyryEntity.setUpdateUser(AuthUtil.getUserId());
+		return R.data(cyryService.updatezxById(cyryEntity));
+	}
+
+	/**
+	 * 根据社会统一信用代码查询从业人员
+	 */
+	@GetMapping("/selectCyryByXydm")
+	public R selectCyryByXydm(String tyshxydm) {
+		return R.data(cyryService.selectCyryByXydm(tyshxydm));
+	}
+
+	/**
+	 * 查询从业人员是否在其他单位
+	 */
+	@GetMapping("/selectCyryBySfzh")
+	public R selectCyryBySfzh(String gmsfhm) {
+		CyryEntity cyry = cyryService.selectCyryBySfzh(gmsfhm);
+		if (cyry != null) {
+			return R.data("此人员已在" + cyry.getDwmc() + "登记，是否将他移入到本单位");
+		}
+		return R.data(true);
+	}
+}

src/main/java/org/springblade/modules/sqjw/sydw/mapper/CyryMapper.java

@@ -0,0 +1,22 @@
+package org.springblade.modules.sqjw.sydw.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity;
+import org.springblade.modules.sqjw.sydw.pojo.vo.UserVO;
+
+import java.util.List;
+
+public interface CyryMapper extends BaseMapper<CyryEntity> {
+
+	boolean updatezxById(CyryEntity cyryEntity);
+
+	List<CyryEntity> selectCyryByXydm(String tyshxydm);
+
+	CyryEntity selectCyryBySfzh(String gmsfhm);
+
+	String getFwxzByRkDzxx(String dzbm);
+
+	void updateCyry(CyryEntity cyryEntity);
+
+    UserVO djxx(Long userId);
+}

src/main/java/org/springblade/modules/sqjw/sydw/mapper/CyryMapper.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.sqjw.sydw.mapper.CyryMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="blogResultMap" type="org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity">
+        <result column="id" property="id"/>
+    </resultMap>
+
+    <update id="updatezxById">
+        update jdrh.ybss_cyry set zxyy = #{zxyy}, sjgxbs = '2', is_deleted = 1, update_user = #{updateUser}, update_time = now() where id = #{id}
+    </update>
+
+    <select id="selectCyryByXydm" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity">
+        select * from jdrh.ybss_cyry where is_deleted = 0 and tyshxydm = #{tyshxydm}
+    </select>
+
+    <select id="selectCyryBySfzh" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity">
+        select
+            yc.*,
+            ys.dwmc
+        from jdrh.ybss_cyry yc
+        left join jdrh.ybss_sydw ys on yc.tyshxydm = ys.tyshxydm
+        where yc.is_deleted = 0 and yc.gmsfhm = #{gmsfhm}
+    </select>
+
+    <select id="getFwxzByRkDzxx" resultType="java.lang.String">
+        select xz from sspt.rk_dzxx where dzbm = #{dzbm} limit 1
+    </select>
+
+    <update id="updateCyry">
+        update jdrh.ybss_cyry set is_deleted = 1 where gmsfhm = #{gmsfhm}
+    </update>
+
+    <select id="djxx" resultType="org.springblade.modules.sqjw.sydw.pojo.vo.UserVO">
+        select
+            bu.sfzh,
+            (select dept_name from jdrh.blade_dept where blade_dept.id = bu.dept_id :: int8) as sssq,
+            (select dept_name from jdrh.blade_dept where blade_dept.id = bd.parent_id) as sspcs
+        from JDRH.blade_user bu
+        left join jdrh.blade_dept bd on bu.dept_id :: int8 = bd.id
+        where bu.is_deleted = 0 and bu.id = #{userId}
+    </select>
+</mapper>

src/main/java/org/springblade/modules/sqjw/sydw/mapper/SydwMapper.java

@@ -0,0 +1,47 @@
+package org.springblade.modules.sqjw.sydw.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity;
+import org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity;
+import org.springblade.modules.sqjw.sydw.pojo.vo.DwdzVO;
+import org.springblade.modules.sqjw.sydw.pojo.vo.UserVO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SydwMapper extends BaseMapper<SydwEntity> {
+
+	IPage<SydwEntity> selectSydwPage(IPage<SydwEntity> page, @Param("params") Map<String, Object> params);
+
+	SydwEntity sydwDetail(SydwEntity sydwEntity);
+
+	List<CyryEntity> selectCyryByDzbm(String tyshxydm);
+
+	CyryEntity cyryDetail(CyryEntity cyryEntity);
+
+	List<DwdzVO> selectDwDz(String deptId, String dzbm);
+
+	List<CyryEntity> selectCyrylsByDzbm(String tyshxydm);
+
+	UserVO djxx(Long userId);
+
+	List<SydwEntity> getMphxlhByLdphxlh(String ldphxlh);
+
+	SydwEntity selectFwInfo(SydwEntity sydwEntity, String dzbm);
+
+	String getFwxzByRkDzxx(String dzbm);
+
+	Long selectParentIdByDeptId(String deptId);
+
+    SydwEntity selectSydwByDzbm(String dzbm);
+
+	void updateSydwzx(SydwEntity sydw, Long userId);
+
+	void updateCyryzx(SydwEntity sydw, Long userId);
+
+	SydwEntity getByDzbm(@Param("params") Map<String, Object> params);
+
+	int countByHylb(@Param("params") Map<String, Object> params);
+}

src/main/java/org/springblade/modules/sqjw/sydw/mapper/SydwMapper.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.sqjw.sydw.mapper.SydwMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="blogResultMap" type="org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity">
+        <result column="id" property="id"/>
+    </resultMap>
+
+    <select id="selectSydwPage" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity">
+        select
+            ys.id,
+            ys.dzbm,
+            ys.dwmc,
+            ys.tyshxydm,
+            ys.hylb,
+            ys.hylb_dm,
+            ys.dwlx,
+            ys.dwlx_dm,
+            ys.frxm,
+            ys.frlxdh,
+            ys.yyzt,
+            ( select count(0) from jdrh.ybss_cyry yc where yc.is_deleted = 0 and yc.tyshxydm = ys.tyshxydm) as cyry
+        from jdrh.ybss_sydw ys
+        left join jdrh.blade_dept sq on sq.id = ys.sssq_bm
+        where ys.is_deleted = 0
+          and (#{params.deptId} like '%' || sq.id || '%' or sq.ancestors like '%' || #{params.deptId} || '%')
+        <if test="params.dwmc != null and params.dwmc != ''">
+            and ys.dwmc like '%' || #{params.dwmc} || '%'
+        </if>
+        <if test="params.tyshxydm != null and params.tyshxydm != ''">
+            and ys.tyshxydm = #{params.tyshxydm}
+        </if>
+        <if test="params.dwlx != null and params.dwlx != ''">
+            and ys.dwlx = #{params.dwlx}
+        </if>
+        <if test="params.hylbDm != null and params.hylbDm != ''">
+            and ys.hylb_dm = #{params.hylbDm} :: int8
+        </if>
+    </select>
+
+    <select id="sydwDetail" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity">
+        select * from jdrh.ybss_sydw where is_deleted = 0 and id = #{id}
+    </select>
+
+    <select id="selectCyryByDzbm" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity">
+        select * from jdrh.ybss_cyry where is_deleted = 0 and tyshxydm = #{tyshxydm}
+    </select>
+
+    <select id="cyryDetail" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity">
+        select * from jdrh.ybss_cyry where is_deleted = 0 and id = #{id}
+    </select>
+
+    <select id="selectDwDz" resultType="org.springblade.modules.sqjw.sydw.pojo.vo.DwdzVO">
+        SELECT
+            rd.xz,
+            rd.dzbm
+        FROM
+            sspt.rk_ldphxx rl
+        LEFT JOIN blade_user bu ON bu.dept_id = rl.pcsjgdm
+        LEFT JOIN sspt.rk_dzxx rd ON rl.xlh = rd.ldphxlh
+        WHERE
+            rl.pcsjgdm = #{deptId} and rd.dzbm is not null
+        <if test="dzbm != null and dzbm != ''">
+            and rd.dzbm = #{dzbm}
+        </if>
+    </select>
+
+    <select id="selectCyrylsByDzbm" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity">
+        select * from jdrh.ybss_cyry where is_deleted = 1 and dwdzbm = #{dzbm}
+    </select>
+
+    <select id="djxx" resultType="org.springblade.modules.sqjw.sydw.pojo.vo.UserVO">
+        select
+            bu.sfzh
+        from blade_user bu
+        where bu.is_deleted = 0 and bu.id = #{id}
+    </select>
+
+    <select id="getMphxlhByLdphxlh" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity">
+        select dzbm from sspt.rk_dzxx where ldphxlh = coalesce (nullif (#{ldphxlh}, ''), '0'):: int8
+    </select>
+
+    <select id="selectFwInfo" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity">
+        select
+        ys.id,
+        ys.dzbm,
+        ys.dwmc,
+        ys.tyshxydm,
+        ys.dwlx,
+        ( select count(0) from jdrh.ybss_cyry yc where yc.is_deleted = 0 and yc.tyshxydm = ys.tyshxydm) as cyry,
+        rd.xz
+        from jdrh.ybss_sydw ys
+        left join sspt.rk_dzxx rd on rd.dzbm = ys.dzbm
+        where ys.is_deleted = 0 and ys.dzbm = #{dzbm}
+        <if test="sydwEntity.dwmc != null and sydwEntity.dwmc != ''">
+            and ys.dwmc like '%' || #{sydwEntity.dwmc} || '%'
+        </if>
+        <if test="sydwEntity.tyshxydm != null and sydwEntity.tyshxydm != ''">
+            and ys.tyshxydm = #{sydwEntity.tyshxydm}
+        </if>
+        <if test="sydwEntity.dwlx != null and sydwEntity.dwlx != ''">
+            and ys.dwlx = #{sydwEntity.dwlx}
+        </if>
+    </select>
+
+    <select id="getFwxzByRkDzxx" resultType="java.lang.String">
+        select xz from sspt.rk_dzxx where dzbm = #{dzbm} limit 1
+    </select>
+
+    <select id="selectParentIdByDeptId" resultType="java.lang.Long">
+        select parent_id from jdrh.blade_dept where id = #{deptId} :: int8
+    </select>
+
+    <select id="selectSydwByDzbm" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity">
+        select * from jdrh.ybss_sydw where is_deleted = 0 and dzbm = #{dzbm}
+    </select>
+
+    <update id="updateSydwzx">
+        update jdrh.ybss_sydw set zxyy = #{sydw.zxyy}, is_deleted = 1, update_user = #{userId}, update_time = now() where id = #{sydw.id}
+    </update>
+
+    <update id="updateCyryzx">
+        update jdrh.ybss_cyry set zxyy = #{sydw.zxyy}, is_deleted = 1, update_user = #{userId}, update_time = now() where dwdzbm = #{sydw.dzbm}
+    </update>
+
+    <select id="getByDzbm" resultType="org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity">
+        SELECT
+            ys.id,
+            ys.dzbm,
+            ys.tyshxydm,
+            ys.dwmc,
+            ys.hylb,
+            ys.dwlx,
+            ys.frxm,
+            ys.frlxdh,
+            ( select count(0) from jdrh.ybss_cyry yc where yc.is_deleted = 0 and yc.tyshxydm = ys.tyshxydm) as cyry
+        FROM jdrh.ybss_sydw ys
+        WHERE ys.is_deleted = 0 AND ys.dzbm = #{params.dzbm}
+    </select>
+
+    <select id="countByHylb" resultType="int">
+        SELECT
+            COUNT(*)
+        FROM
+            jdrh.ybss_sydw dw
+        LEFT JOIN jdrh.blade_dept sq ON sq.ID = dw.sssq_bm
+        WHERE
+            dw.is_deleted = 0
+          AND dw.hylb_dm = #{params.hylbDm}
+          AND (#{params.deptId} LIKE '%' || sq.id || '%' OR sq.ancestors LIKE '%' || #{params.deptId} || '%')
+    </select>
+</mapper>

src/main/java/org/springblade/modules/sqjw/sydw/pojo/entity/CyryEntity.java

@@ -0,0 +1,49 @@
+package org.springblade.modules.sqjw.sydw.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("jdrh.ybss_cyry")
+public class CyryEntity extends BaseEntity {
+	// 单位地址编码
+	private String dwdzbm;
+	// 统一社会信用代码
+	private String tyshxydm;
+	// 职业
+	private String zy;
+	// 公民身份号码
+	private String gmsfhm;
+	// 职业类别
+	private String zylb;
+	// 职业类别代码
+	private Integer zylbDm;
+	// 联系电话
+	private String lxdh;
+	// 数据更新标记：0新增，1修改，2删除
+	private String sjgxbs;
+	// 数据更新时间：14位日期格式
+	private String sjgxsj;
+	// 数据来源：6位行政区划代码
+	private String sjly;
+	// 登记人警号
+	private String djrjh;
+	// 登记人姓名
+	private String djrxm;
+	// 登记人身份证号
+	private String djrsfzh;
+	// 从业人员注销原因
+	private String zxyy;
+	// 姓名
+	private String xm;
+	// 性别
+	private String xb;
+	// 居住地详址
+	private String xz;
+	@TableField(exist = false)
+	private String dwmc;
+	@TableField(exist = false)
+	private String zp;
+}

src/main/java/org/springblade/modules/sqjw/sydw/pojo/entity/SydwEntity.java

@@ -0,0 +1,127 @@
+package org.springblade.modules.sqjw.sydw.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.List;
+
+@Data
+@TableName("jdrh.ybss_sydw")
+public class SydwEntity extends BaseEntity {
+	// 地址编码
+	private String dzbm;
+	// 地址名称
+	private String dzmc;
+	// 房屋编码
+	private Long fwId;
+	// 房屋名称
+	private String fwmc;
+	// 单位名称
+	private String dwmc;
+	// 统一社会信用代码
+	private String tyshxydm;
+	// 单位类型
+	private String dwlx;
+	// 单位类型
+	private Long dwlxDm;
+	// 行业类别
+	private String hylb;
+	// 行业类别
+	private Long hylbDm;
+	// 经营范围(主营)
+	private String zyjyfw;
+	// 经营范围(兼营)
+	private String cyjyfw;
+	// 经营面积(平方米)
+	private String jymj;
+	// 经营方式
+	private String jyfs;
+	// 营业执照起始日期
+	private String yyzzqsrq;
+	// 营业执照截止日期
+	private String yyzzjzrq;
+	// 注册资金
+	private String zczj;
+	// 联系电话
+	private String lxdh;
+	// 注册地址编码
+	private String zcdzbm;
+	// 网址
+	private String wz;
+	// 重点单位标识
+	private String zddwbs;
+	// 消防重点单位标识
+	private String xfzddwbs;
+	// 法人证件类型
+	private String frzjlx;
+	// 法人证件号码
+	private String frzjhm;
+	// 法人姓名
+	private String frxm;
+	// 法人姓
+	private String frx;
+	// 法人名
+	private String frm;
+	// 法人联系电话
+	private String frlxdh;
+	// 保卫负责人证件类型
+	private String bwfzrzjlx;
+	// 保卫负责人证件号码
+	private String bwfzrzjhm;
+	// 保卫负责人姓名
+	private String bwfzrxm;
+	// 保卫负责人联系电话
+	private String bwfzrlxdh;
+	// 数据更新标记：0新增，1修改，2删除
+	private String sjgxbs;
+	// 数据更新时间：14位日期格式
+	private String sjgxsj;
+	// 数据来源：6位行政区划代码
+	private String sjly;
+	// 信息主键编号
+	private String xxzjbh;
+	// 所属社区
+	private String sssq;
+	// 所属社区编码
+	private Long sssqBm;
+	// 所属派出所
+	private String sspcs;
+	// 所属派出所编码
+	private Long sspcsBm;
+	// 登记人警号
+	private String djrjh;
+	// 登记人姓名
+	private String djrxm;
+	// 登记人身份证号
+	private String djrsfzh;
+	// 法人照片
+	private String frzp;
+	// 保卫负责人照片
+	private String bwfzrzp;
+	// 单位负责人照片
+	private String dwfzrzp;
+	// 单位负责人姓名
+	private String dwfzrxm;
+	// 单位负责人证件类型
+	private String dwfzrzjlx;
+	// 单位负责人证件号码
+	private String dwfzrzjhm;
+	// 单位负责人联系电话
+	private String dwfzrlxdh;
+	// 法人居住地
+	private String frjzd;
+	// 营业状态 0正常 1歇业 2停业
+	private int yyzt;
+	// 详址
+	@TableField(exist = false)
+	private String xz;
+	// 从业人员
+	@TableField(exist = false)
+	private String cyry;
+	@TableField(exist = false)
+	private List<CyryEntity> cyryList;
+	@TableField(exist = false)
+	private String ldphxlh;
+}

src/main/java/org/springblade/modules/sqjw/sydw/pojo/vo/DwdzVO.java

@@ -0,0 +1,9 @@
+package org.springblade.modules.sqjw.sydw.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class DwdzVO {
+	private String xz;
+	private String dzbm;
+}

src/main/java/org/springblade/modules/sqjw/sydw/pojo/vo/HylxVO.java

@@ -0,0 +1,14 @@
+package org.springblade.modules.sqjw.sydw.pojo.vo;
+
+import lombok.Data;
+import org.springblade.modules.system.vo.ZdVO;
+
+import java.util.List;
+
+@Data
+public class HylxVO {
+	private Long id;
+	public String value;
+	public String label;
+	private List<ZdVO> dwlxList;
+}

src/main/java/org/springblade/modules/sqjw/sydw/pojo/vo/SydwMenuVO.java

@@ -0,0 +1,16 @@
+package org.springblade.modules.sqjw.sydw.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class SydwMenuVO {
+
+	private Long id;
+
+	private String name;
+
+	private String icon;
+
+	private int num;
+
+}

src/main/java/org/springblade/modules/sqjw/sydw/pojo/vo/UserVO.java

@@ -0,0 +1,12 @@
+package org.springblade.modules.sqjw.sydw.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class UserVO {
+	private String account;
+	private String name;
+	private String sfzh;
+	private String sssq;
+	private String sspcs;
+}

src/main/java/org/springblade/modules/sqjw/sydw/service/CyryService.java

@@ -0,0 +1,20 @@
+package org.springblade.modules.sqjw.sydw.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity;
+import org.springblade.modules.sqjw.sydw.pojo.vo.UserVO;
+
+import java.util.List;
+
+public interface CyryService extends BaseService<CyryEntity> {
+
+	boolean updatezxById(CyryEntity cyryEntity);
+
+	List<CyryEntity> selectCyryByXydm(String tyshxydm);
+
+	CyryEntity selectCyryBySfzh(String gmsfhm);
+
+	void updateCyry(CyryEntity cyryEntity);
+
+	UserVO djxx(Long userId);
+}

src/main/java/org/springblade/modules/sqjw/sydw/service/SydwService.java

@@ -0,0 +1,44 @@
+package org.springblade.modules.sqjw.sydw.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity;
+import org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity;
+import org.springblade.modules.sqjw.sydw.pojo.vo.DwdzVO;
+import org.springblade.modules.sqjw.sydw.pojo.vo.UserVO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SydwService extends BaseService<SydwEntity> {
+
+	IPage<SydwEntity> selectSydwPage(IPage<SydwEntity> page, Map<String, Object> params);
+
+	SydwEntity sydwDetail(SydwEntity sydwEntity);
+
+	List<CyryEntity> selectCyryByDzbm(String tyshxydm);
+
+	CyryEntity cyryDetail(CyryEntity cyryEntity);
+
+	List<DwdzVO> selectDwDz(String deptId, String dzbm);
+
+	List<CyryEntity> selectCyrylsByDzbm(String tyshxydm);
+
+	UserVO djxx(Long userId);
+
+	List<SydwEntity> getMphxlhByLdphxlh(String ldphxlh);
+
+	SydwEntity selectFwInfo(SydwEntity sydwEntity, String dzbm);
+
+	Long selectParentIdByDeptId(String deptId);
+
+	SydwEntity selectSydwByDzbm(String dzbm);
+
+	void updateSydwzx(SydwEntity sydw, Long userId);
+
+	void updateCyryzx(SydwEntity sydw, Long userId);
+
+	SydwEntity getByDzbm(Map<String, Object> params);
+
+	int countByHylb(Map<String, Object> params);
+}

src/main/java/org/springblade/modules/sqjw/sydw/service/impl/CyryServiceImpl.java

@@ -0,0 +1,46 @@
+package org.springblade.modules.sqjw.sydw.service.impl;
+
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.sqjw.sydw.mapper.CyryMapper;
+import org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity;
+import org.springblade.modules.sqjw.sydw.pojo.vo.UserVO;
+import org.springblade.modules.sqjw.sydw.service.CyryService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CyryServiceImpl extends BaseServiceImpl<CyryMapper, CyryEntity> implements CyryService {
+
+	@Override
+	public boolean updatezxById(CyryEntity cyryEntity) {
+		return baseMapper.updatezxById(cyryEntity);
+	}
+
+	@Override
+	public List<CyryEntity> selectCyryByXydm(String tyshxydm) {
+		List<CyryEntity> list = baseMapper.selectCyryByXydm(tyshxydm);
+		if (list.size() > 0) {
+			for (CyryEntity cyry : list) {
+				String dzbm = cyry.getXz();
+				cyry.setXz(baseMapper.getFwxzByRkDzxx(dzbm));
+			}
+		}
+		return list;
+	}
+
+	@Override
+	public CyryEntity selectCyryBySfzh(String gmsfhm) {
+		return baseMapper.selectCyryBySfzh(gmsfhm);
+	}
+
+	@Override
+	public void updateCyry(CyryEntity cyryEntity) {
+		baseMapper.updateCyry(cyryEntity);
+	}
+
+	@Override
+	public UserVO djxx(Long userId) {
+		return baseMapper.djxx(userId);
+	}
+}

src/main/java/org/springblade/modules/sqjw/sydw/service/impl/SydwServiceImpl.java

@@ -0,0 +1,107 @@
+package org.springblade.modules.sqjw.sydw.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.sqjw.sydw.mapper.SydwMapper;
+import org.springblade.modules.sqjw.sydw.pojo.entity.CyryEntity;
+import org.springblade.modules.sqjw.sydw.pojo.entity.SydwEntity;
+import org.springblade.modules.sqjw.sydw.pojo.vo.DwdzVO;
+import org.springblade.modules.sqjw.sydw.pojo.vo.UserVO;
+import org.springblade.modules.sqjw.sydw.service.SydwService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SydwServiceImpl extends BaseServiceImpl<SydwMapper, SydwEntity> implements SydwService {
+	@Override
+	public IPage<SydwEntity> selectSydwPage(IPage<SydwEntity> page, Map<String, Object> params) {
+		return baseMapper.selectSydwPage(page, params);
+	}
+
+	@Override
+	public SydwEntity sydwDetail(SydwEntity sydwEntity) {
+		return baseMapper.sydwDetail(sydwEntity);
+	}
+
+	@Override
+	public List<CyryEntity> selectCyryByDzbm(String tyshxydm) {
+		List<CyryEntity> list = baseMapper.selectCyryByDzbm(tyshxydm);
+//		if (list.size() > 0) {
+//			for (CyryEntity cyry : list) {
+//				String dzbm = cyry.getXz();
+//				cyry.setXz(baseMapper.getFwxzByRkDzxx(dzbm));
+//			}
+//		}
+		return list;
+	}
+
+	@Override
+	public CyryEntity cyryDetail(CyryEntity cyryEntity) {
+		return baseMapper.cyryDetail(cyryEntity);
+	}
+
+	@Override
+	public List<DwdzVO> selectDwDz(String deptId, String dzbm) {
+		return baseMapper.selectDwDz(deptId, dzbm);
+	}
+
+	@Override
+	public List<CyryEntity> selectCyrylsByDzbm(String tyshxydm) {
+		List<CyryEntity> list = baseMapper.selectCyrylsByDzbm(tyshxydm);
+//		if (list.size() > 0) {
+//			for (CyryEntity cyry : list) {
+//				String dzbm = cyry.getXz();
+//				cyry.setXz(baseMapper.getFwxzByRkDzxx(dzbm));
+//			}
+//		}
+		return list;
+	}
+
+	@Override
+	public UserVO djxx(Long userId) {
+		return baseMapper.djxx(userId);
+	}
+
+	@Override
+	public List<SydwEntity> getMphxlhByLdphxlh(String ldphxlh) {
+		return baseMapper.getMphxlhByLdphxlh(ldphxlh);
+	}
+
+	@Override
+	public SydwEntity selectFwInfo(SydwEntity sydwEntity, String dzbm) {
+		SydwEntity fw = baseMapper.selectFwInfo(sydwEntity, dzbm);
+		return fw;
+	}
+
+	@Override
+	public Long selectParentIdByDeptId(String deptId) {
+		return baseMapper.selectParentIdByDeptId(deptId);
+	}
+
+	@Override
+	public SydwEntity selectSydwByDzbm(String dzbm) {
+		return baseMapper.selectSydwByDzbm(dzbm);
+	}
+
+	@Override
+	public void updateSydwzx(SydwEntity sydw, Long userId) {
+		baseMapper.updateSydwzx(sydw, userId);
+	}
+
+	@Override
+	public void updateCyryzx(SydwEntity sydw, Long userId) {
+		baseMapper.updateCyryzx(sydw, userId);
+	}
+
+	@Override
+	public SydwEntity getByDzbm(Map<String, Object> params) {
+		return baseMapper.getByDzbm(params);
+	}
+
+	@Override
+	public int countByHylb(Map<String, Object> params) {
+		return baseMapper.countByHylb(params);
+	}
+}

src/main/java/org/springblade/modules/sqmy/controller/FzrhyInfoController.java

@@ -113,8 +113,8 @@ public class FzrhyInfoController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public R remove(@RequestParam String ids) {
-		return R.status(fzrhyInfoService.deleteLogic(Func.toLongList(ids)));
+	public R remove(@RequestParam String id) {
+		return R.status(fzrhyInfoService.deleteLogic(Func.toLongList(id)));
 	}
 
 	/**

src/main/java/org/springblade/modules/sqmy/controller/JmhInfoController.java

@@ -24,7 +24,6 @@ import org.springblade.modules.sqmy.pojo.vo.JmhInfoVO;
 import org.springblade.modules.sqmy.service.IJmhInfoService;
 import org.springblade.modules.sqmy.service.IJmhRyService;
 import org.springblade.modules.sqmy.wrapper.JmhInfoWrapper;
-import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -57,9 +56,7 @@ public class JmhInfoController extends BladeController {
 	@ApiOperation(value = "详情", notes  = "传入jmhInfo")
 	public R<JmhInfoVO> detail(JmhInfoEntity jmhInfo) {
 		// 查询会议信息
-		JmhInfoEntity detail = jmhInfoService.getOne(Condition.getQueryWrapper(jmhInfo));
-		JmhInfoVO jmhInfoVO = new JmhInfoVO();
-		BeanUtils.copyProperties(detail, jmhInfoVO);
+		JmhInfoVO jmhInfoVO = jmhInfoService.detailById(jmhInfo.getId());
 		// 查询人员信息
 		QueryWrapper<JmhRyEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("jmh_id", jmhInfoVO.getId());
@@ -119,8 +116,12 @@ public class JmhInfoController extends BladeController {
 		jmhInfoService.updateById(jmhInfo);
 		if (null != jmhInfo.getRyList() && jmhInfo.getRyList().size() > 0) {
 			for (JmhRyEntity jmhRyEntity : jmhInfo.getRyList()) {
-				jmhRyEntity.setJmhId(jmhInfo.getId());
-				jmhRyService.saveOrUpdate(jmhRyEntity);
+				if (null != jmhRyEntity.getIsDeleted() && jmhRyEntity.getIsDeleted() == 1) {
+					jmhRyService.removeById(jmhRyEntity.getId());
+				} else {
+					jmhRyEntity.setJmhId(jmhInfo.getId());
+					jmhRyService.saveOrUpdate(jmhRyEntity);
+				}
 			}
 		}
 		return R.status(true);

src/main/java/org/springblade/modules/sqmy/controller/SqmyInfoController.java

@@ -29,7 +29,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.time.LocalDate;
+import java.time.temporal.WeekFields;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -108,15 +111,26 @@ public class SqmyInfoController extends BladeController {
 		// 本周入户走访户数
 		int bzRhzf = fwInfoService.countByType(2, params);
 		sqmyTjVO.setBzRhzf(bzRhzf);
+		// 获取今天的日期
+		LocalDate today = LocalDate.now();
+		// 获取今天是今年的第几周
+		int weekOfYear = today.get(WeekFields.of(Locale.getDefault()).weekOfWeekBasedYear());
+		sqmyTjVO.setWeekOfYear(weekOfYear);
+		// 获取今天是今年的第几季度
+		int quarterOfYear = (today.getMonthValue() - 1) / 3 + 1;
+		sqmyTjVO.setQuarterOfYear(quarterOfYear);
+		// 获取今天是今年的第几月
+		int monthOfYear = today.getMonthValue();
+		sqmyTjVO.setMonthOfYear(monthOfYear);
 		// 本周见面会情况
-		List<JmhInfoEntity> jhmList = jmhInfoService.getBzJmhList(params);
-		sqmyTjVO.setJhmList(jhmList);
+		JmhInfoEntity jhm = jmhInfoService.getBzJmh(params);
+		sqmyTjVO.setJhm(jhm);
 		// 本月安全负责人会议
-		List<FzrhyInfoEntity> fzrhyList = fzrhyInfoService.getByList(params);
-		sqmyTjVO.setFzrhyList(fzrhyList);
+		FzrhyInfoEntity fzrhy = fzrhyInfoService.getByFzrhy(params);
+		sqmyTjVO.setFzrhy(fzrhy);
 		// 本季度治安通报情况
-		List<ZatbInfoEntity> zatbList = zatbInfoService.getBjdList(params);
-		sqmyTjVO.setZatbList(zatbList);
+		ZatbInfoEntity zatb = zatbInfoService.getBjdZatb(params);
+		sqmyTjVO.setZatb(zatb);
 		return R.data(sqmyTjVO);
 	}
 
@@ -159,8 +173,12 @@ public class SqmyInfoController extends BladeController {
 		sqmyInfoService.updateById(sqmyInfo);
 		if (null != sqmyInfo.getRyList() && sqmyInfo.getRyList().size() > 0) {
 			for (SqmyRyEntity sqmyRyEntity : sqmyInfo.getRyList()) {
-				sqmyRyEntity.setSqmyId(sqmyInfo.getId());
-				sqmyRyService.saveOrUpdate(sqmyRyEntity);
+				if (null != sqmyRyEntity.getIsDeleted() && sqmyRyEntity.getIsDeleted() == 1) {
+					sqmyRyService.removeById(sqmyRyEntity.getId());
+				} else {
+					sqmyRyEntity.setSqmyId(sqmyInfo.getId());
+					sqmyRyService.saveOrUpdate(sqmyRyEntity);
+				}
 			}
 		}
 		return R.status(true);
@@ -182,8 +200,8 @@ public class SqmyInfoController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public R remove(@RequestParam String ids) {
-		return R.status(sqmyInfoService.deleteLogic(Func.toLongList(ids)));
+	public R remove(@RequestParam String id) {
+		return R.status(sqmyInfoService.deleteLogic(Func.toLongList(id)));
 	}
 
 	/**

src/main/java/org/springblade/modules/sqmy/mapper/FzrhyInfoMapper.java

@@ -36,5 +36,5 @@ public interface FzrhyInfoMapper extends BaseMapper<FzrhyInfoEntity> {
 	 */
 	List<FzrhyInfoExcel> exportFzrhyInfo(@Param("ew") Wrapper<FzrhyInfoEntity> queryWrapper);
 
-	List<FzrhyInfoEntity> getByList(@Param("params") Map<String, Object> params);
+	FzrhyInfoEntity getByFzrhy(@Param("params") Map<String, Object> params);
 }

src/main/java/org/springblade/modules/sqmy/mapper/FzrhyInfoMapper.xml

@@ -24,7 +24,7 @@
         SELECT * FROM fzrhy_info ${ew.customSqlSegment}
     </select>
 
-    <select id="getByList" resultType="org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity">
+    <select id="getByFzrhy" resultType="org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity">
         SELECT
             fi.*
         FROM
@@ -35,5 +35,6 @@
           AND (#{params.deptId} LIKE '%' || dept.id || '%' OR dept.ancestors LIKE '%' || #{params.deptId} || '%')
           AND fi.create_time BETWEEN DATE_TRUNC('month', CURRENT_DATE) AND (DATE_TRUNC('month', CURRENT_DATE) + INTERVAL '1 month')
         ORDER BY fi.create_time DESC
+        LIMIT 1
     </select>
 </mapper>

src/main/java/org/springblade/modules/sqmy/mapper/JmhInfoMapper.java

@@ -36,5 +36,7 @@ public interface JmhInfoMapper extends BaseMapper<JmhInfoEntity> {
 	 */
 	List<JmhInfoExcel> exportJmhInfo(@Param("ew") Wrapper<JmhInfoEntity> queryWrapper);
 
-    List<JmhInfoEntity> getBzJmhList(@Param("params") Map<String, Object> params);
+    JmhInfoEntity getBzJmh(@Param("params") Map<String, Object> params);
+
+    JmhInfoVO detailById(Long id);
 }

src/main/java/org/springblade/modules/sqmy/mapper/JmhInfoMapper.xml

@@ -17,7 +17,7 @@
             ji.hynr,
             ji.create_time,
             sq.dept_name AS sssqName,
-            STRING_AGG ( ry.xm, ', ' ) AS names
+            STRING_AGG ( ry.zw || '  ' || ry.xm, ', ' ) AS names
         FROM
             sqmy.jmh_info ji
         LEFT JOIN jdrh.blade_dept sq ON sq.id = ji.sssq_bm
@@ -38,7 +38,7 @@
         SELECT * FROM jmh_info ${ew.customSqlSegment}
     </select>
 
-    <select id="getBzJmhList" resultType="org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity">
+    <select id="getBzJmh" resultType="org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity">
         SELECT
             ji.*
         FROM
@@ -49,5 +49,17 @@
           AND (#{params.deptId} LIKE '%' || sq.id || '%' OR sq.ancestors LIKE '%' || #{params.deptId} || '%')
           AND ji.create_time BETWEEN (CURRENT_DATE - EXTRACT(DOW FROM CURRENT_DATE)::INT + (CASE WHEN EXTRACT(DOW FROM CURRENT_DATE) = 0 THEN 7 ELSE 1 END)) AND (CURRENT_DATE - EXTRACT(DOW FROM CURRENT_DATE)::INT + (CASE WHEN EXTRACT(DOW FROM CURRENT_DATE) = 0 THEN 7 ELSE 1 END) + INTERVAL '7 days')
         ORDER BY ji.create_time DESC
+        LIMIT 1
+    </select>
+
+    <select id="detailById" resultType="org.springblade.modules.sqmy.pojo.vo.JmhInfoVO">
+        SELECT
+            ji.*,
+            sq.dept_name AS sssqName
+        FROM
+            sqmy.jmh_info ji
+            LEFT JOIN jdrh.blade_dept sq ON sq.id = ji.sssq_bm
+        WHERE
+            ji.id = #{id}
     </select>
 </mapper>

src/main/java/org/springblade/modules/sqmy/mapper/ZatbInfoMapper.java

@@ -36,5 +36,5 @@ public interface ZatbInfoMapper extends BaseMapper<ZatbInfoEntity> {
 	 */
 	List<ZatbInfoExcel> exportZatbInfo(@Param("ew") Wrapper<ZatbInfoEntity> queryWrapper);
 
-    List<ZatbInfoEntity> getBjdList(@Param("params") Map<String, Object> params);
+    ZatbInfoEntity getBjdZatb(@Param("params") Map<String, Object> params);
 }

src/main/java/org/springblade/modules/sqmy/mapper/ZatbInfoMapper.xml

@@ -25,7 +25,7 @@
         SELECT * FROM zatb_info ${ew.customSqlSegment}
     </select>
 
-    <select id="getBjdList" resultType="org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity">
+    <select id="getBjdZatb" resultType="org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity">
         SELECT
             zi.*
         FROM
@@ -36,6 +36,7 @@
           AND (#{params.deptId} LIKE '%' || dept.id || '%' OR dept.ancestors LIKE '%' || #{params.deptId} || '%')
           AND zi.create_time BETWEEN DATE_TRUNC( 'quarter', CURRENT_DATE ) AND DATE_TRUNC( 'quarter', CURRENT_DATE ) + INTERVAL '3 months'
         ORDER BY zi.create_time DESC
+        LIMIT 1
     </select>
 
 </mapper>

src/main/java/org/springblade/modules/sqmy/pojo/entity/FzrhyInfoEntity.java

@@ -34,5 +34,9 @@ public class FzrhyInfoEntity extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "附件")
 	private String fj;
-
+	/**
+	 * 会议时间
+	 */
+	@ApiModelProperty(value = "会议时间")
+	private String hysj;
 }

src/main/java/org/springblade/modules/sqmy/pojo/entity/JmhInfoEntity.java

@@ -39,5 +39,9 @@ public class JmhInfoEntity extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "所属社区编码")
 	private Long sssqBm;
-
+	/**
+	 * 会议时间
+	 */
+	@ApiModelProperty(value = "会议时间")
+	private String hysj;
 }

src/main/java/org/springblade/modules/sqmy/pojo/entity/SqmyRyEntity.java

@@ -44,5 +44,9 @@ public class SqmyRyEntity extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "sqmy_info表id")
 	private Long sqmyId;
-
+	/**
+	 * 民族
+	 */
+	@ApiModelProperty(value = "民族")
+	private String mz;
 }

src/main/java/org/springblade/modules/sqmy/pojo/vo/SqmyTjVO.java

@@ -7,8 +7,6 @@ import org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity;
 import org.springblade.modules.sqmy.pojo.entity.SqmyInfoEntity;
 import org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity;
 
-import java.util.List;
-
 /**
  * 社情民意统计 视图实体类
  *
@@ -30,10 +28,16 @@ public class SqmyTjVO extends SqmyInfoEntity {
 	private int ndRhzf;
 	// 本周入户走访户数
 	private int bzRhzf;
+	// 今天是今年的第几周
+	private int weekOfYear;
+	// 今天是今年的第几季度
+	private int quarterOfYear;
+	// 今天是今年的第几月
+	private int monthOfYear;
 	// 本周见面会情况
-	private List<JmhInfoEntity> jhmList;
+	private JmhInfoEntity jhm;
 	// 本月安全负责人会议
-	private List<FzrhyInfoEntity> fzrhyList;
+	private FzrhyInfoEntity fzrhy;
 	// 本季度治安通报情况
-	private List<ZatbInfoEntity> zatbList;
+	private ZatbInfoEntity zatb;
 }

src/main/java/org/springblade/modules/sqmy/service/IFzrhyInfoService.java

@@ -34,5 +34,5 @@ public interface IFzrhyInfoService extends BaseService<FzrhyInfoEntity> {
 	 */
 	List<FzrhyInfoExcel> exportFzrhyInfo(Wrapper<FzrhyInfoEntity> queryWrapper);
 
-    List<FzrhyInfoEntity> getByList(Map<String, Object> params);
+    FzrhyInfoEntity getByFzrhy(Map<String, Object> params);
 }

src/main/java/org/springblade/modules/sqmy/service/IJmhInfoService.java

@@ -34,5 +34,7 @@ public interface IJmhInfoService extends BaseService<JmhInfoEntity> {
 	 */
 	List<JmhInfoExcel> exportJmhInfo(Wrapper<JmhInfoEntity> queryWrapper);
 
-    List<JmhInfoEntity> getBzJmhList(Map<String, Object> params);
+    JmhInfoEntity getBzJmh(Map<String, Object> params);
+
+    JmhInfoVO detailById(Long id);
 }

src/main/java/org/springblade/modules/sqmy/service/IZatbInfoService.java

@@ -34,5 +34,5 @@ public interface IZatbInfoService extends BaseService<ZatbInfoEntity> {
 	 */
 	List<ZatbInfoExcel> exportZatbInfo(Wrapper<ZatbInfoEntity> queryWrapper);
 
-    List<ZatbInfoEntity> getBjdList(Map<String, Object> params);
+    ZatbInfoEntity getBjdZatb(Map<String, Object> params);
 }

src/main/java/org/springblade/modules/sqmy/service/impl/FzrhyInfoServiceImpl.java

@@ -10,7 +10,6 @@ import org.springblade.modules.sqmy.pojo.vo.FzrhyInfoVO;
 import org.springblade.modules.sqmy.service.IFzrhyInfoService;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -38,8 +37,8 @@ public class FzrhyInfoServiceImpl extends BaseServiceImpl<FzrhyInfoMapper, Fzrhy
 	}
 
 	@Override
-	public List<FzrhyInfoEntity> getByList(Map<String, Object> params) {
-		return baseMapper.getByList(params);
+	public FzrhyInfoEntity getByFzrhy(Map<String, Object> params) {
+		return baseMapper.getByFzrhy(params);
 	}
 
 }

src/main/java/org/springblade/modules/sqmy/service/impl/JmhInfoServiceImpl.java

@@ -10,7 +10,6 @@ import org.springblade.modules.sqmy.pojo.vo.JmhInfoVO;
 import org.springblade.modules.sqmy.service.IJmhInfoService;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -38,8 +37,13 @@ public class JmhInfoServiceImpl extends BaseServiceImpl<JmhInfoMapper, JmhInfoEn
 	}
 
 	@Override
-	public List<JmhInfoEntity> getBzJmhList(Map<String, Object> params) {
-		return baseMapper.getBzJmhList(params);
+	public JmhInfoEntity getBzJmh(Map<String, Object> params) {
+		return baseMapper.getBzJmh(params);
+	}
+
+	@Override
+	public JmhInfoVO detailById(Long id) {
+		return baseMapper.detailById(id);
 	}
 
 }

src/main/java/org/springblade/modules/sqmy/service/impl/ZatbInfoServiceImpl.java

@@ -38,8 +38,8 @@ public class ZatbInfoServiceImpl extends BaseServiceImpl<ZatbInfoMapper, ZatbInf
 	}
 
 	@Override
-	public List<ZatbInfoEntity> getBjdList(Map<String, Object> params) {
-		return baseMapper.getBjdList(params);
+	public ZatbInfoEntity getBjdZatb(Map<String, Object> params) {
+		return baseMapper.getBjdZatb(params);
 	}
 
 }

src/main/java/org/springblade/modules/system/mapper/DictBizMapper.java

@@ -21,6 +21,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.gzInfo.vo.ZdVo;
 import org.springblade.modules.gzInfo.vo.ZdVos;
 import org.springblade.modules.gzInfo.vo.ZdVoss;
+import org.springblade.modules.sqjw.sydw.pojo.vo.HylxVO;
 import org.springblade.modules.system.entity.DictBiz;
 import org.springblade.modules.system.vo.DictBizVO;
 import org.springblade.modules.system.vo.ZdVO;
@@ -100,4 +101,8 @@ public interface DictBizMapper extends BaseMapper<DictBiz> {
 	int getKfsl();
 
     List<ZdVO> getTsrq();
+
+    List<HylxVO> getHylx();
+
+	List<ZdVO> getDwlx(Long parentId);
 }

src/main/java/org/springblade/modules/system/mapper/DictBizMapper.xml

@@ -64,6 +64,7 @@
 
     <select id="getDictList" resultType="org.springblade.modules.system.vo.ZdVO">
         SELECT
+            id,
             dict_key AS value,
             dict_value AS label
         FROM
@@ -264,4 +265,24 @@
             jdrh.blade_dict_biz
         where code = 'tsrq'
     </select>
+
+    <select id="getHylx" resultType="org.springblade.modules.sqjw.sydw.pojo.vo.HylxVO">
+        select
+            id,
+            dict_key as value,
+            dict_value as label
+        from
+            jdrh.blade_dict_biz
+        where parent_id = 1853611429036111901
+    </select>
+
+    <select id="getDwlx" resultType="org.springblade.modules.sqjw.sydw.pojo.vo.HylxVO">
+        select
+            id,
+            dict_key as value,
+            dict_value as label
+        from
+            jdrh.blade_dict_biz
+        where parent_id = #{parentId}
+    </select>
 </mapper>

src/main/java/org/springblade/modules/system/service/IDictBizService.java

@@ -6,6 +6,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.modules.gzInfo.vo.ZdVo;
 import org.springblade.modules.gzInfo.vo.ZdVos;
 import org.springblade.modules.gzInfo.vo.ZdVoss;
+import org.springblade.modules.sqjw.sydw.pojo.vo.HylxVO;
 import org.springblade.modules.system.entity.DictBiz;
 import org.springblade.modules.system.vo.DictBizVO;
 import org.springblade.modules.system.vo.ZdVO;
@@ -119,4 +120,8 @@ public interface IDictBizService extends IService<DictBiz> {
 	int getKfsl();
 
     List<ZdVO> getTsrq();
+
+	List<HylxVO> getHylx();
+
+	List<ZdVO> getDwlx(Long parentId);
 }

src/main/java/org/springblade/modules/system/service/impl/DictBizServiceImpl.java

@@ -33,6 +33,7 @@ import org.springblade.core.tool.utils.StringPool;
 import org.springblade.modules.gzInfo.vo.ZdVo;
 import org.springblade.modules.gzInfo.vo.ZdVos;
 import org.springblade.modules.gzInfo.vo.ZdVoss;
+import org.springblade.modules.sqjw.sydw.pojo.vo.HylxVO;
 import org.springblade.modules.system.entity.DictBiz;
 import org.springblade.modules.system.mapper.DictBizMapper;
 import org.springblade.modules.system.service.IDictBizService;
@@ -42,6 +43,7 @@ import org.springblade.modules.system.wrapper.DictBizWrapper;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -215,4 +217,14 @@ public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> impl
 	public List<ZdVO> getTsrq() {
 		return baseMapper.getTsrq();
 	}
+
+	@Override
+	public List<HylxVO> getHylx() {
+		return baseMapper.getHylx();
+	}
+
+	@Override
+	public List<ZdVO> getDwlx(Long parentId) {
+		return baseMapper.getDwlx(parentId);
+	}
 }

src/main/java/org/springblade/modules/system/vo/RhzfZdVO.java

@@ -1,6 +1,7 @@
 package org.springblade.modules.system.vo;
 
 import lombok.Data;
+import org.springblade.modules.sqjw.sydw.pojo.vo.HylxVO;
 
 import java.util.List;
 
@@ -75,4 +76,12 @@ public class RhzfZdVO {
 	private List<ZdVO> wtfwlx;
 
 	private List<ZdVO> yyfwlx;
+
+	private List<ZdVO> jyfs;
+
+	private List<ZdVO> zylb;
+
+	private List<HylxVO> hylx;
+
+	private List<ZdVO> xslx;
 }

src/main/java/org/springblade/modules/system/vo/ZdVO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 @Data
 public class ZdVO {
+	private Long id;
 	public String value;
 	public String label;
 }