From fc501498ff0cee81c2bef3ffac993b27d8c6c136 Mon Sep 17 00:00:00 2001 From: Ivanyany <754339948@qq.com> Date: Tue, 21 Apr 2020 10:22:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E4=BE=9B?= =?UTF-8?q?=E6=9D=8E=E6=96=87=E9=9B=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ConfigOrgSignController.java | 15 +++++++++++++++ .../controller/FlowCampaignController.java | 2 +- .../server/controller/FoundZayhController.java | 11 +++++++---- .../management/server/entity/FoundZayh.java | 3 +++ .../server/mapper/ConfigOrgSignDeptMapper.java | 5 +++++ .../server/service/ConfigOrgSignService.java | 3 +++ .../service/impl/ConfigOrgSignServiceImpl.java | 18 ++++++++++++++++-- src/main/resources/mapper/FoundZayhMapper.xml | 3 ++- 8 files changed, 52 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/hncy/comprehensive/management/server/controller/ConfigOrgSignController.java b/src/main/java/com/hncy/comprehensive/management/server/controller/ConfigOrgSignController.java index a1d864f..20b6436 100644 --- a/src/main/java/com/hncy/comprehensive/management/server/controller/ConfigOrgSignController.java +++ b/src/main/java/com/hncy/comprehensive/management/server/controller/ConfigOrgSignController.java @@ -53,4 +53,19 @@ public class ConfigOrgSignController { return orgSignService.getByCreateBy(userNickName, configTypeCode); } + /** + * @Author Ivan + * @Description 根据ID删除签收配置,传入参数为id + * @Date 2020/4/20 18:17 + * @Param + * @return + */ + @ApiOperation(value = "根据ID删除签收配置,传入参数为id") + @RequestMapping(value = "/deleteById", method = RequestMethod.POST, produces = "application/json;charset=UTF-8") + CommonResult deleteById(@ApiParam(name = "id",value = "id值") + @RequestParam("id") String id){ + int result = orgSignService.deleteById(id); + return CommonResult.operationWithCRUD(result, "delete"); + } + } diff --git a/src/main/java/com/hncy/comprehensive/management/server/controller/FlowCampaignController.java b/src/main/java/com/hncy/comprehensive/management/server/controller/FlowCampaignController.java index ee203a1..01e9027 100644 --- a/src/main/java/com/hncy/comprehensive/management/server/controller/FlowCampaignController.java +++ b/src/main/java/com/hncy/comprehensive/management/server/controller/FlowCampaignController.java @@ -154,7 +154,7 @@ public class FlowCampaignController { //分页查询发现治安隐患统计列表、可实现条件查询 List flowCampaignVoByPage = flowCampaignService.getFlowCampaignCount(gridIds,countTime,year,month); PageInfo pageInfo = new PageInfo(pages); - return LayuiTable.success(flowCampaignVoByPage,pageInfo.getTotal()); + return LayuiTable.success(pageInfo.getList(),pageInfo.getTotal()); } } diff --git a/src/main/java/com/hncy/comprehensive/management/server/controller/FoundZayhController.java b/src/main/java/com/hncy/comprehensive/management/server/controller/FoundZayhController.java index 960555f..fab5b44 100644 --- a/src/main/java/com/hncy/comprehensive/management/server/controller/FoundZayhController.java +++ b/src/main/java/com/hncy/comprehensive/management/server/controller/FoundZayhController.java @@ -175,7 +175,8 @@ public class FoundZayhController { /** * @Author Ivan - * @Description 分页查询发现治安隐患列表,可根据用户id、辖区、异常类型、状态、地点 + * @Description 发现治安隐患记录 + * 分页查询发现治安隐患列表,可根据用户id、辖区、异常类型、状态、地点 * PC网页使用 * @Date 2020/4/8 18:24 * @Param @@ -218,7 +219,8 @@ public class FoundZayhController { /** * @Author Ivan - * @Description 分页查询发现治安隐患列表,可根据用户id、辖区、异常类型、状态、地点 + * @Description 发现治安隐患记录 + * 分页查询发现治安隐患列表,可根据用户id、辖区、异常类型、状态、地点 * App使用 * @Date 2020/4/8 18:24 * @Param @@ -266,7 +268,8 @@ public class FoundZayhController { /** * @Author Ivan - * @Description 分页查询发现治安隐患的统计列表 + * @Description 发现治安隐患统计 + * 分页查询发现治安隐患的统计列表 * @Date 2020/4/10 15:25 * @Param * @return @@ -302,7 +305,7 @@ public class FoundZayhController { //分页查询发现治安隐患统计列表、可实现条件查询 List foundZayhByPage = foundZayhService.getZayhCountByPage(gridIds,countTime,year,month); PageInfo pageInfo = new PageInfo(pages); - return LayuiTable.success(pageInfo.getList(),pageInfo.getTotal()); + return LayuiTable.success(foundZayhByPage,pageInfo.getTotal()); } /** diff --git a/src/main/java/com/hncy/comprehensive/management/server/entity/FoundZayh.java b/src/main/java/com/hncy/comprehensive/management/server/entity/FoundZayh.java index 7116650..a57ff7d 100644 --- a/src/main/java/com/hncy/comprehensive/management/server/entity/FoundZayh.java +++ b/src/main/java/com/hncy/comprehensive/management/server/entity/FoundZayh.java @@ -33,6 +33,9 @@ public class FoundZayh { //用户id private String userId; + //用户联系方式(电话) + private String userPhone; + //网格id private String gridId; diff --git a/src/main/java/com/hncy/comprehensive/management/server/mapper/ConfigOrgSignDeptMapper.java b/src/main/java/com/hncy/comprehensive/management/server/mapper/ConfigOrgSignDeptMapper.java index 90657dc..fc0f980 100644 --- a/src/main/java/com/hncy/comprehensive/management/server/mapper/ConfigOrgSignDeptMapper.java +++ b/src/main/java/com/hncy/comprehensive/management/server/mapper/ConfigOrgSignDeptMapper.java @@ -1,6 +1,7 @@ package com.hncy.comprehensive.management.server.mapper; import com.hncy.comprehensive.management.server.entity.ConfigOrgSignDept; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Select; import tk.mybatis.mapper.common.Mapper; @@ -21,4 +22,8 @@ public interface ConfigOrgSignDeptMapper extends Mapper { //根据config_org_sign_id查询ConfigOrgSignDept @Select("select * from `config_org_sign_dept` where config_org_sign_id = #{id}") ConfigOrgSignDept getById(@PathParam("id") String id); + + //根据签收配置信息id删除签收配置部门信息 + @Delete("delete from `config_org_sign_dept` where config_org_sign_id = #{id}") + int deleteByConfigOrgSignId(@PathParam("id") String id); } \ No newline at end of file diff --git a/src/main/java/com/hncy/comprehensive/management/server/service/ConfigOrgSignService.java b/src/main/java/com/hncy/comprehensive/management/server/service/ConfigOrgSignService.java index 1c7e300..0435e8f 100644 --- a/src/main/java/com/hncy/comprehensive/management/server/service/ConfigOrgSignService.java +++ b/src/main/java/com/hncy/comprehensive/management/server/service/ConfigOrgSignService.java @@ -20,4 +20,7 @@ public interface ConfigOrgSignService { //根据当前用户昵称信息、签收配置类型代码查询已经配置的信息 List getByCreateBy(String userNickName, String configTypeCode); + + //根据ID删除签收配置,传入参数为id + int deleteById(String id); } diff --git a/src/main/java/com/hncy/comprehensive/management/server/service/impl/ConfigOrgSignServiceImpl.java b/src/main/java/com/hncy/comprehensive/management/server/service/impl/ConfigOrgSignServiceImpl.java index 5420945..9a1cb2a 100644 --- a/src/main/java/com/hncy/comprehensive/management/server/service/impl/ConfigOrgSignServiceImpl.java +++ b/src/main/java/com/hncy/comprehensive/management/server/service/impl/ConfigOrgSignServiceImpl.java @@ -61,7 +61,7 @@ public class ConfigOrgSignServiceImpl implements ConfigOrgSignService { } //自定义批量插入数据 - int reslut = orgSignMapper.batchInsertConfigOrgSign(configOrgSigns.getConfigOrgSigns()); + int result = orgSignMapper.batchInsertConfigOrgSign(configOrgSigns.getConfigOrgSigns()); int result2 = orgSignDeptMapper.batchInsertConfigOrgSignDept(configOrgSignDepts); // int count = 0; // for (ConfigOrgSign configOrgSign: configOrgSigns.getConfigOrgSigns()) { @@ -72,7 +72,7 @@ public class ConfigOrgSignServiceImpl implements ConfigOrgSignService { // orgSignMapper.insertSelective(configOrgSign); // count++; // } - return reslut > result2 ? reslut: result2; + return result > result2 ? result: result2; } /** @@ -86,4 +86,18 @@ public class ConfigOrgSignServiceImpl implements ConfigOrgSignService { public List getByCreateBy(String userNickName, String configTypeCode) { return orgSignMapper.getByCreateBy(userNickName, configTypeCode); } + + /** + * @Author Ivan + * @Description 根据ID删除签收配置,传入参数为id + * @Date 2020/4/20 18:18 + * @Param + * @return + */ + @Override + public int deleteById(String id) { + int result = orgSignMapper.deleteByPrimaryKey(id);//删除签收配置信息 + int result2 = orgSignDeptMapper.deleteByConfigOrgSignId(id);//根据签收配置信息id删除签收配置部门信息 + return result > result2 ? result: result2; + } } diff --git a/src/main/resources/mapper/FoundZayhMapper.xml b/src/main/resources/mapper/FoundZayhMapper.xml index efc04f3..af30083 100644 --- a/src/main/resources/mapper/FoundZayhMapper.xml +++ b/src/main/resources/mapper/FoundZayhMapper.xml @@ -4,7 +4,8 @@ - + + -- GitLab