+ * 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.controller;
+
+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.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.StreetPersionGoalMonthDTO;
+import com.elink.esua.epdc.excel.StreetPersionGoalMonthExcel;
+import com.elink.esua.epdc.service.StreetPersionGoalMonthService;
+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 zhangyong
+ * @since v1.0.0 2020-04-22
+ */
+@RestController
+@RequestMapping("streetpersiongoalmonth")
+public class StreetPersionGoalMonthController {
+
+ @Autowired
+ private StreetPersionGoalMonthService streetPersionGoalMonthService;
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ StreetPersionGoalMonthDTO data = streetPersionGoalMonthService.get(id);
+ return new Result().ok(data);
+ }
+
+ /**
+ * @Description: 新增功能：根据街道人员底数 * 目标比例 = 保存所有街道某个月的群众目标数、党员目标数、企业目标数
+ * @Description: 需要判断 所选月份，目标数是否存在，存在返回错误提示信息。
+ * @Param: [dto]
+ * @return: com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author: zy
+ * @Date: 2020-04-26
+ */
+ @PostMapping
+ public Result save(@RequestBody StreetPersionGoalMonthDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ return streetPersionGoalMonthService.save(dto);
+ }
+
+ @PutMapping
+ public Result update(@RequestBody StreetPersionGoalMonthDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ streetPersionGoalMonthService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ streetPersionGoalMonthService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = streetPersionGoalMonthService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, StreetPersionGoalMonthExcel.class);
+ }
+
+ /**
+ * @Description: 获取街道目标表的 街道名称
+ * @Param: []
+ * @return: java.util.List
+ * @Author: zy
+ * @Date: 2020-04-22
+ */
+ @GetMapping("queryStreetGoalName")
+ public Result> queryStreetGoalName(){
+ List streetName = streetPersionGoalMonthService.lisStreetGoalName();
+ return new Result>().ok(streetName);
+ }
+
+ /**
+ * @Description: 获取街道每月的目标数
+ * @Param: [params]
+ * @return: com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author: zy
+ * @Date: 2020-04-24
+ */
+ @GetMapping("streetGoalScore")
+ public Result>> streetGoalScore(@RequestParam Map params){
+ List> page = streetPersionGoalMonthService.listStreetGoalScore();
+ return new Result>>().ok(page);
+ }
+
+ /**
+ * @Description: 修改街道某个目标数,根据日期和街道ID
+ * @Param: [dto]
+ * @return: com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author: zy
+ * @Date: 2020-04-26
+ */
+ @PostMapping("updateStreetGoalScore")
+ public Result updateStreetGoalScore(@RequestBody StreetPersionGoalMonthDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ streetPersionGoalMonthService.modifyStreetGoalScore(dto);
+ return new Result();
+ }
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/StreetPersonBaseController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/StreetPersonBaseController.java
index 7366d190a..bf13f4636 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/StreetPersonBaseController.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/StreetPersonBaseController.java
@@ -39,7 +39,7 @@ import java.util.Map;
/**
* 街道人员底数表
*
- * @author elink elink@elink-cn.com
+ * @author zhangyong
* @since v1.0.0 2020-04-13
*/
@RestController
@@ -91,4 +91,16 @@ public class StreetPersonBaseController {
ExcelUtils.exportExcelToTarget(response, null, list, StreetPersonBaseExcel.class);
}
+ /**
+ * @Description: 根据单个街道ID，查询街道群众、党员、企业 底数
+ * @Param: [streetId]
+ * @return: com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author: zy
+ * @Date: 2020-04-26
+ */
+ @GetMapping("getStreetPersonBase/{streetId}")
+ public Result getStreetPersonBase(@PathVariable("streetId") String streetId){
+ StreetPersonBaseDTO data = streetPersonBaseService.getStreetPersonBase(streetId);
+ return new Result().ok(data);
+ }
}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/StreetPersionGoalMonthDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/StreetPersionGoalMonthDao.java
new file mode 100644
index 000000000..264242f79
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/StreetPersionGoalMonthDao.java
@@ -0,0 +1,90 @@
+/**
+ * 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.
+ *
+ * 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.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 街道人员目标表
+ *
+ * @author zhangyong
+ * @since v1.0.0 2020-04-22
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_street_persion_goal_month")
+public class StreetPersionGoalMonthEntity extends BaseEpdcEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 街道
+ */
+ private String street;
+
+ /**
+ * 街道ID
+ */
+ private Long streetId;
+
+ /**
+ * 年月
+ */
+ private String monthYear;
+
+ /**
+ * 群众目标数
+ */
+ private Integer residentGoalNum;
+
+ /**
+ * 党员目标数
+ */
+ private Integer partyGoalNum;
+
+ /**
+ * 企业目标数
+ */
+ private Integer companyGoalNum;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/StreetPersionGoalMonthExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/StreetPersionGoalMonthExcel.java
new file mode 100644
index 000000000..79170df98
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/StreetPersionGoalMonthExcel.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.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 2020-04-22
+ */
+@Data
+public class StreetPersionGoalMonthExcel {
+
+ @Excel(name = "主键")
+ private String id;
+
+ @Excel(name = "街道")
+ private String street;
+
+ @Excel(name = "街道ID")
+ private Long streetId;
+
+ @Excel(name = "年月")
+ private String monthYear;
+
+ @Excel(name = "群众目标数")
+ private Integer residentGoalNum;
+
+ @Excel(name = "党员目标数")
+ private Integer partyGoalNum;
+
+ @Excel(name = "企业目标数")
+ private Integer companyGoalNum;
+
+ @Excel(name = "乐观锁")
+ private Integer revision;
+
+ @Excel(name = "创建人")
+ private String createdBy;
+
+ @Excel(name = "创建时间")
+ private Date createdTime;
+
+ @Excel(name = "更新人")
+ private String updatedBy;
+
+ @Excel(name = "更新时间")
+ private Date updatedTime;
+
+ @Excel(name = "删除标记")
+ private String delFlag;
+
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/StreetPersionGoalMonthRedis.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/StreetPersionGoalMonthRedis.java
new file mode 100644
index 000000000..be817efac
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/StreetPersionGoalMonthRedis.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 zhangyong
+ * @since v1.0.0 2020-04-22
+ */
+@Component
+public class StreetPersionGoalMonthRedis {
+ @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-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersionGoalMonthService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersionGoalMonthService.java
new file mode 100644
index 000000000..fd2fa1246
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersionGoalMonthService.java
@@ -0,0 +1,123 @@
+/**
+ * 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.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.StreetPersionGoalMonthDTO;
+import com.elink.esua.epdc.entity.StreetPersionGoalMonthEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 街道人员目标表
+ *
+ * @author zhangyong
+ * @since v1.0.0 2020-04-22
+ */
+public interface StreetPersionGoalMonthService extends BaseService {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-04-22
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-04-22
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return StreetPersionGoalMonthDTO
+ * @author generator
+ * @date 2020-04-22
+ */
+ StreetPersionGoalMonthDTO get(String id);
+
+ /**
+ * @Description: 新增功能：根据街道人员底数 * 目标比例 = 保存所有街道某个月的群众目标数、党员目标数、企业目标数
+ * @Description: 需要判断 所选月份，目标数是否存在，存在返回错误提示信息。
+ * @Param: [dto]
+ * @return: com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author: zy
+ * @Date: 2020-04-26
+ */
+ Result save(StreetPersionGoalMonthDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-04-22
+ */
+ void update(StreetPersionGoalMonthDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-04-22
+ */
+ void delete(String[] ids);
+
+ /**
+ * @Description: 获取街道目标表的 街道名称
+ * @Param: []
+ * @return: java.util.List
+ * @Author: zy
+ * @Date: 2020-04-22
+ */
+ List lisStreetGoalName();
+
+ /**
+ * @Description: 获取街道目标表的 街道目标分数、街道ID、日期
+ * @Param:
+ * @return:
+ * @Author: zy
+ * @Date: 2020-04-24
+ */
+ List> listStreetGoalScore();
+
+ /**
+ * @Description: 修改街道目标数
+ * @Param: [dto]
+ * @return: void
+ * @Author: zy
+ * @Date: 2020-04-26
+ */
+ void modifyStreetGoalScore(StreetPersionGoalMonthDTO dto);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersonBaseService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersonBaseService.java
index 33f51d59b..e38829417 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersonBaseService.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/StreetPersonBaseService.java
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* 街道人员底数表
*
- * @author elink elink@elink-cn.com
+ * @author zhangyong
* @since v1.0.0 2020-04-13
*/
public interface StreetPersonBaseService extends BaseService {
@@ -92,4 +92,13 @@ public interface StreetPersonBaseService extends BaseService
+ * 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.
+ *