wangtuohang@126.com 1 ヶ月 前
コミット
b2362f36ac
61 ファイル変更2895 行追加0 行削除
  1. 136 0
      src/main/java/org/springblade/modules/sqmy/controller/FzrhyInfoController.java
  2. 166 0
      src/main/java/org/springblade/modules/sqmy/controller/JmhInfoController.java
  3. 136 0
      src/main/java/org/springblade/modules/sqmy/controller/JmhRyController.java
  4. 206 0
      src/main/java/org/springblade/modules/sqmy/controller/SqmyInfoController.java
  5. 136 0
      src/main/java/org/springblade/modules/sqmy/controller/SqmyRyController.java
  6. 137 0
      src/main/java/org/springblade/modules/sqmy/controller/ZatbInfoController.java
  7. 44 0
      src/main/java/org/springblade/modules/sqmy/excel/FzrhyInfoExcel.java
  8. 56 0
      src/main/java/org/springblade/modules/sqmy/excel/JmhInfoExcel.java
  9. 44 0
      src/main/java/org/springblade/modules/sqmy/excel/JmhRyExcel.java
  10. 62 0
      src/main/java/org/springblade/modules/sqmy/excel/SqmyInfoExcel.java
  11. 50 0
      src/main/java/org/springblade/modules/sqmy/excel/SqmyRyExcel.java
  12. 50 0
      src/main/java/org/springblade/modules/sqmy/excel/ZatbInfoExcel.java
  13. 40 0
      src/main/java/org/springblade/modules/sqmy/mapper/FzrhyInfoMapper.java
  14. 39 0
      src/main/java/org/springblade/modules/sqmy/mapper/FzrhyInfoMapper.xml
  15. 40 0
      src/main/java/org/springblade/modules/sqmy/mapper/JmhInfoMapper.java
  16. 53 0
      src/main/java/org/springblade/modules/sqmy/mapper/JmhInfoMapper.xml
  17. 38 0
      src/main/java/org/springblade/modules/sqmy/mapper/JmhRyMapper.java
  18. 21 0
      src/main/java/org/springblade/modules/sqmy/mapper/JmhRyMapper.xml
  19. 40 0
      src/main/java/org/springblade/modules/sqmy/mapper/SqmyInfoMapper.java
  20. 48 0
      src/main/java/org/springblade/modules/sqmy/mapper/SqmyInfoMapper.xml
  21. 38 0
      src/main/java/org/springblade/modules/sqmy/mapper/SqmyRyMapper.java
  22. 22 0
      src/main/java/org/springblade/modules/sqmy/mapper/SqmyRyMapper.xml
  23. 40 0
      src/main/java/org/springblade/modules/sqmy/mapper/ZatbInfoMapper.java
  24. 41 0
      src/main/java/org/springblade/modules/sqmy/mapper/ZatbInfoMapper.xml
  25. 18 0
      src/main/java/org/springblade/modules/sqmy/pojo/dto/FzrhyInfoDTO.java
  26. 18 0
      src/main/java/org/springblade/modules/sqmy/pojo/dto/JmhInfoDTO.java
  27. 18 0
      src/main/java/org/springblade/modules/sqmy/pojo/dto/JmhRyDTO.java
  28. 18 0
      src/main/java/org/springblade/modules/sqmy/pojo/dto/SqmyInfoDTO.java
  29. 18 0
      src/main/java/org/springblade/modules/sqmy/pojo/dto/SqmyRyDTO.java
  30. 18 0
      src/main/java/org/springblade/modules/sqmy/pojo/dto/ZatbInfoDTO.java
  31. 38 0
      src/main/java/org/springblade/modules/sqmy/pojo/entity/FzrhyInfoEntity.java
  32. 43 0
      src/main/java/org/springblade/modules/sqmy/pojo/entity/JmhInfoEntity.java
  33. 42 0
      src/main/java/org/springblade/modules/sqmy/pojo/entity/JmhRyEntity.java
  34. 48 0
      src/main/java/org/springblade/modules/sqmy/pojo/entity/SqmyInfoEntity.java
  35. 48 0
      src/main/java/org/springblade/modules/sqmy/pojo/entity/SqmyRyEntity.java
  36. 43 0
      src/main/java/org/springblade/modules/sqmy/pojo/entity/ZatbInfoEntity.java
  37. 18 0
      src/main/java/org/springblade/modules/sqmy/pojo/vo/FzrhyInfoVO.java
  38. 26 0
      src/main/java/org/springblade/modules/sqmy/pojo/vo/JmhInfoVO.java
  39. 18 0
      src/main/java/org/springblade/modules/sqmy/pojo/vo/JmhRyVO.java
  40. 22 0
      src/main/java/org/springblade/modules/sqmy/pojo/vo/SqmyInfoVO.java
  41. 18 0
      src/main/java/org/springblade/modules/sqmy/pojo/vo/SqmyRyVO.java
  42. 39 0
      src/main/java/org/springblade/modules/sqmy/pojo/vo/SqmyTjVO.java
  43. 18 0
      src/main/java/org/springblade/modules/sqmy/pojo/vo/ZatbInfoVO.java
  44. 38 0
      src/main/java/org/springblade/modules/sqmy/service/IFzrhyInfoService.java
  45. 38 0
      src/main/java/org/springblade/modules/sqmy/service/IJmhInfoService.java
  46. 36 0
      src/main/java/org/springblade/modules/sqmy/service/IJmhRyService.java
  47. 38 0
      src/main/java/org/springblade/modules/sqmy/service/ISqmyInfoService.java
  48. 36 0
      src/main/java/org/springblade/modules/sqmy/service/ISqmyRyService.java
  49. 38 0
      src/main/java/org/springblade/modules/sqmy/service/IZatbInfoService.java
  50. 45 0
      src/main/java/org/springblade/modules/sqmy/service/impl/FzrhyInfoServiceImpl.java
  51. 45 0
      src/main/java/org/springblade/modules/sqmy/service/impl/JmhInfoServiceImpl.java
  52. 38 0
      src/main/java/org/springblade/modules/sqmy/service/impl/JmhRyServiceImpl.java
  53. 44 0
      src/main/java/org/springblade/modules/sqmy/service/impl/SqmyInfoServiceImpl.java
  54. 38 0
      src/main/java/org/springblade/modules/sqmy/service/impl/SqmyRyServiceImpl.java
  55. 45 0
      src/main/java/org/springblade/modules/sqmy/service/impl/ZatbInfoServiceImpl.java
  56. 34 0
      src/main/java/org/springblade/modules/sqmy/wrapper/FzrhyInfoWrapper.java
  57. 34 0
      src/main/java/org/springblade/modules/sqmy/wrapper/JmhInfoWrapper.java
  58. 34 0
      src/main/java/org/springblade/modules/sqmy/wrapper/JmhRyWrapper.java
  59. 34 0
      src/main/java/org/springblade/modules/sqmy/wrapper/SqmyInfoWrapper.java
  60. 34 0
      src/main/java/org/springblade/modules/sqmy/wrapper/SqmyRyWrapper.java
  61. 34 0
      src/main/java/org/springblade/modules/sqmy/wrapper/ZatbInfoWrapper.java

+ 136 - 0
src/main/java/org/springblade/modules/sqmy/controller/FzrhyInfoController.java

@@ -0,0 +1,136 @@
+package org.springblade.modules.sqmy.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.secure.utils.AuthUtil;
+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.sqmy.excel.FzrhyInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.FzrhyInfoVO;
+import org.springblade.modules.sqmy.service.IFzrhyInfoService;
+import org.springblade.modules.sqmy.wrapper.FzrhyInfoWrapper;
+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-12
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/fzrhyInfo")
+@Api(value = "每月安全负责人会议", tags = "每月安全负责人会议接口")
+public class FzrhyInfoController extends BladeController {
+
+	private final IFzrhyInfoService fzrhyInfoService;
+
+	/**
+	 * 每月安全负责人会议 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入fzrhyInfo")
+	public R<FzrhyInfoVO> detail(FzrhyInfoEntity fzrhyInfo) {
+		FzrhyInfoEntity detail = fzrhyInfoService.getOne(Condition.getQueryWrapper(fzrhyInfo));
+		return R.data(FzrhyInfoWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 每月安全负责人会议 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入fzrhyInfo")
+	public R<IPage<FzrhyInfoVO>> list(@RequestParam Map<String, Object> fzrhyInfo, Query query) {
+		IPage<FzrhyInfoEntity> pages = fzrhyInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(fzrhyInfo, FzrhyInfoEntity.class));
+		return R.data(FzrhyInfoWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 每月安全负责人会议 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入fzrhyInfo")
+	public R<IPage<FzrhyInfoVO>> page(@RequestParam Map<String, Object> params, Query query) {
+		params.put("deptId", AuthUtil.getDeptId());
+		IPage<FzrhyInfoVO> pages = fzrhyInfoService.selectFzrhyInfoPage(Condition.getPage(query), params);
+		return R.data(pages);
+	}
+
+	/**
+	 * 每月安全负责人会议 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入fzrhyInfo")
+	public R save(@Valid @RequestBody FzrhyInfoEntity fzrhyInfo) {
+		return R.status(fzrhyInfoService.save(fzrhyInfo));
+	}
+
+	/**
+	 * 每月安全负责人会议 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入fzrhyInfo")
+	public R update(@Valid @RequestBody FzrhyInfoEntity fzrhyInfo) {
+		return R.status(fzrhyInfoService.updateById(fzrhyInfo));
+	}
+
+	/**
+	 * 每月安全负责人会议 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入fzrhyInfo")
+	public R submit(@Valid @RequestBody FzrhyInfoEntity fzrhyInfo) {
+		return R.status(fzrhyInfoService.saveOrUpdate(fzrhyInfo));
+	}
+
+	/**
+	 * 每月安全负责人会议 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@RequestParam String ids) {
+		return R.status(fzrhyInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-fzrhyInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出数据", notes = "传入fzrhyInfo")
+	public void exportFzrhyInfo(@RequestParam Map<String, Object> fzrhyInfo, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<FzrhyInfoEntity> queryWrapper = Condition.getQueryWrapper(fzrhyInfo, FzrhyInfoEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(FzrhyInfoEntity::getTenantId, bladeUser.getTenantId());
+		//}
+		//queryWrapper.lambda().eq(FzrhyInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<FzrhyInfoExcel> list = fzrhyInfoService.exportFzrhyInfo(queryWrapper);
+		ExcelUtil.export(response, "每月安全负责人会议数据" + DateUtil.time(), "每月安全负责人会议数据表", list, FzrhyInfoExcel.class);
+	}
+}

+ 166 - 0
src/main/java/org/springblade/modules/sqmy/controller/JmhInfoController.java

@@ -0,0 +1,166 @@
+package org.springblade.modules.sqmy.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.secure.utils.AuthUtil;
+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.sqmy.excel.JmhInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity;
+import org.springblade.modules.sqmy.pojo.entity.JmhRyEntity;
+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.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 每周见面会 控制器
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/jmhInfo")
+@Api(value = "每周见面会", tags = "每周见面会接口")
+public class JmhInfoController extends BladeController {
+
+	private final IJmhInfoService jmhInfoService;
+
+	private final IJmhRyService jmhRyService;
+
+	/**
+	 * 每周见面会 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@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);
+		// 查询人员信息
+		QueryWrapper<JmhRyEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("jmh_id", jmhInfoVO.getId());
+		List<JmhRyEntity> ryList = jmhRyService.list(queryWrapper);
+		jmhInfoVO.setRyList(ryList);
+		return R.data(jmhInfoVO);
+	}
+
+	/**
+	 * 每周见面会 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes  = "传入jmhInfo")
+	public R<IPage<JmhInfoVO>> list(@RequestParam Map<String, Object> jmhInfo, Query query) {
+		IPage<JmhInfoEntity> pages = jmhInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(jmhInfo, JmhInfoEntity.class));
+		return R.data(JmhInfoWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 每周见面会 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes  = "传入jmhInfo")
+	public R page(@RequestParam Map<String, Object> params, Query query) {
+		params.put("deptId", AuthUtil.getDeptId());
+		IPage<JmhInfoVO> pages = jmhInfoService.selectJmhInfoPage(Condition.getPage(query), params);
+		return R.data(pages);
+	}
+
+	/**
+	 * 每周见面会 新增
+	 */
+	@Transactional
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes  = "传入jmhInfo")
+	public R save(@Valid @RequestBody JmhInfoVO jmhInfo) {
+		jmhInfoService.save(jmhInfo);
+		if (null != jmhInfo.getRyList() && jmhInfo.getRyList().size() > 0) {
+			for (JmhRyEntity jmhRyEntity : jmhInfo.getRyList()) {
+				jmhRyEntity.setJmhId(jmhInfo.getId());
+				jmhRyService.save(jmhRyEntity);
+			}
+		}
+		return R.status(true);
+	}
+
+	/**
+	 * 每周见面会 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes  = "传入jmhInfo")
+	public R update(@Valid @RequestBody JmhInfoVO jmhInfo) {
+		jmhInfoService.updateById(jmhInfo);
+		if (null != jmhInfo.getRyList() && jmhInfo.getRyList().size() > 0) {
+			for (JmhRyEntity jmhRyEntity : jmhInfo.getRyList()) {
+				jmhRyEntity.setJmhId(jmhInfo.getId());
+				jmhRyService.saveOrUpdate(jmhRyEntity);
+			}
+		}
+		return R.status(true);
+	}
+
+	/**
+	 * 每周见面会 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes  = "传入jmhInfo")
+	public R submit(@Valid @RequestBody JmhInfoEntity jmhInfo) {
+		return R.status(jmhInfoService.saveOrUpdate(jmhInfo));
+	}
+
+	/**
+	 * 每周见面会 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes  = "传入ids")
+	public R remove(@RequestParam String ids) {
+		return R.status(jmhInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-jmhInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出数据", notes  = "传入jmhInfo")
+	public void exportJmhInfo(@RequestParam Map<String, Object> jmhInfo, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<JmhInfoEntity> queryWrapper = Condition.getQueryWrapper(jmhInfo, JmhInfoEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(JmhInfoEntity::getTenantId, bladeUser.getTenantId());
+		//}
+		//queryWrapper.lambda().eq(JmhInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<JmhInfoExcel> list = jmhInfoService.exportJmhInfo(queryWrapper);
+		ExcelUtil.export(response, "每周见面会数据" + DateUtil.time(), "每周见面会数据表", list, JmhInfoExcel.class);
+	}
+
+}

+ 136 - 0
src/main/java/org/springblade/modules/sqmy/controller/JmhRyController.java

@@ -0,0 +1,136 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.JmhRyExcel;
+import org.springblade.modules.sqmy.pojo.entity.JmhRyEntity;
+import org.springblade.modules.sqmy.pojo.vo.JmhRyVO;
+import org.springblade.modules.sqmy.service.IJmhRyService;
+import org.springblade.modules.sqmy.wrapper.JmhRyWrapper;
+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-12
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/jmhRy")
+@Api(value = "每周见面会_参会人员", tags = "每周见面会_参会人员接口")
+public class JmhRyController extends BladeController {
+
+	private final IJmhRyService jmhRyService;
+
+	/**
+	 * 每周见面会_参会人员 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes  = "传入jmhRy")
+	public R<JmhRyVO> detail(JmhRyEntity jmhRy) {
+		JmhRyEntity detail = jmhRyService.getOne(Condition.getQueryWrapper(jmhRy));
+		return R.data(JmhRyWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 每周见面会_参会人员 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes  = "传入jmhRy")
+	public R<IPage<JmhRyVO>> list(@RequestParam Map<String, Object> jmhRy, Query query) {
+		IPage<JmhRyEntity> pages = jmhRyService.page(Condition.getPage(query), Condition.getQueryWrapper(jmhRy, JmhRyEntity.class));
+		return R.data(JmhRyWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 每周见面会_参会人员 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes  = "传入jmhRy")
+	public R<IPage<JmhRyVO>> page(JmhRyVO jmhRy, Query query) {
+		IPage<JmhRyVO> pages = jmhRyService.selectJmhRyPage(Condition.getPage(query), jmhRy);
+		return R.data(pages);
+	}
+
+	/**
+	 * 每周见面会_参会人员 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes  = "传入jmhRy")
+	public R save(@Valid @RequestBody JmhRyEntity jmhRy) {
+		return R.status(jmhRyService.save(jmhRy));
+	}
+
+	/**
+	 * 每周见面会_参会人员 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes  = "传入jmhRy")
+	public R update(@Valid @RequestBody JmhRyEntity jmhRy) {
+		return R.status(jmhRyService.updateById(jmhRy));
+	}
+
+	/**
+	 * 每周见面会_参会人员 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes  = "传入jmhRy")
+	public R submit(@Valid @RequestBody JmhRyEntity jmhRy) {
+		return R.status(jmhRyService.saveOrUpdate(jmhRy));
+	}
+
+	/**
+	 * 每周见面会_参会人员 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes  = "传入ids")
+	public R remove(@RequestParam String ids) {
+		return R.status(jmhRyService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-jmhRy")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出数据", notes  = "传入jmhRy")
+	public void exportJmhRy(@RequestParam Map<String, Object> jmhRy, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<JmhRyEntity> queryWrapper = Condition.getQueryWrapper(jmhRy, JmhRyEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(JmhRyEntity::getTenantId, bladeUser.getTenantId());
+		//}
+		//queryWrapper.lambda().eq(JmhRyEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<JmhRyExcel> list = jmhRyService.exportJmhRy(queryWrapper);
+		ExcelUtil.export(response, "每周见面会_参会人员数据" + DateUtil.time(), "每周见面会_参会人员数据表", list, JmhRyExcel.class);
+	}
+
+}

+ 206 - 0
src/main/java/org/springblade/modules/sqmy/controller/SqmyInfoController.java

@@ -0,0 +1,206 @@
+package org.springblade.modules.sqmy.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.secure.utils.AuthUtil;
+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.rhzf.fwInfo.service.IFwInfoService;
+import org.springblade.modules.sqmy.excel.SqmyInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.*;
+import org.springblade.modules.sqmy.pojo.vo.SqmyInfoVO;
+import org.springblade.modules.sqmy.pojo.vo.SqmyTjVO;
+import org.springblade.modules.sqmy.service.*;
+import org.springblade.modules.sqmy.wrapper.SqmyInfoWrapper;
+import org.springframework.beans.BeanUtils;
+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-12
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sqmyInfo")
+@Api(value = "社情民意", tags = "社情民意接口")
+public class SqmyInfoController extends BladeController {
+
+	private final ISqmyInfoService sqmyInfoService;
+
+	private final ISqmyRyService sqmyRyService;
+
+	private final IFwInfoService fwInfoService;
+
+	private final IJmhInfoService jmhInfoService;
+
+	private final IFzrhyInfoService fzrhyInfoService;
+
+	private final IZatbInfoService zatbInfoService;
+
+	/**
+	 * 社情民意 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入sqmyInfo")
+	public R<SqmyInfoVO> detail(SqmyInfoEntity sqmyInfo) {
+		// 查询社情民意信息
+		SqmyInfoEntity detail = sqmyInfoService.getOne(Condition.getQueryWrapper(sqmyInfo));
+		SqmyInfoVO sqmyInfoVO = new SqmyInfoVO();
+		BeanUtils.copyProperties(detail, sqmyInfoVO);
+		// 查询人员信息
+		QueryWrapper<SqmyRyEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("sqmy_id", sqmyInfo.getId());
+		List<SqmyRyEntity> ryList = sqmyRyService.list(queryWrapper);
+		sqmyInfoVO.setRyList(ryList);
+		return R.data(sqmyInfoVO);
+	}
+
+	/**
+	 * 社情民意 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入sqmyInfo")
+	public R<IPage<SqmyInfoVO>> list(@RequestParam Map<String, Object> sqmyInfo, Query query) {
+		IPage<SqmyInfoEntity> pages = sqmyInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(sqmyInfo, SqmyInfoEntity.class));
+		return R.data(SqmyInfoWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 社情民意 数据统计
+	 */
+	@GetMapping("/sjtj")
+	public R sjtj(@RequestParam Map<String, Object> params) {
+		params.put("deptId", AuthUtil.getDeptId());
+		SqmyTjVO sqmyTjVO = new SqmyTjVO();
+		// 年度社情民意
+		int ndSqmy = sqmyInfoService.countByType(1, params);
+		sqmyTjVO.setNdSqmy(ndSqmy);
+		// 季度社情民意
+		int jdSqmy = sqmyInfoService.countByType(2, params);
+		sqmyTjVO.setJdSqmy(jdSqmy);
+		// 本日社情民意
+		int brSqmy = sqmyInfoService.countByType(3, params);
+		sqmyTjVO.setBrSqmy(brSqmy);
+		// 本年度入户走访户数
+		int ndRhzf = fwInfoService.countByType(1, params);
+		sqmyTjVO.setNdRhzf(ndRhzf);
+		// 本周入户走访户数
+		int bzRhzf = fwInfoService.countByType(2, params);
+		sqmyTjVO.setBzRhzf(bzRhzf);
+		// 本周见面会情况
+		List<JmhInfoEntity> jhmList = jmhInfoService.getBzJmhList(params);
+		sqmyTjVO.setJhmList(jhmList);
+		// 本月安全负责人会议
+		List<FzrhyInfoEntity> fzrhyList = fzrhyInfoService.getByList(params);
+		sqmyTjVO.setFzrhyList(fzrhyList);
+		// 本季度治安通报情况
+		List<ZatbInfoEntity> zatbList = zatbInfoService.getBjdList(params);
+		sqmyTjVO.setZatbList(zatbList);
+		return R.data(sqmyTjVO);
+	}
+
+	/**
+	 * 社情民意 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入sqmyInfo")
+	public R<IPage<SqmyInfoVO>> page(@RequestParam Map<String, Object> params, Query query) {
+		params.put("deptId", AuthUtil.getDeptId());
+		IPage<SqmyInfoVO> pages = sqmyInfoService.selectSqmyInfoPage(Condition.getPage(query), params);
+		return R.data(pages);
+	}
+
+	/**
+	 * 社情民意 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入sqmyInfo")
+	public R save(@Valid @RequestBody SqmyInfoVO sqmyInfo) {
+		sqmyInfoService.save(sqmyInfo);
+		if (null != sqmyInfo.getRyList() && sqmyInfo.getRyList().size() > 0) {
+			for (SqmyRyEntity sqmyRyEntity : sqmyInfo.getRyList()) {
+				sqmyRyEntity.setSqmyId(sqmyInfo.getId());
+				sqmyRyService.save(sqmyRyEntity);
+			}
+		}
+		return R.status(true);
+	}
+
+	/**
+	 * 社情民意 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入sqmyInfo")
+	public R update(@Valid @RequestBody SqmyInfoVO sqmyInfo) {
+		sqmyInfoService.updateById(sqmyInfo);
+		if (null != sqmyInfo.getRyList() && sqmyInfo.getRyList().size() > 0) {
+			for (SqmyRyEntity sqmyRyEntity : sqmyInfo.getRyList()) {
+				sqmyRyEntity.setSqmyId(sqmyInfo.getId());
+				sqmyRyService.saveOrUpdate(sqmyRyEntity);
+			}
+		}
+		return R.status(true);
+	}
+
+	/**
+	 * 社情民意 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入sqmyInfo")
+	public R submit(@Valid @RequestBody SqmyInfoEntity sqmyInfo) {
+		return R.status(sqmyInfoService.saveOrUpdate(sqmyInfo));
+	}
+
+	/**
+	 * 社情民意 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@RequestParam String ids) {
+		return R.status(sqmyInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-sqmyInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出数据", notes = "传入sqmyInfo")
+	public void exportSqmyInfo(@RequestParam Map<String, Object> sqmyInfo, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<SqmyInfoEntity> queryWrapper = Condition.getQueryWrapper(sqmyInfo, SqmyInfoEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(SqmyInfoEntity::getTenantId, bladeUser.getTenantId());
+		//}
+		//queryWrapper.lambda().eq(SqmyInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<SqmyInfoExcel> list = sqmyInfoService.exportSqmyInfo(queryWrapper);
+		ExcelUtil.export(response, "社情民意数据" + DateUtil.time(), "社情民意数据表", list, SqmyInfoExcel.class);
+	}
+
+}

+ 136 - 0
src/main/java/org/springblade/modules/sqmy/controller/SqmyRyController.java

@@ -0,0 +1,136 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.SqmyRyExcel;
+import org.springblade.modules.sqmy.pojo.entity.SqmyRyEntity;
+import org.springblade.modules.sqmy.pojo.vo.SqmyRyVO;
+import org.springblade.modules.sqmy.service.ISqmyRyService;
+import org.springblade.modules.sqmy.wrapper.SqmyRyWrapper;
+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-12
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sqmyRy")
+@Api(value = "社情民意_线索提供人", tags = "社情民意_线索提供人接口")
+public class SqmyRyController extends BladeController {
+
+	private final ISqmyRyService sqmyRyService;
+
+	/**
+	 * 社情民意_线索提供人 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes  = "传入sqmyRy")
+	public R<SqmyRyVO> detail(SqmyRyEntity sqmyRy) {
+		SqmyRyEntity detail = sqmyRyService.getOne(Condition.getQueryWrapper(sqmyRy));
+		return R.data(SqmyRyWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 社情民意_线索提供人 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes  = "传入sqmyRy")
+	public R<IPage<SqmyRyVO>> list(@RequestParam Map<String, Object> sqmyRy, Query query) {
+		IPage<SqmyRyEntity> pages = sqmyRyService.page(Condition.getPage(query), Condition.getQueryWrapper(sqmyRy, SqmyRyEntity.class));
+		return R.data(SqmyRyWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 社情民意_线索提供人 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes  = "传入sqmyRy")
+	public R<IPage<SqmyRyVO>> page(SqmyRyVO sqmyRy, Query query) {
+		IPage<SqmyRyVO> pages = sqmyRyService.selectSqmyRyPage(Condition.getPage(query), sqmyRy);
+		return R.data(pages);
+	}
+
+	/**
+	 * 社情民意_线索提供人 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes  = "传入sqmyRy")
+	public R save(@Valid @RequestBody SqmyRyEntity sqmyRy) {
+		return R.status(sqmyRyService.save(sqmyRy));
+	}
+
+	/**
+	 * 社情民意_线索提供人 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes  = "传入sqmyRy")
+	public R update(@Valid @RequestBody SqmyRyEntity sqmyRy) {
+		return R.status(sqmyRyService.updateById(sqmyRy));
+	}
+
+	/**
+	 * 社情民意_线索提供人 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes  = "传入sqmyRy")
+	public R submit(@Valid @RequestBody SqmyRyEntity sqmyRy) {
+		return R.status(sqmyRyService.saveOrUpdate(sqmyRy));
+	}
+
+	/**
+	 * 社情民意_线索提供人 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes  = "传入ids")
+	public R remove(@RequestParam String ids) {
+		return R.status(sqmyRyService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-sqmyRy")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出数据", notes  = "传入sqmyRy")
+	public void exportSqmyRy(@RequestParam Map<String, Object> sqmyRy, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<SqmyRyEntity> queryWrapper = Condition.getQueryWrapper(sqmyRy, SqmyRyEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(SqmyRyEntity::getTenantId, bladeUser.getTenantId());
+		//}
+		//queryWrapper.lambda().eq(SqmyRyEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<SqmyRyExcel> list = sqmyRyService.exportSqmyRy(queryWrapper);
+		ExcelUtil.export(response, "社情民意_线索提供人数据" + DateUtil.time(), "社情民意_线索提供人数据表", list, SqmyRyExcel.class);
+	}
+
+}

+ 137 - 0
src/main/java/org/springblade/modules/sqmy/controller/ZatbInfoController.java

@@ -0,0 +1,137 @@
+package org.springblade.modules.sqmy.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.secure.utils.AuthUtil;
+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.sqmy.excel.ZatbInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.ZatbInfoVO;
+import org.springblade.modules.sqmy.service.IZatbInfoService;
+import org.springblade.modules.sqmy.wrapper.ZatbInfoWrapper;
+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-12
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zatbInfo")
+@Api(value = "季度治安通报", tags = "季度治安通报接口")
+public class ZatbInfoController extends BladeController {
+
+	private final IZatbInfoService zatbInfoService;
+
+	/**
+	 * 季度治安通报 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes  = "传入zatbInfo")
+	public R<ZatbInfoVO> detail(ZatbInfoEntity zatbInfo) {
+		ZatbInfoEntity detail = zatbInfoService.getOne(Condition.getQueryWrapper(zatbInfo));
+		return R.data(ZatbInfoWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 季度治安通报 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes  = "传入zatbInfo")
+	public R<IPage<ZatbInfoVO>> list(@RequestParam Map<String, Object> zatbInfo, Query query) {
+		IPage<ZatbInfoEntity> pages = zatbInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(zatbInfo, ZatbInfoEntity.class));
+		return R.data(ZatbInfoWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 季度治安通报 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes  = "传入zatbInfo")
+	public R<IPage<ZatbInfoVO>> page(@RequestParam Map<String, Object> params, Query query) {
+		params.put("deptId", AuthUtil.getDeptId());
+		IPage<ZatbInfoVO> pages = zatbInfoService.selectZatbInfoPage(Condition.getPage(query), params);
+		return R.data(pages);
+	}
+
+	/**
+	 * 季度治安通报 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes  = "传入zatbInfo")
+	public R save(@Valid @RequestBody ZatbInfoEntity zatbInfo) {
+		return R.status(zatbInfoService.save(zatbInfo));
+	}
+
+	/**
+	 * 季度治安通报 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes  = "传入zatbInfo")
+	public R update(@Valid @RequestBody ZatbInfoEntity zatbInfo) {
+		return R.status(zatbInfoService.updateById(zatbInfo));
+	}
+
+	/**
+	 * 季度治安通报 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes  = "传入zatbInfo")
+	public R submit(@Valid @RequestBody ZatbInfoEntity zatbInfo) {
+		return R.status(zatbInfoService.saveOrUpdate(zatbInfo));
+	}
+
+	/**
+	 * 季度治安通报 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes  = "传入ids")
+	public R remove(@RequestParam String ids) {
+		return R.status(zatbInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 导出数据
+	 */
+	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	@GetMapping("/export-zatbInfo")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "导出数据", notes  = "传入zatbInfo")
+	public void exportZatbInfo(@RequestParam Map<String, Object> zatbInfo, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<ZatbInfoEntity> queryWrapper = Condition.getQueryWrapper(zatbInfo, ZatbInfoEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(ZatbInfoEntity::getTenantId, bladeUser.getTenantId());
+		//}
+		//queryWrapper.lambda().eq(ZatbInfoEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<ZatbInfoExcel> list = zatbInfoService.exportZatbInfo(queryWrapper);
+		ExcelUtil.export(response, "季度治安通报数据" + DateUtil.time(), "季度治安通报数据表", list, ZatbInfoExcel.class);
+	}
+
+}

+ 44 - 0
src/main/java/org/springblade/modules/sqmy/excel/FzrhyInfoExcel.java

@@ -0,0 +1,44 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class FzrhyInfoExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 会议主题
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("会议主题")
+	private String hyzt;
+	/**
+	 * 会议内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("会议内容")
+	private String hynr;
+	/**
+	 * 附件
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("附件")
+	private String fj;
+
+}

+ 56 - 0
src/main/java/org/springblade/modules/sqmy/excel/JmhInfoExcel.java

@@ -0,0 +1,56 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class JmhInfoExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 会议主题
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("会议主题")
+	private String hyzt;
+	/**
+	 * 会议内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("会议内容")
+	private String hynr;
+	/**
+	 * 附件
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("附件")
+	private String fj;
+	/**
+	 * 所属社区编码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("所属社区编码")
+	private Long sssqBm;
+	/**
+	 * 参会人员(jmh_ry表id)
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("参会人员(jmh_ry表id)")
+	private Long ryId;
+
+}

+ 44 - 0
src/main/java/org/springblade/modules/sqmy/excel/JmhRyExcel.java

@@ -0,0 +1,44 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class JmhRyExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 姓名
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("姓名")
+	private String xm;
+	/**
+	 * 职务
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("职务")
+	private String zw;
+	/**
+	 * 联系电话
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("联系电话")
+	private String lxdh;
+
+}

+ 62 - 0
src/main/java/org/springblade/modules/sqmy/excel/SqmyInfoExcel.java

@@ -0,0 +1,62 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class SqmyInfoExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 线索类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("线索类型")
+	private String xslx;
+	/**
+	 * 发现时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现时间")
+	private String fxsj;
+	/**
+	 * 发现地点
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("发现地点")
+	private String fxdd;
+	/**
+	 * 线索内容
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("线索内容")
+	private String xsnr;
+	/**
+	 * 附件
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("附件")
+	private String fj;
+	/**
+	 * 线索提供人(sqmy_ry表id)
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("线索提供人(sqmy_ry表id)")
+	private Long ryId;
+
+}

+ 50 - 0
src/main/java/org/springblade/modules/sqmy/excel/SqmyRyExcel.java

@@ -0,0 +1,50 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class SqmyRyExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 姓名
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("姓名")
+	private String xm;
+	/**
+	 * 公民身份号码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("公民身份号码")
+	private String gmsfhm;
+	/**
+	 * 联系电话
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("联系电话")
+	private String lxdh;
+	/**
+	 * 现居住地详址
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("现居住地详址")
+	private String xjzdxz;
+
+}

+ 50 - 0
src/main/java/org/springblade/modules/sqmy/excel/ZatbInfoExcel.java

@@ -0,0 +1,50 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ZatbInfoExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 通报标题
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("通报标题")
+	private String tbbt;
+	/**
+	 * 报告情况
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("报告情况")
+	private String bgqk;
+	/**
+	 * 居民意见
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("居民意见")
+	private String jmyj;
+	/**
+	 * 附件
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("附件")
+	private String fj;
+
+}

+ 40 - 0
src/main/java/org/springblade/modules/sqmy/mapper/FzrhyInfoMapper.java

@@ -0,0 +1,40 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.FzrhyInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.FzrhyInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 每月安全负责人会议 Mapper 接口
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface FzrhyInfoMapper extends BaseMapper<FzrhyInfoEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page   分页参数
+	 * @param params 查询参数
+	 * @return List<FzrhyInfoVO>
+	 */
+	List<FzrhyInfoVO> selectFzrhyInfoPage(IPage page, @Param("params") Map<String, Object> params);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<FzrhyInfoExcel>
+	 */
+	List<FzrhyInfoExcel> exportFzrhyInfo(@Param("ew") Wrapper<FzrhyInfoEntity> queryWrapper);
+
+	List<FzrhyInfoEntity> getByList(@Param("params") Map<String, Object> params);
+}

+ 39 - 0
src/main/java/org/springblade/modules/sqmy/mapper/FzrhyInfoMapper.xml

@@ -0,0 +1,39 @@
+<?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.sqmy.mapper.FzrhyInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="fzrhyInfoResultMap" type="org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity">
+        <result column="hyzt" property="hyzt"/>
+        <result column="hynr" property="hynr"/>
+        <result column="fj" property="fj"/>
+    </resultMap>
+
+    <select id="selectFzrhyInfoPage" resultMap="fzrhyInfoResultMap">
+        SELECT
+            fi.*
+        FROM
+            sqmy.fzrhy_info fi
+        LEFT JOIN jdrh.blade_dept dept ON dept.id = fi.create_dept
+        WHERE
+            fi.is_deleted = 0
+        AND (#{params.deptId} LIKE '%' || dept.id || '%' OR dept.ancestors LIKE '%' || #{params.deptId} || '%')
+    </select>
+
+    <select id="exportFzrhyInfo" resultType="org.springblade.modules.sqmy.excel.FzrhyInfoExcel">
+        SELECT * FROM fzrhy_info ${ew.customSqlSegment}
+    </select>
+
+    <select id="getByList" resultType="org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity">
+        SELECT
+            fi.*
+        FROM
+            sqmy.fzrhy_info fi
+        LEFT JOIN jdrh.blade_dept dept ON dept.id = fi.create_dept
+        WHERE
+            fi.is_deleted = 0
+          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
+    </select>
+</mapper>

+ 40 - 0
src/main/java/org/springblade/modules/sqmy/mapper/JmhInfoMapper.java

@@ -0,0 +1,40 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.JmhInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.JmhInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 每周见面会 Mapper 接口
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface JmhInfoMapper extends BaseMapper<JmhInfoEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param params 查询参数
+	 * @return List<JmhInfoVO>
+	 */
+	List<JmhInfoVO> selectJmhInfoPage(IPage page, @Param("params") Map<String, Object> params);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<JmhInfoExcel>
+	 */
+	List<JmhInfoExcel> exportJmhInfo(@Param("ew") Wrapper<JmhInfoEntity> queryWrapper);
+
+    List<JmhInfoEntity> getBzJmhList(@Param("params") Map<String, Object> params);
+}

+ 53 - 0
src/main/java/org/springblade/modules/sqmy/mapper/JmhInfoMapper.xml

@@ -0,0 +1,53 @@
+<?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.sqmy.mapper.JmhInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="jmhInfoResultMap" type="org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity">
+        <result column="hyzt" property="hyzt"/>
+        <result column="hynr" property="hynr"/>
+        <result column="fj" property="fj"/>
+        <result column="sssq_bm" property="sssqBm"/>
+    </resultMap>
+
+    <select id="selectJmhInfoPage" resultType="org.springblade.modules.sqmy.pojo.vo.JmhInfoVO">
+        SELECT
+            ji.id,
+            ji.hyzt,
+            ji.hynr,
+            ji.create_time,
+            sq.dept_name AS sssqName,
+            STRING_AGG ( ry.xm, ', ' ) AS names
+        FROM
+            sqmy.jmh_info ji
+        LEFT JOIN jdrh.blade_dept sq ON sq.id = ji.sssq_bm
+        LEFT JOIN sqmy.jmh_ry ry ON ry.jmh_id = ji.id AND ry.is_deleted = 0
+        WHERE
+            ji.is_deleted = 0
+          AND (#{params.deptId} LIKE '%' || sq.id || '%' OR sq.ancestors LIKE '%' || #{params.deptId} || '%')
+        GROUP BY
+            ji.id,
+            ji.hyzt,
+            ji.hynr,
+            ji.create_time,
+            sq.dept_name
+        ORDER BY ji.create_time DESC
+    </select>
+
+    <select id="exportJmhInfo" resultType="org.springblade.modules.sqmy.excel.JmhInfoExcel">
+        SELECT * FROM jmh_info ${ew.customSqlSegment}
+    </select>
+
+    <select id="getBzJmhList" resultType="org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity">
+        SELECT
+            ji.*
+        FROM
+            sqmy.jmh_info ji
+        LEFT JOIN jdrh.blade_dept sq ON sq.id = ji.sssq_bm
+        WHERE
+            ji.is_deleted = 0
+          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
+    </select>
+</mapper>

+ 38 - 0
src/main/java/org/springblade/modules/sqmy/mapper/JmhRyMapper.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.JmhRyExcel;
+import org.springblade.modules.sqmy.pojo.entity.JmhRyEntity;
+import org.springblade.modules.sqmy.pojo.vo.JmhRyVO;
+
+import java.util.List;
+
+/**
+ * 每周见面会_参会人员 Mapper 接口
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface JmhRyMapper extends BaseMapper<JmhRyEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param jmhRy 查询参数
+	 * @return List<JmhRyVO>
+	 */
+	List<JmhRyVO> selectJmhRyPage(IPage page, JmhRyVO jmhRy);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<JmhRyExcel>
+	 */
+	List<JmhRyExcel> exportJmhRy(@Param("ew") Wrapper<JmhRyEntity> queryWrapper);
+
+}

+ 21 - 0
src/main/java/org/springblade/modules/sqmy/mapper/JmhRyMapper.xml

@@ -0,0 +1,21 @@
+<?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.sqmy.mapper.JmhRyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="jmhRyResultMap" type="org.springblade.modules.sqmy.pojo.entity.JmhRyEntity">
+        <result column="xm" property="xm"/>
+        <result column="zw" property="zw"/>
+        <result column="lxdh" property="lxdh"/>
+        <result column="jmh_id" property="jmhId"/>
+    </resultMap>
+
+    <select id="selectJmhRyPage" resultMap="jmhRyResultMap">
+        select * from jmh_ry where is_deleted = 0
+    </select>
+
+    <select id="exportJmhRy" resultType="org.springblade.modules.sqmy.excel.JmhRyExcel">
+        SELECT * FROM jmh_ry ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 40 - 0
src/main/java/org/springblade/modules/sqmy/mapper/SqmyInfoMapper.java

@@ -0,0 +1,40 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.SqmyInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.SqmyInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.SqmyInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 社情民意 Mapper 接口
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface SqmyInfoMapper extends BaseMapper<SqmyInfoEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param params 查询参数
+	 * @return List<SqmyInfoVO>
+	 */
+	List<SqmyInfoVO> selectSqmyInfoPage(IPage page, @Param("params") Map<String, Object> params);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<SqmyInfoExcel>
+	 */
+	List<SqmyInfoExcel> exportSqmyInfo(@Param("ew") Wrapper<SqmyInfoEntity> queryWrapper);
+
+	int countByType(@Param("type") int type, @Param("params") Map<String, Object> params);
+}

+ 48 - 0
src/main/java/org/springblade/modules/sqmy/mapper/SqmyInfoMapper.xml

@@ -0,0 +1,48 @@
+<?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.sqmy.mapper.SqmyInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="sqmyInfoResultMap" type="org.springblade.modules.sqmy.pojo.entity.SqmyInfoEntity">
+        <result column="xslx" property="xslx"/>
+        <result column="fxsj" property="fxsj"/>
+        <result column="fxdd" property="fxdd"/>
+        <result column="xsnr" property="xsnr"/>
+        <result column="fj" property="fj"/>
+    </resultMap>
+
+    <select id="selectSqmyInfoPage" resultType="org.springblade.modules.sqmy.pojo.vo.SqmyInfoVO">
+        SELECT
+            si.*
+        FROM
+            sqmy.sqmy_info si
+        LEFT JOIN jdrh.blade_dept dept ON dept.id = si.create_dept
+        WHERE
+            si.is_deleted = 0
+          AND (#{params.deptId} LIKE '%' || dept.id || '%' OR dept.ancestors LIKE '%' || #{params.deptId} || '%')
+    </select>
+
+    <select id="exportSqmyInfo" resultType="org.springblade.modules.sqmy.excel.SqmyInfoExcel">
+        SELECT * FROM sqmy_info ${ew.customSqlSegment}
+    </select>
+
+    <select id="countByType" resultType="int">
+        SELECT
+            count(*)
+        FROM
+            sqmy.sqmy_info si
+        LEFT JOIN jdrh.blade_dept dept ON dept.id = si.create_dept
+        WHERE
+            si.is_deleted = 0
+          AND (#{params.deptId} LIKE '%' || dept.id || '%' OR dept.ancestors LIKE '%' || #{params.deptId} || '%')
+        <if test="1 == type">
+            AND si.create_time BETWEEN DATE_TRUNC( 'year', CURRENT_DATE ) AND DATE_TRUNC( 'year', CURRENT_DATE ) + INTERVAL '1 year'
+        </if>
+        <if test="2 == type">
+            AND si.create_time BETWEEN DATE_TRUNC( 'quarter', CURRENT_DATE ) AND DATE_TRUNC( 'quarter', CURRENT_DATE ) + INTERVAL '3 months'
+        </if>
+        <if test="3 == type">
+            AND si.create_time :: DATE = CURRENT_DATE
+        </if>
+    </select>
+</mapper>

+ 38 - 0
src/main/java/org/springblade/modules/sqmy/mapper/SqmyRyMapper.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.SqmyRyExcel;
+import org.springblade.modules.sqmy.pojo.entity.SqmyRyEntity;
+import org.springblade.modules.sqmy.pojo.vo.SqmyRyVO;
+
+import java.util.List;
+
+/**
+ * 社情民意_线索提供人 Mapper 接口
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface SqmyRyMapper extends BaseMapper<SqmyRyEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param sqmyRy 查询参数
+	 * @return List<SqmyRyVO>
+	 */
+	List<SqmyRyVO> selectSqmyRyPage(IPage page, SqmyRyVO sqmyRy);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<SqmyRyExcel>
+	 */
+	List<SqmyRyExcel> exportSqmyRy(@Param("ew") Wrapper<SqmyRyEntity> queryWrapper);
+
+}

+ 22 - 0
src/main/java/org/springblade/modules/sqmy/mapper/SqmyRyMapper.xml

@@ -0,0 +1,22 @@
+<?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.sqmy.mapper.SqmyRyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="sqmyRyResultMap" type="org.springblade.modules.sqmy.pojo.entity.SqmyRyEntity">
+        <result column="xm" property="xm"/>
+        <result column="gmsfhm" property="gmsfhm"/>
+        <result column="lxdh" property="lxdh"/>
+        <result column="xjzdxz" property="xjzdxz"/>
+        <result column="sqmy_id" property="sqmyId"/>
+    </resultMap>
+
+    <select id="selectSqmyRyPage" resultMap="sqmyRyResultMap">
+        select * from sqmy_ry where is_deleted = 0
+    </select>
+
+    <select id="exportSqmyRy" resultType="org.springblade.modules.sqmy.excel.SqmyRyExcel">
+        SELECT * FROM sqmy_ry ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 40 - 0
src/main/java/org/springblade/modules/sqmy/mapper/ZatbInfoMapper.java

@@ -0,0 +1,40 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.ZatbInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.ZatbInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 季度治安通报 Mapper 接口
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface ZatbInfoMapper extends BaseMapper<ZatbInfoEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page     分页参数
+	 * @param params 查询参数
+	 * @return List<ZatbInfoVO>
+	 */
+	List<ZatbInfoVO> selectZatbInfoPage(IPage page, @Param("params") Map<String, Object> params);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<ZatbInfoExcel>
+	 */
+	List<ZatbInfoExcel> exportZatbInfo(@Param("ew") Wrapper<ZatbInfoEntity> queryWrapper);
+
+    List<ZatbInfoEntity> getBjdList(@Param("params") Map<String, Object> params);
+}

+ 41 - 0
src/main/java/org/springblade/modules/sqmy/mapper/ZatbInfoMapper.xml

@@ -0,0 +1,41 @@
+<?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.sqmy.mapper.ZatbInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="zatbInfoResultMap" type="org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity">
+        <result column="tbbt" property="tbbt"/>
+        <result column="bgqk" property="bgqk"/>
+        <result column="jmyj" property="jmyj"/>
+        <result column="fj" property="fj"/>
+    </resultMap>
+
+    <select id="selectZatbInfoPage" resultMap="zatbInfoResultMap">
+        SELECT
+            zi.*
+        FROM
+            sqmy.zatb_info zi
+        LEFT JOIN jdrh.blade_dept dept ON dept.id = zi.create_dept
+        WHERE
+            zi.is_deleted = 0
+        AND (#{params.deptId} LIKE '%' || dept.id || '%' OR dept.ancestors LIKE '%' || #{params.deptId} || '%')
+    </select>
+
+    <select id="exportZatbInfo" resultType="org.springblade.modules.sqmy.excel.ZatbInfoExcel">
+        SELECT * FROM zatb_info ${ew.customSqlSegment}
+    </select>
+
+    <select id="getBjdList" resultType="org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity">
+        SELECT
+            zi.*
+        FROM
+            sqmy.zatb_info zi
+        LEFT JOIN jdrh.blade_dept dept ON dept.id = zi.create_dept
+        WHERE
+            zi.is_deleted = 0
+          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
+    </select>
+
+</mapper>

+ 18 - 0
src/main/java/org/springblade/modules/sqmy/pojo/dto/FzrhyInfoDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.sqmy.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity;
+
+/**
+ * 每月安全负责人会议 数据传输对象实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FzrhyInfoDTO extends FzrhyInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+}

+ 18 - 0
src/main/java/org/springblade/modules/sqmy/pojo/dto/JmhInfoDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.sqmy.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity;
+
+/**
+ * 每周见面会 数据传输对象实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JmhInfoDTO extends JmhInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+}

+ 18 - 0
src/main/java/org/springblade/modules/sqmy/pojo/dto/JmhRyDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.sqmy.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.JmhRyEntity;
+
+/**
+ * 每周见面会_参会人员 数据传输对象实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JmhRyDTO extends JmhRyEntity {
+	private static final long serialVersionUID = 1L;
+
+}

+ 18 - 0
src/main/java/org/springblade/modules/sqmy/pojo/dto/SqmyInfoDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.sqmy.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.SqmyInfoEntity;
+
+/**
+ * 社情民意 数据传输对象实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SqmyInfoDTO extends SqmyInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+}

+ 18 - 0
src/main/java/org/springblade/modules/sqmy/pojo/dto/SqmyRyDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.sqmy.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.SqmyRyEntity;
+
+/**
+ * 社情民意_线索提供人 数据传输对象实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SqmyRyDTO extends SqmyRyEntity {
+	private static final long serialVersionUID = 1L;
+
+}

+ 18 - 0
src/main/java/org/springblade/modules/sqmy/pojo/dto/ZatbInfoDTO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.sqmy.pojo.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity;
+
+/**
+ * 季度治安通报 数据传输对象实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZatbInfoDTO extends ZatbInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+}

+ 38 - 0
src/main/java/org/springblade/modules/sqmy/pojo/entity/FzrhyInfoEntity.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@TableName("sqmy.fzrhy_info")
+@EqualsAndHashCode(callSuper = true)
+public class FzrhyInfoEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 会议主题
+	 */
+	@ApiModelProperty(value = "会议主题")
+	private String hyzt;
+	/**
+	 * 会议内容
+	 */
+	@ApiModelProperty(value = "会议内容")
+	private String hynr;
+	/**
+	 * 附件
+	 */
+	@ApiModelProperty(value = "附件")
+	private String fj;
+
+}

+ 43 - 0
src/main/java/org/springblade/modules/sqmy/pojo/entity/JmhInfoEntity.java

@@ -0,0 +1,43 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@TableName("sqmy.jmh_info")
+@EqualsAndHashCode(callSuper = true)
+public class JmhInfoEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 会议主题
+	 */
+	@ApiModelProperty(value = "会议主题")
+	private String hyzt;
+	/**
+	 * 会议内容
+	 */
+	@ApiModelProperty(value = "会议内容")
+	private String hynr;
+	/**
+	 * 附件
+	 */
+	@ApiModelProperty(value = "附件")
+	private String fj;
+	/**
+	 * 所属社区编码
+	 */
+	@ApiModelProperty(value = "所属社区编码")
+	private Long sssqBm;
+
+}

+ 42 - 0
src/main/java/org/springblade/modules/sqmy/pojo/entity/JmhRyEntity.java

@@ -0,0 +1,42 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@TableName("sqmy.jmh_ry")
+@EqualsAndHashCode(callSuper = true)
+public class JmhRyEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 姓名
+	 */
+	@ApiModelProperty(value = "姓名")
+	private String xm;
+	/**
+	 * 职务
+	 */
+	@ApiModelProperty(value = "职务")
+	private String zw;
+	/**
+	 * 联系电话
+	 */
+	@ApiModelProperty(value = "联系电话")
+	private String lxdh;
+	/**
+	 * jmh_info表id
+	 */
+	@ApiModelProperty(value = "jmh_info表id")
+	private Long jmhId;
+}

+ 48 - 0
src/main/java/org/springblade/modules/sqmy/pojo/entity/SqmyInfoEntity.java

@@ -0,0 +1,48 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@TableName("sqmy.sqmy_info")
+@EqualsAndHashCode(callSuper = true)
+public class SqmyInfoEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 线索类型
+	 */
+	@ApiModelProperty(value = "线索类型")
+	private String xslx;
+	/**
+	 * 发现时间
+	 */
+	@ApiModelProperty(value = "发现时间")
+	private String fxsj;
+	/**
+	 * 发现地点
+	 */
+	@ApiModelProperty(value = "发现地点")
+	private String fxdd;
+	/**
+	 * 线索内容
+	 */
+	@ApiModelProperty(value = "线索内容")
+	private String xsnr;
+	/**
+	 * 附件
+	 */
+	@ApiModelProperty(value = "附件")
+	private String fj;
+
+}

+ 48 - 0
src/main/java/org/springblade/modules/sqmy/pojo/entity/SqmyRyEntity.java

@@ -0,0 +1,48 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@TableName("sqmy.sqmy_ry")
+@EqualsAndHashCode(callSuper = true)
+public class SqmyRyEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 姓名
+	 */
+	@ApiModelProperty(value = "姓名")
+	private String xm;
+	/**
+	 * 公民身份号码
+	 */
+	@ApiModelProperty(value = "公民身份号码")
+	private String gmsfhm;
+	/**
+	 * 联系电话
+	 */
+	@ApiModelProperty(value = "联系电话")
+	private String lxdh;
+	/**
+	 * 现居住地详址
+	 */
+	@ApiModelProperty(value = "现居住地详址")
+	private String xjzdxz;
+	/**
+	 * sqmy_info表id
+	 */
+	@ApiModelProperty(value = "sqmy_info表id")
+	private Long sqmyId;
+
+}

+ 43 - 0
src/main/java/org/springblade/modules/sqmy/pojo/entity/ZatbInfoEntity.java

@@ -0,0 +1,43 @@
+package org.springblade.modules.sqmy.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-12
+ */
+@Data
+@TableName("sqmy.zatb_info")
+@EqualsAndHashCode(callSuper = true)
+public class ZatbInfoEntity extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 通报标题
+	 */
+	@ApiModelProperty(value = "通报标题")
+	private String tbbt;
+	/**
+	 * 报告情况
+	 */
+	@ApiModelProperty(value = "报告情况")
+	private String bgqk;
+	/**
+	 * 居民意见
+	 */
+	@ApiModelProperty(value = "居民意见")
+	private String jmyj;
+	/**
+	 * 附件
+	 */
+	@ApiModelProperty(value = "附件")
+	private String fj;
+
+}

+ 18 - 0
src/main/java/org/springblade/modules/sqmy/pojo/vo/FzrhyInfoVO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.sqmy.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity;
+
+/**
+ * 每月安全负责人会议 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FzrhyInfoVO extends FzrhyInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+}

+ 26 - 0
src/main/java/org/springblade/modules/sqmy/pojo/vo/JmhInfoVO.java

@@ -0,0 +1,26 @@
+package org.springblade.modules.sqmy.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity;
+import org.springblade.modules.sqmy.pojo.entity.JmhRyEntity;
+
+import java.util.List;
+
+/**
+ * 每周见面会 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JmhInfoVO extends JmhInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+	private String sssqName;
+
+	private String names;
+
+	private List<JmhRyEntity> ryList;
+}

+ 18 - 0
src/main/java/org/springblade/modules/sqmy/pojo/vo/JmhRyVO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.sqmy.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.JmhRyEntity;
+
+/**
+ * 每周见面会_参会人员 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JmhRyVO extends JmhRyEntity {
+	private static final long serialVersionUID = 1L;
+
+}

+ 22 - 0
src/main/java/org/springblade/modules/sqmy/pojo/vo/SqmyInfoVO.java

@@ -0,0 +1,22 @@
+package org.springblade.modules.sqmy.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.SqmyInfoEntity;
+import org.springblade.modules.sqmy.pojo.entity.SqmyRyEntity;
+
+import java.util.List;
+
+/**
+ * 社情民意 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SqmyInfoVO extends SqmyInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+	private List<SqmyRyEntity> ryList;
+}

+ 18 - 0
src/main/java/org/springblade/modules/sqmy/pojo/vo/SqmyRyVO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.sqmy.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.SqmyRyEntity;
+
+/**
+ * 社情民意_线索提供人 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SqmyRyVO extends SqmyRyEntity {
+	private static final long serialVersionUID = 1L;
+
+}

+ 39 - 0
src/main/java/org/springblade/modules/sqmy/pojo/vo/SqmyTjVO.java

@@ -0,0 +1,39 @@
+package org.springblade.modules.sqmy.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity;
+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;
+
+/**
+ * 社情民意统计 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SqmyTjVO extends SqmyInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+	// 本年度社情民意数量
+	private int ndSqmy;
+	// 本季度社情民意数量
+	private int jdSqmy;
+	// 本日社情民意数量
+	private int brSqmy;
+	// 本年度入户走访户数
+	private int ndRhzf;
+	// 本周入户走访户数
+	private int bzRhzf;
+	// 本周见面会情况
+	private List<JmhInfoEntity> jhmList;
+	// 本月安全负责人会议
+	private List<FzrhyInfoEntity> fzrhyList;
+	// 本季度治安通报情况
+	private List<ZatbInfoEntity> zatbList;
+}

+ 18 - 0
src/main/java/org/springblade/modules/sqmy/pojo/vo/ZatbInfoVO.java

@@ -0,0 +1,18 @@
+package org.springblade.modules.sqmy.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity;
+
+/**
+ * 季度治安通报 视图实体类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZatbInfoVO extends ZatbInfoEntity {
+	private static final long serialVersionUID = 1L;
+
+}

+ 38 - 0
src/main/java/org/springblade/modules/sqmy/service/IFzrhyInfoService.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.FzrhyInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.FzrhyInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 每月安全负责人会议 服务类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface IFzrhyInfoService extends BaseService<FzrhyInfoEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param params 查询参数
+	 * @return IPage<FzrhyInfoVO>
+	 */
+	IPage<FzrhyInfoVO> selectFzrhyInfoPage(IPage<FzrhyInfoVO> page, Map<String, Object> params);
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<FzrhyInfoExcel>
+	 */
+	List<FzrhyInfoExcel> exportFzrhyInfo(Wrapper<FzrhyInfoEntity> queryWrapper);
+
+    List<FzrhyInfoEntity> getByList(Map<String, Object> params);
+}

+ 38 - 0
src/main/java/org/springblade/modules/sqmy/service/IJmhInfoService.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.JmhInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.JmhInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 每周见面会 服务类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface IJmhInfoService extends BaseService<JmhInfoEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param params 查询参数
+	 * @return IPage<JmhInfoVO>
+	 */
+	IPage<JmhInfoVO> selectJmhInfoPage(IPage<JmhInfoVO> page, Map<String, Object> params);
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<JmhInfoExcel>
+	 */
+	List<JmhInfoExcel> exportJmhInfo(Wrapper<JmhInfoEntity> queryWrapper);
+
+    List<JmhInfoEntity> getBzJmhList(Map<String, Object> params);
+}

+ 36 - 0
src/main/java/org/springblade/modules/sqmy/service/IJmhRyService.java

@@ -0,0 +1,36 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.JmhRyExcel;
+import org.springblade.modules.sqmy.pojo.entity.JmhRyEntity;
+import org.springblade.modules.sqmy.pojo.vo.JmhRyVO;
+
+import java.util.List;
+
+/**
+ * 每周见面会_参会人员 服务类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface IJmhRyService extends BaseService<JmhRyEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param jmhRy 查询参数
+	 * @return IPage<JmhRyVO>
+	 */
+	IPage<JmhRyVO> selectJmhRyPage(IPage<JmhRyVO> page, JmhRyVO jmhRy);
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<JmhRyExcel>
+	 */
+	List<JmhRyExcel> exportJmhRy(Wrapper<JmhRyEntity> queryWrapper);
+
+}

+ 38 - 0
src/main/java/org/springblade/modules/sqmy/service/ISqmyInfoService.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.SqmyInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.SqmyInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.SqmyInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 社情民意 服务类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface ISqmyInfoService extends BaseService<SqmyInfoEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param params 查询参数
+	 * @return IPage<SqmyInfoVO>
+	 */
+	IPage<SqmyInfoVO> selectSqmyInfoPage(IPage<SqmyInfoVO> page, Map<String, Object> params);
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<SqmyInfoExcel>
+	 */
+	List<SqmyInfoExcel> exportSqmyInfo(Wrapper<SqmyInfoEntity> queryWrapper);
+
+	int countByType(int type, Map<String, Object> params);
+}

+ 36 - 0
src/main/java/org/springblade/modules/sqmy/service/ISqmyRyService.java

@@ -0,0 +1,36 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.SqmyRyExcel;
+import org.springblade.modules.sqmy.pojo.entity.SqmyRyEntity;
+import org.springblade.modules.sqmy.pojo.vo.SqmyRyVO;
+
+import java.util.List;
+
+/**
+ * 社情民意_线索提供人 服务类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface ISqmyRyService extends BaseService<SqmyRyEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param sqmyRy 查询参数
+	 * @return IPage<SqmyRyVO>
+	 */
+	IPage<SqmyRyVO> selectSqmyRyPage(IPage<SqmyRyVO> page, SqmyRyVO sqmyRy);
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<SqmyRyExcel>
+	 */
+	List<SqmyRyExcel> exportSqmyRy(Wrapper<SqmyRyEntity> queryWrapper);
+
+}

+ 38 - 0
src/main/java/org/springblade/modules/sqmy/service/IZatbInfoService.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.ZatbInfoExcel;
+import org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.ZatbInfoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 季度治安通报 服务类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public interface IZatbInfoService extends BaseService<ZatbInfoEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page 分页参数
+	 * @param params 查询参数
+	 * @return IPage<ZatbInfoVO>
+	 */
+	IPage<ZatbInfoVO> selectZatbInfoPage(IPage<ZatbInfoVO> page, Map<String, Object> params);
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper 查询条件
+	 * @return List<ZatbInfoExcel>
+	 */
+	List<ZatbInfoExcel> exportZatbInfo(Wrapper<ZatbInfoEntity> queryWrapper);
+
+    List<ZatbInfoEntity> getBjdList(Map<String, Object> params);
+}

+ 45 - 0
src/main/java/org/springblade/modules/sqmy/service/impl/FzrhyInfoServiceImpl.java

@@ -0,0 +1,45 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.FzrhyInfoExcel;
+import org.springblade.modules.sqmy.mapper.FzrhyInfoMapper;
+import org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity;
+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;
+
+/**
+ * 每月安全负责人会议 服务实现类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Service
+public class FzrhyInfoServiceImpl extends BaseServiceImpl<FzrhyInfoMapper, FzrhyInfoEntity> implements IFzrhyInfoService {
+
+	@Override
+	public IPage<FzrhyInfoVO> selectFzrhyInfoPage(IPage<FzrhyInfoVO> page, Map<String, Object> params) {
+		return page.setRecords(baseMapper.selectFzrhyInfoPage(page, params));
+	}
+
+	@Override
+	public List<FzrhyInfoExcel> exportFzrhyInfo(Wrapper<FzrhyInfoEntity> queryWrapper) {
+		List<FzrhyInfoExcel> fzrhyInfoList = baseMapper.exportFzrhyInfo(queryWrapper);
+		//fzrhyInfoList.forEach(fzrhyInfo -> {
+		//	fzrhyInfo.setTypeName(DictCache.getValue(DictEnum.YES_NO, FzrhyInfoEntity.getType()));
+		//});
+		return fzrhyInfoList;
+	}
+
+	@Override
+	public List<FzrhyInfoEntity> getByList(Map<String, Object> params) {
+		return baseMapper.getByList(params);
+	}
+
+}

+ 45 - 0
src/main/java/org/springblade/modules/sqmy/service/impl/JmhInfoServiceImpl.java

@@ -0,0 +1,45 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.JmhInfoExcel;
+import org.springblade.modules.sqmy.mapper.JmhInfoMapper;
+import org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity;
+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;
+
+/**
+ * 每周见面会 服务实现类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Service
+public class JmhInfoServiceImpl extends BaseServiceImpl<JmhInfoMapper, JmhInfoEntity> implements IJmhInfoService {
+
+	@Override
+	public IPage<JmhInfoVO> selectJmhInfoPage(IPage<JmhInfoVO> page, Map<String, Object> params) {
+		return page.setRecords(baseMapper.selectJmhInfoPage(page, params));
+	}
+
+	@Override
+	public List<JmhInfoExcel> exportJmhInfo(Wrapper<JmhInfoEntity> queryWrapper) {
+		List<JmhInfoExcel> jmhInfoList = baseMapper.exportJmhInfo(queryWrapper);
+		//jmhInfoList.forEach(jmhInfo -> {
+		//	jmhInfo.setTypeName(DictCache.getValue(DictEnum.YES_NO, JmhInfoEntity.getType()));
+		//});
+		return jmhInfoList;
+	}
+
+	@Override
+	public List<JmhInfoEntity> getBzJmhList(Map<String, Object> params) {
+		return baseMapper.getBzJmhList(params);
+	}
+
+}

+ 38 - 0
src/main/java/org/springblade/modules/sqmy/service/impl/JmhRyServiceImpl.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.JmhRyExcel;
+import org.springblade.modules.sqmy.mapper.JmhRyMapper;
+import org.springblade.modules.sqmy.pojo.entity.JmhRyEntity;
+import org.springblade.modules.sqmy.pojo.vo.JmhRyVO;
+import org.springblade.modules.sqmy.service.IJmhRyService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 每周见面会_参会人员 服务实现类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Service
+public class JmhRyServiceImpl extends BaseServiceImpl<JmhRyMapper, JmhRyEntity> implements IJmhRyService {
+
+	@Override
+	public IPage<JmhRyVO> selectJmhRyPage(IPage<JmhRyVO> page, JmhRyVO jmhRy) {
+		return page.setRecords(baseMapper.selectJmhRyPage(page, jmhRy));
+	}
+
+	@Override
+	public List<JmhRyExcel> exportJmhRy(Wrapper<JmhRyEntity> queryWrapper) {
+		List<JmhRyExcel> jmhRyList = baseMapper.exportJmhRy(queryWrapper);
+		//jmhRyList.forEach(jmhRy -> {
+		//	jmhRy.setTypeName(DictCache.getValue(DictEnum.YES_NO, JmhRyEntity.getType()));
+		//});
+		return jmhRyList;
+	}
+
+}

+ 44 - 0
src/main/java/org/springblade/modules/sqmy/service/impl/SqmyInfoServiceImpl.java

@@ -0,0 +1,44 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.SqmyInfoExcel;
+import org.springblade.modules.sqmy.mapper.SqmyInfoMapper;
+import org.springblade.modules.sqmy.pojo.entity.SqmyInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.SqmyInfoVO;
+import org.springblade.modules.sqmy.service.ISqmyInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 社情民意 服务实现类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Service
+public class SqmyInfoServiceImpl extends BaseServiceImpl<SqmyInfoMapper, SqmyInfoEntity> implements ISqmyInfoService {
+
+	@Override
+	public IPage<SqmyInfoVO> selectSqmyInfoPage(IPage<SqmyInfoVO> page, Map<String, Object> params) {
+		return page.setRecords(baseMapper.selectSqmyInfoPage(page, params));
+	}
+
+	@Override
+	public List<SqmyInfoExcel> exportSqmyInfo(Wrapper<SqmyInfoEntity> queryWrapper) {
+		List<SqmyInfoExcel> sqmyInfoList = baseMapper.exportSqmyInfo(queryWrapper);
+		//sqmyInfoList.forEach(sqmyInfo -> {
+		//	sqmyInfo.setTypeName(DictCache.getValue(DictEnum.YES_NO, SqmyInfoEntity.getType()));
+		//});
+		return sqmyInfoList;
+	}
+
+	@Override
+	public int countByType(int type, Map<String, Object> params) {
+		return baseMapper.countByType(type, params);
+	}
+
+}

+ 38 - 0
src/main/java/org/springblade/modules/sqmy/service/impl/SqmyRyServiceImpl.java

@@ -0,0 +1,38 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.SqmyRyExcel;
+import org.springblade.modules.sqmy.mapper.SqmyRyMapper;
+import org.springblade.modules.sqmy.pojo.entity.SqmyRyEntity;
+import org.springblade.modules.sqmy.pojo.vo.SqmyRyVO;
+import org.springblade.modules.sqmy.service.ISqmyRyService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 社情民意_线索提供人 服务实现类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Service
+public class SqmyRyServiceImpl extends BaseServiceImpl<SqmyRyMapper, SqmyRyEntity> implements ISqmyRyService {
+
+	@Override
+	public IPage<SqmyRyVO> selectSqmyRyPage(IPage<SqmyRyVO> page, SqmyRyVO sqmyRy) {
+		return page.setRecords(baseMapper.selectSqmyRyPage(page, sqmyRy));
+	}
+
+	@Override
+	public List<SqmyRyExcel> exportSqmyRy(Wrapper<SqmyRyEntity> queryWrapper) {
+		List<SqmyRyExcel> sqmyRyList = baseMapper.exportSqmyRy(queryWrapper);
+		//sqmyRyList.forEach(sqmyRy -> {
+		//	sqmyRy.setTypeName(DictCache.getValue(DictEnum.YES_NO, SqmyRyEntity.getType()));
+		//});
+		return sqmyRyList;
+	}
+
+}

+ 45 - 0
src/main/java/org/springblade/modules/sqmy/service/impl/ZatbInfoServiceImpl.java

@@ -0,0 +1,45 @@
+package org.springblade.modules.sqmy.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.sqmy.excel.ZatbInfoExcel;
+import org.springblade.modules.sqmy.mapper.ZatbInfoMapper;
+import org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.ZatbInfoVO;
+import org.springblade.modules.sqmy.service.IZatbInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 季度治安通报 服务实现类
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+@Service
+public class ZatbInfoServiceImpl extends BaseServiceImpl<ZatbInfoMapper, ZatbInfoEntity> implements IZatbInfoService {
+
+	@Override
+	public IPage<ZatbInfoVO> selectZatbInfoPage(IPage<ZatbInfoVO> page, Map<String, Object> params) {
+		return page.setRecords(baseMapper.selectZatbInfoPage(page, params));
+	}
+
+	@Override
+	public List<ZatbInfoExcel> exportZatbInfo(Wrapper<ZatbInfoEntity> queryWrapper) {
+		List<ZatbInfoExcel> zatbInfoList = baseMapper.exportZatbInfo(queryWrapper);
+		//zatbInfoList.forEach(zatbInfo -> {
+		//	zatbInfo.setTypeName(DictCache.getValue(DictEnum.YES_NO, ZatbInfoEntity.getType()));
+		//});
+		return zatbInfoList;
+	}
+
+	@Override
+	public List<ZatbInfoEntity> getBjdList(Map<String, Object> params) {
+		return baseMapper.getBjdList(params);
+	}
+
+}

+ 34 - 0
src/main/java/org/springblade/modules/sqmy/wrapper/FzrhyInfoWrapper.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.sqmy.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.sqmy.pojo.entity.FzrhyInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.FzrhyInfoVO;
+
+import java.util.Objects;
+
+/**
+ * 每月安全负责人会议 包装类,返回视图层所需的字段
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public class FzrhyInfoWrapper extends BaseEntityWrapper<FzrhyInfoEntity, FzrhyInfoVO>  {
+
+	public static FzrhyInfoWrapper build() {
+		return new FzrhyInfoWrapper();
+ 	}
+
+	@Override
+	public FzrhyInfoVO entityVO(FzrhyInfoEntity fzrhyInfo) {
+		FzrhyInfoVO fzrhyInfoVO = Objects.requireNonNull(BeanUtil.copyProperties(fzrhyInfo, FzrhyInfoVO.class));
+
+		//User createUser = UserCache.getUser(fzrhyInfo.getCreateUser());
+		//User updateUser = UserCache.getUser(fzrhyInfo.getUpdateUser());
+		//fzrhyInfoVO.setCreateUserName(createUser.getName());
+		//fzrhyInfoVO.setUpdateUserName(updateUser.getName());
+
+		return fzrhyInfoVO;
+	}
+
+}

+ 34 - 0
src/main/java/org/springblade/modules/sqmy/wrapper/JmhInfoWrapper.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.sqmy.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.sqmy.pojo.entity.JmhInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.JmhInfoVO;
+
+import java.util.Objects;
+
+/**
+ * 每周见面会 包装类,返回视图层所需的字段
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public class JmhInfoWrapper extends BaseEntityWrapper<JmhInfoEntity, JmhInfoVO>  {
+
+	public static JmhInfoWrapper build() {
+		return new JmhInfoWrapper();
+ 	}
+
+	@Override
+	public JmhInfoVO entityVO(JmhInfoEntity jmhInfo) {
+		JmhInfoVO jmhInfoVO = Objects.requireNonNull(BeanUtil.copyProperties(jmhInfo, JmhInfoVO.class));
+
+		//User createUser = UserCache.getUser(jmhInfo.getCreateUser());
+		//User updateUser = UserCache.getUser(jmhInfo.getUpdateUser());
+		//jmhInfoVO.setCreateUserName(createUser.getName());
+		//jmhInfoVO.setUpdateUserName(updateUser.getName());
+
+		return jmhInfoVO;
+	}
+
+}

+ 34 - 0
src/main/java/org/springblade/modules/sqmy/wrapper/JmhRyWrapper.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.sqmy.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.sqmy.pojo.entity.JmhRyEntity;
+import org.springblade.modules.sqmy.pojo.vo.JmhRyVO;
+
+import java.util.Objects;
+
+/**
+ * 每周见面会_参会人员 包装类,返回视图层所需的字段
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public class JmhRyWrapper extends BaseEntityWrapper<JmhRyEntity, JmhRyVO>  {
+
+	public static JmhRyWrapper build() {
+		return new JmhRyWrapper();
+ 	}
+
+	@Override
+	public JmhRyVO entityVO(JmhRyEntity jmhRy) {
+		JmhRyVO jmhRyVO = Objects.requireNonNull(BeanUtil.copyProperties(jmhRy, JmhRyVO.class));
+
+		//User createUser = UserCache.getUser(jmhRy.getCreateUser());
+		//User updateUser = UserCache.getUser(jmhRy.getUpdateUser());
+		//jmhRyVO.setCreateUserName(createUser.getName());
+		//jmhRyVO.setUpdateUserName(updateUser.getName());
+
+		return jmhRyVO;
+	}
+
+}

+ 34 - 0
src/main/java/org/springblade/modules/sqmy/wrapper/SqmyInfoWrapper.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.sqmy.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.sqmy.pojo.entity.SqmyInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.SqmyInfoVO;
+
+import java.util.Objects;
+
+/**
+ * 社情民意 包装类,返回视图层所需的字段
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public class SqmyInfoWrapper extends BaseEntityWrapper<SqmyInfoEntity, SqmyInfoVO>  {
+
+	public static SqmyInfoWrapper build() {
+		return new SqmyInfoWrapper();
+ 	}
+
+	@Override
+	public SqmyInfoVO entityVO(SqmyInfoEntity sqmyInfo) {
+		SqmyInfoVO sqmyInfoVO = Objects.requireNonNull(BeanUtil.copyProperties(sqmyInfo, SqmyInfoVO.class));
+
+		//User createUser = UserCache.getUser(sqmyInfo.getCreateUser());
+		//User updateUser = UserCache.getUser(sqmyInfo.getUpdateUser());
+		//sqmyInfoVO.setCreateUserName(createUser.getName());
+		//sqmyInfoVO.setUpdateUserName(updateUser.getName());
+
+		return sqmyInfoVO;
+	}
+
+}

+ 34 - 0
src/main/java/org/springblade/modules/sqmy/wrapper/SqmyRyWrapper.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.sqmy.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.sqmy.pojo.entity.SqmyRyEntity;
+import org.springblade.modules.sqmy.pojo.vo.SqmyRyVO;
+
+import java.util.Objects;
+
+/**
+ * 社情民意_线索提供人 包装类,返回视图层所需的字段
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public class SqmyRyWrapper extends BaseEntityWrapper<SqmyRyEntity, SqmyRyVO>  {
+
+	public static SqmyRyWrapper build() {
+		return new SqmyRyWrapper();
+ 	}
+
+	@Override
+	public SqmyRyVO entityVO(SqmyRyEntity sqmyRy) {
+		SqmyRyVO sqmyRyVO = Objects.requireNonNull(BeanUtil.copyProperties(sqmyRy, SqmyRyVO.class));
+
+		//User createUser = UserCache.getUser(sqmyRy.getCreateUser());
+		//User updateUser = UserCache.getUser(sqmyRy.getUpdateUser());
+		//sqmyRyVO.setCreateUserName(createUser.getName());
+		//sqmyRyVO.setUpdateUserName(updateUser.getName());
+
+		return sqmyRyVO;
+	}
+
+}

+ 34 - 0
src/main/java/org/springblade/modules/sqmy/wrapper/ZatbInfoWrapper.java

@@ -0,0 +1,34 @@
+package org.springblade.modules.sqmy.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.sqmy.pojo.entity.ZatbInfoEntity;
+import org.springblade.modules.sqmy.pojo.vo.ZatbInfoVO;
+
+import java.util.Objects;
+
+/**
+ * 季度治安通报 包装类,返回视图层所需的字段
+ *
+ * @author wth
+ * @since 2024-11-12
+ */
+public class ZatbInfoWrapper extends BaseEntityWrapper<ZatbInfoEntity, ZatbInfoVO>  {
+
+	public static ZatbInfoWrapper build() {
+		return new ZatbInfoWrapper();
+ 	}
+
+	@Override
+	public ZatbInfoVO entityVO(ZatbInfoEntity zatbInfo) {
+		ZatbInfoVO zatbInfoVO = Objects.requireNonNull(BeanUtil.copyProperties(zatbInfo, ZatbInfoVO.class));
+
+		//User createUser = UserCache.getUser(zatbInfo.getCreateUser());
+		//User updateUser = UserCache.getUser(zatbInfo.getUpdateUser());
+		//zatbInfoVO.setCreateUserName(createUser.getName());
+		//zatbInfoVO.setUpdateUserName(updateUser.getName());
+
+		return zatbInfoVO;
+	}
+
+}