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 a1d864fa0bf0c5a2a5f6d002bfb3a45f1a9df014..20b64362fcd9ae3286b8e904c0aa7e25ef5ddc61 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 ee203a10fcf0fa333fe1d596e670b4c736292489..01e90274d000e838327771141ae1f618ca4d10ef 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 960555f68dc141554b78274e5c5ea3f4b70b47f3..fab5b44ce1a61b2c467bee44bb4645e84582a0c5 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 711665088e89b8847daee7e4d1480f63351b0eca..a57ff7d1ebcf32db39acd15c5ac6db7813de82b6 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 90657dc2b7a7955debbde69676e93bcf4bd05e02..fc0f980ee046961a0b76ae207fc0c20f640437a8 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 1c7e3003f4b1ad622d22154db189115c363f556b..0435e8f1f05ac1299e7cf67f31f9f9dd73fe8d87 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 5420945456a46cc28b7fb38c423d1371b134505c..9a1cb2ace37668546f014ccdff510e05356047f9 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 efc04f3b0b0e4f40e5e41a41a77a28e50aebd021..af30083557cd99809e818bb92fa617c28cc1b6b5 100644 --- a/src/main/resources/mapper/FoundZayhMapper.xml +++ b/src/main/resources/mapper/FoundZayhMapper.xml @@ -4,7 +4,8 @@ - + +