+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 网格风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Data
+public class GridStyleDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 网格风采主键
+ */
+ private String id;
+
+ /**
+ * 标题
+ */
+ private String title;
+
+ /**
+ * 内容
+ */
+ private String content;
+
+ /**
+ * 图片
+ */
+ private String headerPhoto;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 时间
+ */
+ private Date date;
+
+ private String[] allDeptIds;
+
+ private Long deptId;
+
+ private String parentDeptNames;
+
+ private String allDeptNames;
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/VoluntaryStyleDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/VoluntaryStyleDTO.java
new file mode 100755
index 000000000..3dbed456d
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/VoluntaryStyleDTO.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 志愿风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Data
+public class VoluntaryStyleDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 志愿风采主键
+ */
+ private String id;
+
+ /**
+ * 标题
+ */
+ private String title;
+
+ /**
+ * 内容
+ */
+ private String content;
+
+ /**
+ * 图片
+ */
+ private String headerPhoto;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 时间
+ */
+ private Date date;
+
+ private String[] allDeptIds;
+
+ private Long deptId;
+
+ private String parentDeptNames;
+
+ private String allDeptNames;
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/GridStyleController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/GridStyleController.java
new file mode 100755
index 000000000..9de0111c6
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/GridStyleController.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.GridStyleDTO;
+import com.elink.esua.epdc.excel.GridStyleExcel;
+import com.elink.esua.epdc.service.GridStyleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 网格风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@RestController
+@RequestMapping("gridstyle")
+public class GridStyleController {
+
+ @Autowired
+ private GridStyleService gridStyleService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params) {
+ PageData page = gridStyleService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id) {
+ GridStyleDTO data = gridStyleService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody GridStyleDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ gridStyleService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody GridStyleDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ gridStyleService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ gridStyleService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = gridStyleService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, GridStyleExcel.class);
+ }
+
+
+ @PostMapping("getListByDeptId")
+ public Result> getListByDeptId(@RequestBody GridStyleDTO dto) {
+ return new Result>().ok(gridStyleService.getListByDeptId(dto.getDeptId()));
+ }
+
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/VoluntaryStyleController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/VoluntaryStyleController.java
new file mode 100755
index 000000000..4f160bb20
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/VoluntaryStyleController.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.VoluntaryStyleDTO;
+import com.elink.esua.epdc.excel.VoluntaryStyleExcel;
+import com.elink.esua.epdc.service.VoluntaryStyleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 志愿风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@RestController
+@RequestMapping("voluntarystyle")
+public class VoluntaryStyleController {
+
+ @Autowired
+ private VoluntaryStyleService voluntaryStyleService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params) {
+ PageData page = voluntaryStyleService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id) {
+ VoluntaryStyleDTO data = voluntaryStyleService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody VoluntaryStyleDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ voluntaryStyleService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody VoluntaryStyleDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ voluntaryStyleService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ voluntaryStyleService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = voluntaryStyleService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, VoluntaryStyleExcel.class);
+ }
+
+ @PostMapping("getListByDeptId")
+ public Result> getListByDeptId(@RequestBody VoluntaryStyleDTO dto) {
+ return new Result>().ok(voluntaryStyleService.getListByDeptId(dto.getDeptId()));
+ }
+
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/GridStyleDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/GridStyleDao.java
new file mode 100755
index 000000000..5c84d4025
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/GridStyleDao.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.entity.GridStyleEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 网格风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Mapper
+public interface GridStyleDao extends BaseDao {
+
+ List getListByDeptId(@Param("deptId") Long deptId);
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/VoluntaryStyleDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/VoluntaryStyleDao.java
new file mode 100755
index 000000000..c85ff1744
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/VoluntaryStyleDao.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.entity.VoluntaryStyleEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 志愿风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Mapper
+public interface VoluntaryStyleDao extends BaseDao {
+
+ List getListByDeptId(@Param("deptId") Long deptId);
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/GridStyleEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/GridStyleEntity.java
new file mode 100755
index 000000000..b25cae505
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/GridStyleEntity.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 网格风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("grid_style")
+public class GridStyleEntity extends DeptScope {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 标题
+ */
+ private String title;
+
+ /**
+ * 内容
+ */
+ private String content;
+
+ /**
+ * 图片
+ */
+ private String headerPhoto;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 时间
+ */
+ private Date date;
+
+ private String deptId;
+
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/VoluntaryStyleEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/VoluntaryStyleEntity.java
new file mode 100755
index 000000000..236fc3510
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/VoluntaryStyleEntity.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.elink.esua.epdc.commons.mybatis.entity.DeptScope;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 志愿风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("voluntary_style")
+public class VoluntaryStyleEntity extends DeptScope {
+
+
+ private static final long serialVersionUID = 2742920848306891141L;
+
+ /**
+ * 标题
+ */
+ private String title;
+
+ /**
+ * 内容
+ */
+ private String content;
+
+ /**
+ * 图片
+ */
+ private String headerPhoto;
+
+ /**
+ * 地址
+ */
+ private String address;
+
+ /**
+ * 时间
+ */
+ private Date date;
+
+ private String deptId;
+
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/GridStyleExcel.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/GridStyleExcel.java
new file mode 100755
index 000000000..5f3b41eb6
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/GridStyleExcel.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 网格风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Data
+public class GridStyleExcel {
+
+ @Excel(name = "网格风采主键")
+ private String id;
+
+ @Excel(name = "标题")
+ private String title;
+
+ @Excel(name = "内容")
+ private String content;
+
+ @Excel(name = "图片")
+ private String headerPhoto;
+
+ @Excel(name = "地址")
+ private String address;
+
+ @Excel(name = "时间")
+ private Date date;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/VoluntaryStyleExcel.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/VoluntaryStyleExcel.java
new file mode 100755
index 000000000..e7d07630d
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/excel/VoluntaryStyleExcel.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 志愿风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Data
+public class VoluntaryStyleExcel {
+
+ @Excel(name = "志愿风采主键")
+ private String id;
+
+ @Excel(name = "标题")
+ private String title;
+
+ @Excel(name = "内容")
+ private String content;
+
+ @Excel(name = "图片")
+ private String headerPhoto;
+
+ @Excel(name = "地址")
+ private String address;
+
+ @Excel(name = "时间")
+ private Date date;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/GridStyleRedis.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/GridStyleRedis.java
new file mode 100755
index 000000000..013675e3c
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/GridStyleRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 网格风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Component
+public class GridStyleRedis {
+ @Autowired
+ private RedisUtils redisUtils;
+
+ public void delete(Object[] ids) {
+
+ }
+
+ public void set(){
+
+ }
+
+ public String get(String id){
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/VoluntaryStyleRedis.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/VoluntaryStyleRedis.java
new file mode 100755
index 000000000..7007bef19
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/redis/VoluntaryStyleRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 志愿风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Component
+public class VoluntaryStyleRedis {
+ @Autowired
+ private RedisUtils redisUtils;
+
+ public void delete(Object[] ids) {
+
+ }
+
+ public void set(){
+
+ }
+
+ public String get(String id){
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GridStyleService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GridStyleService.java
new file mode 100755
index 000000000..d093dc0d1
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GridStyleService.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.dao.VoluntaryStyleDao;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.VoluntaryStyleDTO;
+import com.elink.esua.epdc.entity.VoluntaryStyleEntity;
+import com.elink.esua.epdc.service.SysDeptService;
+import com.elink.esua.epdc.service.VoluntaryStyleService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 志愿风采
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2023-07-17
+ */
+@Service
+public class VoluntaryStyleServiceImpl extends BaseServiceImpl implements VoluntaryStyleService {
+
+ @Resource
+ private SysDeptService deptService;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, VoluntaryStyleDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, VoluntaryStyleDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params) {
+ String id = (String) params.get(FieldConstant.ID_HUMP);
+ String title = (String) params.get("title");
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+ wrapper.like(StringUtils.isNotBlank(title), "TITLE", title);
+ return wrapper;
+ }
+
+ @Override
+ public VoluntaryStyleDTO get(String id) {
+ VoluntaryStyleEntity entity = baseDao.selectById(id);
+ VoluntaryStyleDTO dto = ConvertUtils.sourceToTarget(entity, VoluntaryStyleDTO.class);
+ if (null != entity.getAllDeptIds()) {
+ dto.setAllDeptIds(entity.getAllDeptIds().split(","));
+ dto.setDeptId(Long.valueOf(entity.getDeptId()));
+ }
+ return dto;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(VoluntaryStyleDTO dto) {
+ if (dto.getAllDeptIds().length == 0) {
+ setDeptId(dto);
+ }
+ VoluntaryStyleEntity entity = ConvertUtils.sourceToTarget(dto, VoluntaryStyleEntity.class);
+ biuldDept(dto, entity);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(VoluntaryStyleDTO dto) {
+ VoluntaryStyleEntity entity = ConvertUtils.sourceToTarget(dto, VoluntaryStyleEntity.class);
+ biuldDept(dto, entity);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ @Override
+ public List getListByDeptId(Long deptId) {
+ if (null != deptId) {
+ List entities = baseDao.getListByDeptId(deptId);
+ return ConvertUtils.sourceToTarget(entities, VoluntaryStyleDTO.class);
+ } else
+ return new ArrayList<>();
+
+ }
+
+ private void setDeptId(VoluntaryStyleDTO dto) {
+ UserDetail user = SecurityUser.getUser();
+ String deptId = String.valueOf(user.getDeptId());
+ dto.setDeptId(user.getDeptId());
+ dto.setAllDeptIds(new String[]{deptId});
+ }
+
+ private void biuldDept(VoluntaryStyleDTO dto, VoluntaryStyleEntity entity) {
+ ParentAndAllDeptDTO parentResult;
+ String deptId = "";
+ if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
+ deptId = dto.getAllDeptIds()[dto.getAllDeptIds().length - 1];
+ entity.setDeptId(deptId);
+ parentResult = deptService.getParentAndAllDept(deptId);
+ } else {
+ parentResult = deptService.getParentAndAllDept(deptId);
+ }
+ if (null == parentResult) {
+ throw new RenException("获取部门信息失败");
+ } else {
+ entity.setAllDeptIds(parentResult.getAllDeptIds());
+ entity.setAllDeptNames(parentResult.getAllDeptNames());
+ entity.setParentDeptIds(parentResult.getParentDeptIds());
+ entity.setParentDeptNames(parentResult.getParentDeptNames());
+ }
+ }
+
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GridStyleDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GridStyleDao.xml
new file mode 100755
index 000000000..5888d7950
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/GridStyleDao.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
index 5300687b3..8d0be6575 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
@@ -484,7 +484,7 @@
pid,
sort
FROM `sys_dept`
- where type_key in ('district_party','street_party','community_party','grid_party')
+ where type_key in ('district_party','street_party','community_party','grid_party','grid_micro')
and del_flag='0'
order by sort asc
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/VoluntaryStyleDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/VoluntaryStyleDao.xml
new file mode 100755
index 000000000..e472539d9
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/VoluntaryStyleDao.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java
index 006e25fb6..ece0ade61 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java
@@ -10,6 +10,7 @@ import com.elink.esua.epdc.service.AdminService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.websocket.server.PathParam;
import java.util.List;
/**
@@ -126,4 +127,23 @@ public class ApiAdminController {
return adminService.listSimpleDictInfo(dictType);
}
+ /**
+ * 网格风采
+ * @param deptId
+ * @return
+ */
+ @GetMapping("sys/gridstyle/getListByDeptId")
+ public Result> getGridStyleListByDeptId(@PathParam("deptId") String deptId) {
+ return adminService.getGridStyleListByDeptId(deptId);
+ }
+
+ /**
+ * 志愿风采
+ * @param deptId
+ * @return
+ */
+ @GetMapping("sys/voluntarystyle/getListByDeptId")
+ public Result> getVoluntarystyleListByDeptId(@PathParam("deptId") String deptId) {
+ return adminService.getVoluntarystyleListByDeptId(deptId);
+ }
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
index d6d951ff9..d12d3761d 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
@@ -27,7 +27,7 @@ import java.util.List;
* @date 2019/9/7 9:27
*/
//@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class, url = "http://127.0.0.1:9092")
- @FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
public interface AdminFeignClient {
/**
@@ -211,4 +211,9 @@ public interface AdminFeignClient {
@GetMapping("sys/appsys/listSimple/{dictType}")
Result> listSimpleDictInfo(@PathVariable("dictType") String dictType);
+ @PostMapping("sys/gridstyle/getListByDeptId")
+ Result> getGridStyleListByDeptId(GridStyleDTO dto);
+
+ @PostMapping("sys/voluntarystyle/getListByDeptId")
+ Result> getVoluntarystyleListByDeptId(VoluntaryStyleDTO dto);
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
index 927db1268..4020eb1de 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
@@ -27,6 +27,7 @@ public class AdminFeignClientFallback implements AdminFeignClient {
public Result getCompleteDept(Long gridId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getCompleteDept", gridId);
}
+
@Override
public Result getParentAndAllDept(Long deptId) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
@@ -64,27 +65,27 @@ public class AdminFeignClientFallback implements AdminFeignClient {
@Override
public Result updateAvatar(String avatar) {
- return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "updateAvatar",avatar);
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "updateAvatar", avatar);
}
@Override
public Result modifyPwd(ModifyPwdDTO dto) {
- return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "modifyPwd",dto);
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "modifyPwd", dto);
}
@Override
public Result getDeptTypeKey(Long deptId) {
- return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId);
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey", deptId);
}
@Override
public Result userRelationWorkAndAnalyOpenId(SendMessageFormDTO formDto) {
- return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "userRelationWorkAndAnalyOpenId",formDto);
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "userRelationWorkAndAnalyOpenId", formDto);
}
@Override
public Result getAppMenu(AppUserIdMenuDTO dto) {
- return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAppMenu",dto);
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAppMenu", dto);
}
@Override
@@ -104,16 +105,26 @@ public class AdminFeignClientFallback implements AdminFeignClient {
@Override
public Result getDeptIdByItude(DeptItudeFormDTO dto) {
- return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptIdByItude",dto);
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptIdByItude", dto);
}
@Override
public Result getGridByCoordinate(GisFormDTO formDTO) {
- return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getGridByCoordinate",formDTO);
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getGridByCoordinate", formDTO);
}
@Override
public Result> listSimpleDictInfo(@PathVariable("dictType") String dictType) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listSimpleDictInfo", dictType);
}
+
+ @Override
+ public Result> getGridStyleListByDeptId(GridStyleDTO dto) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getGridStyleListByDeptId", dto);
+ }
+
+ @Override
+ public Result> getVoluntarystyleListByDeptId(VoluntaryStyleDTO dto) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getVoluntarystyleListByDeptId", dto);
+ }
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
index 59260e759..0e8e47dda 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
@@ -92,4 +92,18 @@ public interface AdminService {
Result> listSimpleDictInfo(String dictType);
Result getDeptTree();
+
+ /**
+ * 根据部门ID获取网格风采
+ * @param deptId
+ * @return
+ */
+ Result> getGridStyleListByDeptId(String deptId);
+
+ /**
+ * 根据部门ID获取志愿风采
+ * @param deptId
+ * @return
+ */
+ Result> getVoluntarystyleListByDeptId(String deptId);
}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
index d09b528c4..9d3c8ff2c 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
@@ -39,6 +39,7 @@ public class AdminServiceImpl implements AdminService {
.concat(completeDept.getGrid());
return new Result().ok(deptName);
}
+
@Override
public Result getComplete(Long gridId) {
Result adminResult = adminFeignClient.getCompleteDept(gridId);
@@ -55,7 +56,7 @@ public class AdminServiceImpl implements AdminService {
@Override
public Result getAreaInfo(CityAreaFormDTO formDto) {
- log.info("formDto:"+formDto);
+ log.info("formDto:" + formDto);
return adminFeignClient.getAreaInfo(formDto);
}
@@ -69,6 +70,26 @@ public class AdminServiceImpl implements AdminService {
return adminFeignClient.getDeptTree();
}
+ @Override
+ public Result> getGridStyleListByDeptId(String deptId) {
+ if (null != deptId) {
+ GridStyleDTO dto = new GridStyleDTO();
+ dto.setDeptId(Long.valueOf(deptId));
+ return adminFeignClient.getGridStyleListByDeptId(dto);
+ } else
+ return new Result<>();
+ }
+
+ @Override
+ public Result> getVoluntarystyleListByDeptId(String deptId) {
+ if (null != deptId) {
+ VoluntaryStyleDTO dto = new VoluntaryStyleDTO();
+ dto.setDeptId(Long.valueOf(deptId));
+ return adminFeignClient.getVoluntarystyleListByDeptId(dto);
+ } else
+ return new Result<>();
+ }
+
@Override
public Result getDeptIdByItude(DeptItudeFormDTO dto) {
return adminFeignClient.getDeptIdByItude(dto);
diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml
index 9df1fd12b..1465f5684 100644
--- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml
+++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml
@@ -47,7 +47,7 @@
left join epdc_check_code st on ecr.SUGGESTION=st.`CODE`
where ecr.DEL_FLAG=0
- and ecr.name like '%${name}%'
+ and ecr.name like CONCAT('%', #{name}, '%')
and ecr.CATEGORY = #{category}
@@ -56,16 +56,16 @@
- and ecr.CONTENT like '%${content}%'
+ and ecr.CONTENT like CONCAT('%', #{content}, '%')
- and mo.DESCRIPTION like '%${module}%'
+ and mo.DESCRIPTION like CONCAT('%', #{module}, '%')
and ecr.SYSTEM = #{systemStatus}
- and ecr.mobile like '%${mobile}%'
+ and ecr.mobile like CONCAT('%', #{namobileme}, '%')
and ecr.SUGGESTION = #{suggestion}
diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml
index 68b174aed..a621c4feb 100644
--- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml
+++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml
@@ -43,7 +43,7 @@
left join epdc_check_code la on evr.LABEL=la.`CODE`
where evr.DEL_FLAG=0
- and evr.name like '%${name}%'
+ and evr.name like CONCAT('%', #{name}, '%')
and evr.CATEGORY = #{category}
@@ -52,13 +52,13 @@
and evr.DECISION = #{decision}
- and evr.CONTENT like '%${content}%'
+ and evr.CONTENT like CONCAT('%', #{content}, '%')
- and mo.DESCRIPTION like '%${module}%'
+ and mo.DESCRIPTION like CONCAT('%', #{module}, '%')
- and evr.mobile like '%${mobile}%'
+ and evr.mobile like CONCAT('%', #{mobile}, '%')
AND DATE_FORMAT( evr.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java
index 39e128bbb..90fd4737c 100755
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/GridForceInfoDTO.java
@@ -21,7 +21,6 @@ import lombok.Data;
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
/**
@@ -151,6 +150,6 @@ public class GridForceInfoDTO implements Serializable {
/**
* 新增是，选择所属网格，多选
*/
- private List selectedDeptIds;
+ private String[] selectedDeptIds;
}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java
index 92ff5b957..cffead36d 100755
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridForceInfoServiceImpl.java
@@ -84,7 +84,12 @@ public class GridForceInfoServiceImpl extends BaseServiceImpl
+
+ AND DEPT_ID = #{deptId}
+
ORDER BY
SORT ASC,
CREATED_TIME DESC
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index d07da41f7..05cf7dc6f 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -729,7 +729,7 @@
AND item.PEOPLE_FLAG = #{peopleFlag}
- and item.SERIAL_NUM like '%${serialNum}%'
+ and item.SERIAL_NUM like CONCAT('%', #{serialNum}, '%')
AND item.ITEM_STATE = #{itemState}
@@ -2095,7 +2095,7 @@
AND t1.MOBILE like concat('%', #{mobile}, '%')
- and t1.SERIAL_NUM like '%${serialNum}%'
+ and t1.SERIAL_NUM like CONCAT('%', #{serialNum}, '%')
and t1.APPEAL_SOURCE = #{appealSource}
@@ -2250,10 +2250,10 @@
and i.NICK_NAME = #{nickName}
- and i.ITEM_CONTENT like '%${itemContent}%'
+ and i.ITEM_CONTENT like CONCAT('%', #{itemContent}, '%')
- and i.SERIAL_NUM like '%${serialNum}%'
+ and i.SERIAL_NUM like CONCAT('%', #{serialNum}, '%')
and i.EVALUATION_SCORE = #{evaluationScore}
@@ -2369,10 +2369,10 @@
and i.NICK_NAME = #{nickName}
- and i.ITEM_CONTENT like '%${itemContent}%'
+ and i.ITEM_CONTENT like CONCAT('%', #{itemContent}, '%')
- and i.SERIAL_NUM like '%${serialNum}%'
+ and i.SERIAL_NUM like CONCAT('%', #{serialNum}, '%')
and i.EVALUATION_SCORE = #{evaluationScore}
@@ -2498,7 +2498,7 @@
AND item.MOBILE like concat('%', #{mobile}, '%')
- and item.SERIAL_NUM like '%${serialNum}%'
+ and item.SERIAL_NUM like CONCAT('%', #{serialNum}, '%')
ORDER BY
item.CREATED_TIME DESC,
@@ -2529,10 +2529,10 @@
and process.STATE=11
and process.CLOSE_CHECK_ID=#{deptId}
- and i.ITEM_CONTENT like '%${itemContent}%'
+ and i.ITEM_CONTENT like CONCAT('%', #{itemContent}, '%')
- and i.NICK_NAME like '%${userName}%'
+ and i.NICK_NAME like CONCAT('%', #{userName}, '%')
AND DATE_FORMAT( i.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
@@ -2736,16 +2736,16 @@
AND i.item_state = '10'
- and i.serial_num like '%${serialNum}%'
+ and i.serial_num like CONCAT('%', #{serialNum}, '%')
- and i.item_content like '%${itemContent}%'
+ and i.item_content like CONCAT('%', #{itemContent}, '%')
and i.mobile = #{mobile}
- and i.nick_name like '%${nickName}%'
+ and i.nick_name like CONCAT('%', #{nickName}, '%')
AND i.all_dept_ids LIKE concat('%', trim(#{deptId}), '%')
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java
index ecb412b1e..8bbc4ed86 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ReportPartyController.java
@@ -18,6 +18,7 @@
package com.elink.esua.epdc.party.controller;
import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -29,6 +30,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.party.excel.ReportPartyExcel;
import com.elink.esua.epdc.party.service.ReportPartyService;
import com.elink.esua.epdc.user.dto.party.ReportPartyDTO;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -67,6 +69,12 @@ public class ReportPartyController {
public Result save(@RequestBody ReportPartyDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ if (StringUtils.isNotEmpty(dto.getIdCard()) && StringUtils.isNotEmpty(dto.getName())) {
+ int sum = reportPartyService.findByIdCardAndName(dto.getIdCard(),dto.getName());
+ if(sum == 1){
+ throw new RenException("您已经报到，请等待审核！");
+ }
+ }
reportPartyService.save(dto);
return new Result();
}
@@ -75,6 +83,12 @@ public class ReportPartyController {
public Result update(@RequestBody ReportPartyDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ if (StringUtils.isNotEmpty(dto.getIdCard()) && StringUtils.isNotEmpty(dto.getName())) {
+ int sum = reportPartyService.findByIdCardAndName(dto.getIdCard(),dto.getName());
+ if(sum == 1){
+ throw new RenException("您已经报到，请等待审核！");
+ }
+ }
reportPartyService.update(dto);
return new Result();
}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/ReportPartyDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/ReportPartyDao.java
index c4a952fa3..3d812a4f6 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/ReportPartyDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/dao/ReportPartyDao.java
@@ -20,6 +20,7 @@ package com.elink.esua.epdc.party.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.party.entity.ReportPartyEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* 党员报道
@@ -30,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ReportPartyDao extends BaseDao {
+ int findByIdCardAndName(@Param("idCard") String idCard, @Param("name") String name);
}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/ReportPartyService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/ReportPartyService.java
index 97b920d7a..521cb8139 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/ReportPartyService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/ReportPartyService.java
@@ -92,4 +92,6 @@ public interface ReportPartyService extends BaseService {
* @date 2023-06-30
*/
void delete(String[] ids);
+
+ int findByIdCardAndName(String idCard, String name);
}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
index 0d48c6df9..f90fd14a1 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
@@ -170,6 +170,11 @@ public class ReportPartyServiceImpl extends BaseServiceImpl
+