diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java new file mode 100644 index 0000000..733e86e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import com.casic.missiles.modular.system.service.IDcmBaseConfigService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 城管基础配置控制器 + * + * @author dev + * @Date 2023-05-22 13:52:25 + */ +@Controller +@RequestMapping("/dcm/view") +public class DcmBaseConfigController extends BaseController { + + + private final IDcmBaseConfigService dcmBaseConfigService; + + public DcmBaseConfigController(IDcmBaseConfigService dcmBaseConfigService) { + this.dcmBaseConfigService = dcmBaseConfigService; + } + + + /** + * 获取城管基础配置列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return ResponseData.success(dcmBaseConfigService.selectList(null)); + } + + /** + * 网格统计 + */ + @GetMapping(value = "/grid-statistics") + @ResponseBody + public Object gridStatistics(String beginTime, String endTime) { + return ResponseData.success(dcmBaseConfigService.selectGridStatisticsData(beginTime, endTime)); + } + + /** + * 获取城管基础配置分页列表 + */ + @GetMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = dcmBaseConfigService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 新增城管基础配置 + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.insert(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 删除城管基础配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String dcmBaseConfigId) { + dcmBaseConfigService.deleteById(dcmBaseConfigId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("dcmBaseConfigIds") List dcmBaseConfigIds) { + dcmBaseConfigService.deleteBatchIds(dcmBaseConfigIds); + return ResponseData.success(); + } + + /** + * 修改城管基础配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.updateById(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 城管基础配置详情 + */ + @RequestMapping(value = "/detail/{dcmBaseConfigId}") + @ResponseBody + public Object detail(@PathVariable("dcmBaseConfigId") String dcmBaseConfigId) { + return ResponseData.success(dcmBaseConfigService.selectById(dcmBaseConfigId)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java new file mode 100644 index 0000000..733e86e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import com.casic.missiles.modular.system.service.IDcmBaseConfigService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 城管基础配置控制器 + * + * @author dev + * @Date 2023-05-22 13:52:25 + */ +@Controller +@RequestMapping("/dcm/view") +public class DcmBaseConfigController extends BaseController { + + + private final IDcmBaseConfigService dcmBaseConfigService; + + public DcmBaseConfigController(IDcmBaseConfigService dcmBaseConfigService) { + this.dcmBaseConfigService = dcmBaseConfigService; + } + + + /** + * 获取城管基础配置列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return ResponseData.success(dcmBaseConfigService.selectList(null)); + } + + /** + * 网格统计 + */ + @GetMapping(value = "/grid-statistics") + @ResponseBody + public Object gridStatistics(String beginTime, String endTime) { + return ResponseData.success(dcmBaseConfigService.selectGridStatisticsData(beginTime, endTime)); + } + + /** + * 获取城管基础配置分页列表 + */ + @GetMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = dcmBaseConfigService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 新增城管基础配置 + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.insert(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 删除城管基础配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String dcmBaseConfigId) { + dcmBaseConfigService.deleteById(dcmBaseConfigId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("dcmBaseConfigIds") List dcmBaseConfigIds) { + dcmBaseConfigService.deleteBatchIds(dcmBaseConfigIds); + return ResponseData.success(); + } + + /** + * 修改城管基础配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.updateById(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 城管基础配置详情 + */ + @RequestMapping(value = "/detail/{dcmBaseConfigId}") + @ResponseBody + public Object detail(@PathVariable("dcmBaseConfigId") String dcmBaseConfigId) { + return ResponseData.success(dcmBaseConfigService.selectById(dcmBaseConfigId)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java new file mode 100644 index 0000000..5e1977e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +public interface DcmBaseConfigMapper extends BaseMapper { + + List selectGrids(); + + /** + * 网格有效立案数检索 + * + * @param entityWrapper 检索条件 + * @return 网格统计列表 + */ + List selectGridRegisteredNum(@Param("ew") EntityWrapper entityWrapper); + + /** + * 网格结案数统计 + * @param entityWrapper 检索条件 + * @return + */ + List selectGridClosedNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridDistributeNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridProcessNum(@Param("ew") EntityWrapper entityWrapper); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java new file mode 100644 index 0000000..733e86e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import com.casic.missiles.modular.system.service.IDcmBaseConfigService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 城管基础配置控制器 + * + * @author dev + * @Date 2023-05-22 13:52:25 + */ +@Controller +@RequestMapping("/dcm/view") +public class DcmBaseConfigController extends BaseController { + + + private final IDcmBaseConfigService dcmBaseConfigService; + + public DcmBaseConfigController(IDcmBaseConfigService dcmBaseConfigService) { + this.dcmBaseConfigService = dcmBaseConfigService; + } + + + /** + * 获取城管基础配置列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return ResponseData.success(dcmBaseConfigService.selectList(null)); + } + + /** + * 网格统计 + */ + @GetMapping(value = "/grid-statistics") + @ResponseBody + public Object gridStatistics(String beginTime, String endTime) { + return ResponseData.success(dcmBaseConfigService.selectGridStatisticsData(beginTime, endTime)); + } + + /** + * 获取城管基础配置分页列表 + */ + @GetMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = dcmBaseConfigService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 新增城管基础配置 + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.insert(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 删除城管基础配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String dcmBaseConfigId) { + dcmBaseConfigService.deleteById(dcmBaseConfigId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("dcmBaseConfigIds") List dcmBaseConfigIds) { + dcmBaseConfigService.deleteBatchIds(dcmBaseConfigIds); + return ResponseData.success(); + } + + /** + * 修改城管基础配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.updateById(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 城管基础配置详情 + */ + @RequestMapping(value = "/detail/{dcmBaseConfigId}") + @ResponseBody + public Object detail(@PathVariable("dcmBaseConfigId") String dcmBaseConfigId) { + return ResponseData.success(dcmBaseConfigService.selectById(dcmBaseConfigId)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java new file mode 100644 index 0000000..5e1977e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +public interface DcmBaseConfigMapper extends BaseMapper { + + List selectGrids(); + + /** + * 网格有效立案数检索 + * + * @param entityWrapper 检索条件 + * @return 网格统计列表 + */ + List selectGridRegisteredNum(@Param("ew") EntityWrapper entityWrapper); + + /** + * 网格结案数统计 + * @param entityWrapper 检索条件 + * @return + */ + List selectGridClosedNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridDistributeNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridProcessNum(@Param("ew") EntityWrapper entityWrapper); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml new file mode 100644 index 0000000..2124711 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + id + , code, dcm_name AS dcmName, val + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java new file mode 100644 index 0000000..733e86e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import com.casic.missiles.modular.system.service.IDcmBaseConfigService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 城管基础配置控制器 + * + * @author dev + * @Date 2023-05-22 13:52:25 + */ +@Controller +@RequestMapping("/dcm/view") +public class DcmBaseConfigController extends BaseController { + + + private final IDcmBaseConfigService dcmBaseConfigService; + + public DcmBaseConfigController(IDcmBaseConfigService dcmBaseConfigService) { + this.dcmBaseConfigService = dcmBaseConfigService; + } + + + /** + * 获取城管基础配置列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return ResponseData.success(dcmBaseConfigService.selectList(null)); + } + + /** + * 网格统计 + */ + @GetMapping(value = "/grid-statistics") + @ResponseBody + public Object gridStatistics(String beginTime, String endTime) { + return ResponseData.success(dcmBaseConfigService.selectGridStatisticsData(beginTime, endTime)); + } + + /** + * 获取城管基础配置分页列表 + */ + @GetMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = dcmBaseConfigService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 新增城管基础配置 + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.insert(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 删除城管基础配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String dcmBaseConfigId) { + dcmBaseConfigService.deleteById(dcmBaseConfigId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("dcmBaseConfigIds") List dcmBaseConfigIds) { + dcmBaseConfigService.deleteBatchIds(dcmBaseConfigIds); + return ResponseData.success(); + } + + /** + * 修改城管基础配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.updateById(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 城管基础配置详情 + */ + @RequestMapping(value = "/detail/{dcmBaseConfigId}") + @ResponseBody + public Object detail(@PathVariable("dcmBaseConfigId") String dcmBaseConfigId) { + return ResponseData.success(dcmBaseConfigService.selectById(dcmBaseConfigId)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java new file mode 100644 index 0000000..5e1977e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +public interface DcmBaseConfigMapper extends BaseMapper { + + List selectGrids(); + + /** + * 网格有效立案数检索 + * + * @param entityWrapper 检索条件 + * @return 网格统计列表 + */ + List selectGridRegisteredNum(@Param("ew") EntityWrapper entityWrapper); + + /** + * 网格结案数统计 + * @param entityWrapper 检索条件 + * @return + */ + List selectGridClosedNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridDistributeNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridProcessNum(@Param("ew") EntityWrapper entityWrapper); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml new file mode 100644 index 0000000..2124711 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + id + , code, dcm_name AS dcmName, val + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java new file mode 100644 index 0000000..668af53 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * 网格统计传输对象 + */ +@Data +public class GridStatisticsDTO { + /** + * 网格ID + */ + private String gridId; + /** + * 网格名称 + */ + private String gridName; + /** + * 结案数 + */ + private String closedNum; + /** + * 立案数 + */ + private String registeredNum; + + /** + * 处置数 + */ + private String processNum; + + /** + * 派遣数 + */ + private String distributeNum; + + /** + * 结案率 + */ + private String rate; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java new file mode 100644 index 0000000..733e86e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import com.casic.missiles.modular.system.service.IDcmBaseConfigService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 城管基础配置控制器 + * + * @author dev + * @Date 2023-05-22 13:52:25 + */ +@Controller +@RequestMapping("/dcm/view") +public class DcmBaseConfigController extends BaseController { + + + private final IDcmBaseConfigService dcmBaseConfigService; + + public DcmBaseConfigController(IDcmBaseConfigService dcmBaseConfigService) { + this.dcmBaseConfigService = dcmBaseConfigService; + } + + + /** + * 获取城管基础配置列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return ResponseData.success(dcmBaseConfigService.selectList(null)); + } + + /** + * 网格统计 + */ + @GetMapping(value = "/grid-statistics") + @ResponseBody + public Object gridStatistics(String beginTime, String endTime) { + return ResponseData.success(dcmBaseConfigService.selectGridStatisticsData(beginTime, endTime)); + } + + /** + * 获取城管基础配置分页列表 + */ + @GetMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = dcmBaseConfigService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 新增城管基础配置 + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.insert(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 删除城管基础配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String dcmBaseConfigId) { + dcmBaseConfigService.deleteById(dcmBaseConfigId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("dcmBaseConfigIds") List dcmBaseConfigIds) { + dcmBaseConfigService.deleteBatchIds(dcmBaseConfigIds); + return ResponseData.success(); + } + + /** + * 修改城管基础配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.updateById(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 城管基础配置详情 + */ + @RequestMapping(value = "/detail/{dcmBaseConfigId}") + @ResponseBody + public Object detail(@PathVariable("dcmBaseConfigId") String dcmBaseConfigId) { + return ResponseData.success(dcmBaseConfigService.selectById(dcmBaseConfigId)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java new file mode 100644 index 0000000..5e1977e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +public interface DcmBaseConfigMapper extends BaseMapper { + + List selectGrids(); + + /** + * 网格有效立案数检索 + * + * @param entityWrapper 检索条件 + * @return 网格统计列表 + */ + List selectGridRegisteredNum(@Param("ew") EntityWrapper entityWrapper); + + /** + * 网格结案数统计 + * @param entityWrapper 检索条件 + * @return + */ + List selectGridClosedNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridDistributeNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridProcessNum(@Param("ew") EntityWrapper entityWrapper); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml new file mode 100644 index 0000000..2124711 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + id + , code, dcm_name AS dcmName, val + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java new file mode 100644 index 0000000..668af53 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * 网格统计传输对象 + */ +@Data +public class GridStatisticsDTO { + /** + * 网格ID + */ + private String gridId; + /** + * 网格名称 + */ + private String gridName; + /** + * 结案数 + */ + private String closedNum; + /** + * 立案数 + */ + private String registeredNum; + + /** + * 处置数 + */ + private String processNum; + + /** + * 派遣数 + */ + private String distributeNum; + + /** + * 结案率 + */ + private String rate; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java new file mode 100644 index 0000000..31c21f6 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +@Data +@TableName("dcm_base_config") +public class DcmBaseConfig extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + /** + * 编码 + */ + private String code; + /** + * 描述信息 + */ + @TableField("dcm_name") + private String dcmName; + /** + * 值 + */ + private String val; + private String tag; + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "DcmBaseConfig{" + + "id=" + id + + ", code=" + code + + ", dcmName=" + dcmName + + ", val=" + val + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java new file mode 100644 index 0000000..733e86e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import com.casic.missiles.modular.system.service.IDcmBaseConfigService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 城管基础配置控制器 + * + * @author dev + * @Date 2023-05-22 13:52:25 + */ +@Controller +@RequestMapping("/dcm/view") +public class DcmBaseConfigController extends BaseController { + + + private final IDcmBaseConfigService dcmBaseConfigService; + + public DcmBaseConfigController(IDcmBaseConfigService dcmBaseConfigService) { + this.dcmBaseConfigService = dcmBaseConfigService; + } + + + /** + * 获取城管基础配置列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return ResponseData.success(dcmBaseConfigService.selectList(null)); + } + + /** + * 网格统计 + */ + @GetMapping(value = "/grid-statistics") + @ResponseBody + public Object gridStatistics(String beginTime, String endTime) { + return ResponseData.success(dcmBaseConfigService.selectGridStatisticsData(beginTime, endTime)); + } + + /** + * 获取城管基础配置分页列表 + */ + @GetMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = dcmBaseConfigService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 新增城管基础配置 + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.insert(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 删除城管基础配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String dcmBaseConfigId) { + dcmBaseConfigService.deleteById(dcmBaseConfigId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("dcmBaseConfigIds") List dcmBaseConfigIds) { + dcmBaseConfigService.deleteBatchIds(dcmBaseConfigIds); + return ResponseData.success(); + } + + /** + * 修改城管基础配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.updateById(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 城管基础配置详情 + */ + @RequestMapping(value = "/detail/{dcmBaseConfigId}") + @ResponseBody + public Object detail(@PathVariable("dcmBaseConfigId") String dcmBaseConfigId) { + return ResponseData.success(dcmBaseConfigService.selectById(dcmBaseConfigId)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java new file mode 100644 index 0000000..5e1977e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +public interface DcmBaseConfigMapper extends BaseMapper { + + List selectGrids(); + + /** + * 网格有效立案数检索 + * + * @param entityWrapper 检索条件 + * @return 网格统计列表 + */ + List selectGridRegisteredNum(@Param("ew") EntityWrapper entityWrapper); + + /** + * 网格结案数统计 + * @param entityWrapper 检索条件 + * @return + */ + List selectGridClosedNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridDistributeNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridProcessNum(@Param("ew") EntityWrapper entityWrapper); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml new file mode 100644 index 0000000..2124711 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + id + , code, dcm_name AS dcmName, val + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java new file mode 100644 index 0000000..668af53 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * 网格统计传输对象 + */ +@Data +public class GridStatisticsDTO { + /** + * 网格ID + */ + private String gridId; + /** + * 网格名称 + */ + private String gridName; + /** + * 结案数 + */ + private String closedNum; + /** + * 立案数 + */ + private String registeredNum; + + /** + * 处置数 + */ + private String processNum; + + /** + * 派遣数 + */ + private String distributeNum; + + /** + * 结案率 + */ + private String rate; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java new file mode 100644 index 0000000..31c21f6 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +@Data +@TableName("dcm_base_config") +public class DcmBaseConfig extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + /** + * 编码 + */ + private String code; + /** + * 描述信息 + */ + @TableField("dcm_name") + private String dcmName; + /** + * 值 + */ + private String val; + private String tag; + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "DcmBaseConfig{" + + "id=" + id + + ", code=" + code + + ", dcmName=" + dcmName + + ", val=" + val + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IDcmBaseConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IDcmBaseConfigService.java new file mode 100644 index 0000000..b2681f2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IDcmBaseConfigService.java @@ -0,0 +1,65 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +public interface IDcmBaseConfigService extends IService { + /** + * 检索网格统计数据 + * + * @return 检索统计数据 + */ + List selectGridStatisticsData(String beginTime, String endTime); + + /** + * 检索网格信息 + * + * @return 检索统计数据 + */ + List selectGrids(String beginTime, String endTime); + + /** + * 统计各网格时间段内有效立案数 + * + * @return 检索统计数据 + */ + List selectGridRegisteredNum(String beginTime, String endTime); + + /** + * 统计各网格结案数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 网格结案数据 + */ + List selectGridClosedNum(String beginTime, String endTime); + + /** + * 统计各网格派遣数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 网格派遣列表 + */ + List selectGridDistributeNum(String beginTime, String endTime); + + /** + * 统计各网格处置数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 网格处置列表 + */ + List selectGridProcessNum(String beginTime, String endTime); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java new file mode 100644 index 0000000..733e86e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import com.casic.missiles.modular.system.service.IDcmBaseConfigService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 城管基础配置控制器 + * + * @author dev + * @Date 2023-05-22 13:52:25 + */ +@Controller +@RequestMapping("/dcm/view") +public class DcmBaseConfigController extends BaseController { + + + private final IDcmBaseConfigService dcmBaseConfigService; + + public DcmBaseConfigController(IDcmBaseConfigService dcmBaseConfigService) { + this.dcmBaseConfigService = dcmBaseConfigService; + } + + + /** + * 获取城管基础配置列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return ResponseData.success(dcmBaseConfigService.selectList(null)); + } + + /** + * 网格统计 + */ + @GetMapping(value = "/grid-statistics") + @ResponseBody + public Object gridStatistics(String beginTime, String endTime) { + return ResponseData.success(dcmBaseConfigService.selectGridStatisticsData(beginTime, endTime)); + } + + /** + * 获取城管基础配置分页列表 + */ + @GetMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = dcmBaseConfigService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 新增城管基础配置 + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.insert(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 删除城管基础配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String dcmBaseConfigId) { + dcmBaseConfigService.deleteById(dcmBaseConfigId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("dcmBaseConfigIds") List dcmBaseConfigIds) { + dcmBaseConfigService.deleteBatchIds(dcmBaseConfigIds); + return ResponseData.success(); + } + + /** + * 修改城管基础配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.updateById(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 城管基础配置详情 + */ + @RequestMapping(value = "/detail/{dcmBaseConfigId}") + @ResponseBody + public Object detail(@PathVariable("dcmBaseConfigId") String dcmBaseConfigId) { + return ResponseData.success(dcmBaseConfigService.selectById(dcmBaseConfigId)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java new file mode 100644 index 0000000..5e1977e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +public interface DcmBaseConfigMapper extends BaseMapper { + + List selectGrids(); + + /** + * 网格有效立案数检索 + * + * @param entityWrapper 检索条件 + * @return 网格统计列表 + */ + List selectGridRegisteredNum(@Param("ew") EntityWrapper entityWrapper); + + /** + * 网格结案数统计 + * @param entityWrapper 检索条件 + * @return + */ + List selectGridClosedNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridDistributeNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridProcessNum(@Param("ew") EntityWrapper entityWrapper); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml new file mode 100644 index 0000000..2124711 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + id + , code, dcm_name AS dcmName, val + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java new file mode 100644 index 0000000..668af53 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * 网格统计传输对象 + */ +@Data +public class GridStatisticsDTO { + /** + * 网格ID + */ + private String gridId; + /** + * 网格名称 + */ + private String gridName; + /** + * 结案数 + */ + private String closedNum; + /** + * 立案数 + */ + private String registeredNum; + + /** + * 处置数 + */ + private String processNum; + + /** + * 派遣数 + */ + private String distributeNum; + + /** + * 结案率 + */ + private String rate; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java new file mode 100644 index 0000000..31c21f6 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +@Data +@TableName("dcm_base_config") +public class DcmBaseConfig extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + /** + * 编码 + */ + private String code; + /** + * 描述信息 + */ + @TableField("dcm_name") + private String dcmName; + /** + * 值 + */ + private String val; + private String tag; + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "DcmBaseConfig{" + + "id=" + id + + ", code=" + code + + ", dcmName=" + dcmName + + ", val=" + val + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IDcmBaseConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IDcmBaseConfigService.java new file mode 100644 index 0000000..b2681f2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IDcmBaseConfigService.java @@ -0,0 +1,65 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +public interface IDcmBaseConfigService extends IService { + /** + * 检索网格统计数据 + * + * @return 检索统计数据 + */ + List selectGridStatisticsData(String beginTime, String endTime); + + /** + * 检索网格信息 + * + * @return 检索统计数据 + */ + List selectGrids(String beginTime, String endTime); + + /** + * 统计各网格时间段内有效立案数 + * + * @return 检索统计数据 + */ + List selectGridRegisteredNum(String beginTime, String endTime); + + /** + * 统计各网格结案数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 网格结案数据 + */ + List selectGridClosedNum(String beginTime, String endTime); + + /** + * 统计各网格派遣数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 网格派遣列表 + */ + List selectGridDistributeNum(String beginTime, String endTime); + + /** + * 统计各网格处置数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 网格处置列表 + */ + List selectGridProcessNum(String beginTime, String endTime); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DcmBaseConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DcmBaseConfigServiceImpl.java new file mode 100644 index 0000000..9ee4aae --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DcmBaseConfigServiceImpl.java @@ -0,0 +1,174 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.dao.DcmBaseConfigMapper; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import com.casic.missiles.modular.system.service.IDcmBaseConfigService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务实现类 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +@Service +public class DcmBaseConfigServiceImpl extends ServiceImpl implements IDcmBaseConfigService { + + @Override + public List selectGridStatisticsData(String beginTime, String endTime) { + List gridStatisticsDTOS = selectGrids(beginTime, endTime); + + //NO.1 检索网格立案数 + List registeredNums = this.selectGridRegisteredNum(beginTime, endTime); + Map registeredNumsMap = new HashMap<>(); + for (GridStatisticsDTO registeredNum : registeredNums) { + registeredNumsMap.put(registeredNum.getGridId(), registeredNum.getRegisteredNum()); + } + + //NO.1-1 检索网格结案数 + List closedNums = this.selectGridClosedNum(beginTime, endTime); + Map closedNumsMap = new HashMap<>(); + for (GridStatisticsDTO closedNum : closedNums) { + closedNumsMap.put(closedNum.getGridId(), closedNum.getClosedNum()); + } + //NO.1-2 检索网格派遣数 + List distributeNums = this.selectGridDistributeNum(beginTime, endTime); + Map distributeNumsMap = new HashMap<>(); + for (GridStatisticsDTO distributeNum : distributeNums) { + distributeNumsMap.put(distributeNum.getGridId(), distributeNum.getDistributeNum()); + } + //NO.1-3 检索网格处置数 + List processNums = this.selectGridProcessNum(beginTime, endTime); + Map processNumsMap = new HashMap<>(); + for (GridStatisticsDTO distributeNum : processNums) { + processNumsMap.put(distributeNum.getGridId(), distributeNum.getProcessNum()); + } + + //NO.2 封装统计数据 + for (GridStatisticsDTO gridStatisticsDTO : gridStatisticsDTOS) { + //设置立案数 + gridStatisticsDTO.setRegisteredNum(registeredNumsMap.containsKey(gridStatisticsDTO.getGridId()) ? registeredNumsMap.get(gridStatisticsDTO.getGridId()) : "0"); + //设置结案数 + gridStatisticsDTO.setClosedNum(closedNumsMap.containsKey(gridStatisticsDTO.getGridId()) ? closedNumsMap.get(gridStatisticsDTO.getGridId()) : "0"); + //设置派遣数 + gridStatisticsDTO.setDistributeNum(distributeNumsMap.containsKey(gridStatisticsDTO.getGridId()) ? distributeNumsMap.get(gridStatisticsDTO.getGridId()) : "0"); + //设置处置数 + gridStatisticsDTO.setProcessNum(processNumsMap.containsKey(gridStatisticsDTO.getGridId()) ? processNumsMap.get(gridStatisticsDTO.getGridId()) : "0"); + + //计算网格结案率 + BigDecimal clos = new BigDecimal(gridStatisticsDTO.getClosedNum()); + BigDecimal registered = new BigDecimal(gridStatisticsDTO.getRegisteredNum()); + if ("0".equals(gridStatisticsDTO.getRegisteredNum())) { + gridStatisticsDTO.setRate("0.00"); + } else { + DecimalFormat df2 = new DecimalFormat("#0.00"); + gridStatisticsDTO.setRate(df2.format(clos.divide(registered, 2, BigDecimal.ROUND_HALF_UP))); + } + } + + //NO.2-1 结案率倒序 + gridStatisticsDTOS.sort((o1, o2) -> o1.getRate().compareTo(o2.getRate()) * -1); + + //NO.3 提取排行榜前TOP10 + return gridStatisticsDTOS.subList(0, 10); + } + + @Override + public List selectGrids(String beginTime, String endTime) { + return this.baseMapper.selectGrids(); + } + + /** + * 检索符合条件的网格立案数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 各网格立案数返回 + */ + @Override + public List selectGridRegisteredNum(String beginTime, String endTime) { + EntityWrapper entityWrapper = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(beginTime)) { + entityWrapper.ge("b.REGISTER_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + entityWrapper.le("b.REGISTER_TIME", endTime); + } + return baseMapper.selectGridRegisteredNum(entityWrapper); + } + + @Override + public List selectGridClosedNum(String beginTime, String endTime) { + EntityWrapper entityWrapper = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(beginTime)) { + entityWrapper.ge("b.CLOSE_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + entityWrapper.le("b.CLOSE_TIME", endTime); + } + return baseMapper.selectGridClosedNum(entityWrapper); + } + + @Override + public List selectGridDistributeNum(String beginTime, String endTime) { + EntityWrapper entityWrapper = new EntityWrapper<>(); + + //派遣时间判定 + Wrapper disWrapper = entityWrapper.orNew(); + Wrapper distributeWrapper = disWrapper.orNew(); + if (ToolUtil.isNotEmpty(beginTime)) { + distributeWrapper.ge("b.DISTRIBUTE_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + distributeWrapper.le("b.DISTRIBUTE_TIME", endTime); + } + + //结案时间判定(直接办结案卷) + Wrapper closedWrapper = disWrapper.orNew(); + if (ToolUtil.isNotEmpty(beginTime)) { + closedWrapper.ge("b.CLOSE_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + closedWrapper.le("b.CLOSE_TIME", endTime); + } + + return baseMapper.selectGridDistributeNum(entityWrapper); + } + + @Override + public List selectGridProcessNum(String beginTime, String endTime) { + EntityWrapper entityWrapper = new EntityWrapper<>(); + //处置时间判定 + Wrapper disWrapper = entityWrapper.orNew(); + Wrapper distributeWrapper = disWrapper.orNew(); + if (ToolUtil.isNotEmpty(beginTime)) { + distributeWrapper.ge("b.PROCESS_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + distributeWrapper.le("b.PROCESS_TIME", endTime); + } + + //结案时间判定(直接办结案卷) + Wrapper closedWrapper = disWrapper.orNew(); + if (ToolUtil.isNotEmpty(beginTime)) { + closedWrapper.ge("b.CLOSE_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + closedWrapper.le("b.CLOSE_TIME", endTime); + } + return baseMapper.selectGridProcessNum(entityWrapper); + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java new file mode 100644 index 0000000..733e86e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DcmBaseConfigController.java @@ -0,0 +1,111 @@ +package com.casic.missiles.modular.system.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import com.casic.missiles.modular.system.service.IDcmBaseConfigService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 城管基础配置控制器 + * + * @author dev + * @Date 2023-05-22 13:52:25 + */ +@Controller +@RequestMapping("/dcm/view") +public class DcmBaseConfigController extends BaseController { + + + private final IDcmBaseConfigService dcmBaseConfigService; + + public DcmBaseConfigController(IDcmBaseConfigService dcmBaseConfigService) { + this.dcmBaseConfigService = dcmBaseConfigService; + } + + + /** + * 获取城管基础配置列表 + */ + @GetMapping(value = "/list") + @ResponseBody + public Object list(String condition) { + return ResponseData.success(dcmBaseConfigService.selectList(null)); + } + + /** + * 网格统计 + */ + @GetMapping(value = "/grid-statistics") + @ResponseBody + public Object gridStatistics(String beginTime, String endTime) { + return ResponseData.success(dcmBaseConfigService.selectGridStatisticsData(beginTime, endTime)); + } + + /** + * 获取城管基础配置分页列表 + */ + @GetMapping(value = "/listPage") + @ResponseBody + public Object listPage(String condition) { + Page page = new PageFactory().defaultPage(); + EntityWrapper query = new EntityWrapper<>(); + page = dcmBaseConfigService.selectPage(page, query); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 新增城管基础配置 + */ + @PostMapping(value = "/add") + @ResponseBody + public Object add(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.insert(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 删除城管基础配置 + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete(@RequestParam String dcmBaseConfigId) { + dcmBaseConfigService.deleteById(dcmBaseConfigId); + return ResponseData.success(); + } + + /** + * 批量删除 + */ + @RequestMapping(value = "/batchDelete") + @ResponseBody + public Object delete(@RequestParam("dcmBaseConfigIds") List dcmBaseConfigIds) { + dcmBaseConfigService.deleteBatchIds(dcmBaseConfigIds); + return ResponseData.success(); + } + + /** + * 修改城管基础配置 + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object update(DcmBaseConfig dcmBaseConfig) { + dcmBaseConfigService.updateById(dcmBaseConfig); + return ResponseData.success(); + } + + /** + * 城管基础配置详情 + */ + @RequestMapping(value = "/detail/{dcmBaseConfigId}") + @ResponseBody + public Object detail(@PathVariable("dcmBaseConfigId") String dcmBaseConfigId) { + return ResponseData.success(dcmBaseConfigService.selectById(dcmBaseConfigId)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java new file mode 100644 index 0000000..5e1977e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DcmBaseConfigMapper.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +public interface DcmBaseConfigMapper extends BaseMapper { + + List selectGrids(); + + /** + * 网格有效立案数检索 + * + * @param entityWrapper 检索条件 + * @return 网格统计列表 + */ + List selectGridRegisteredNum(@Param("ew") EntityWrapper entityWrapper); + + /** + * 网格结案数统计 + * @param entityWrapper 检索条件 + * @return + */ + List selectGridClosedNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridDistributeNum(@Param("ew") EntityWrapper entityWrapper); + + List selectGridProcessNum(@Param("ew") EntityWrapper entityWrapper); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml new file mode 100644 index 0000000..2124711 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmBaseConfigMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + id + , code, dcm_name AS dcmName, val + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java new file mode 100644 index 0000000..668af53 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/GridStatisticsDTO.java @@ -0,0 +1,41 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +/** + * 网格统计传输对象 + */ +@Data +public class GridStatisticsDTO { + /** + * 网格ID + */ + private String gridId; + /** + * 网格名称 + */ + private String gridName; + /** + * 结案数 + */ + private String closedNum; + /** + * 立案数 + */ + private String registeredNum; + + /** + * 处置数 + */ + private String processNum; + + /** + * 派遣数 + */ + private String distributeNum; + + /** + * 结案率 + */ + private String rate; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java new file mode 100644 index 0000000..31c21f6 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/DcmBaseConfig.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +@Data +@TableName("dcm_base_config") +public class DcmBaseConfig extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + /** + * 编码 + */ + private String code; + /** + * 描述信息 + */ + @TableField("dcm_name") + private String dcmName; + /** + * 值 + */ + private String val; + private String tag; + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "DcmBaseConfig{" + + "id=" + id + + ", code=" + code + + ", dcmName=" + dcmName + + ", val=" + val + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IDcmBaseConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IDcmBaseConfigService.java new file mode 100644 index 0000000..b2681f2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IDcmBaseConfigService.java @@ -0,0 +1,65 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.service.IService; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +public interface IDcmBaseConfigService extends IService { + /** + * 检索网格统计数据 + * + * @return 检索统计数据 + */ + List selectGridStatisticsData(String beginTime, String endTime); + + /** + * 检索网格信息 + * + * @return 检索统计数据 + */ + List selectGrids(String beginTime, String endTime); + + /** + * 统计各网格时间段内有效立案数 + * + * @return 检索统计数据 + */ + List selectGridRegisteredNum(String beginTime, String endTime); + + /** + * 统计各网格结案数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 网格结案数据 + */ + List selectGridClosedNum(String beginTime, String endTime); + + /** + * 统计各网格派遣数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 网格派遣列表 + */ + List selectGridDistributeNum(String beginTime, String endTime); + + /** + * 统计各网格处置数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 网格处置列表 + */ + List selectGridProcessNum(String beginTime, String endTime); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DcmBaseConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DcmBaseConfigServiceImpl.java new file mode 100644 index 0000000..9ee4aae --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DcmBaseConfigServiceImpl.java @@ -0,0 +1,174 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.dao.DcmBaseConfigMapper; +import com.casic.missiles.modular.system.dto.GridStatisticsDTO; +import com.casic.missiles.modular.system.model.DcmBaseConfig; +import com.casic.missiles.modular.system.service.IDcmBaseConfigService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务实现类 + *

+ * + * @author lwh123 + * @since 2023-05-22 + */ +@Service +public class DcmBaseConfigServiceImpl extends ServiceImpl implements IDcmBaseConfigService { + + @Override + public List selectGridStatisticsData(String beginTime, String endTime) { + List gridStatisticsDTOS = selectGrids(beginTime, endTime); + + //NO.1 检索网格立案数 + List registeredNums = this.selectGridRegisteredNum(beginTime, endTime); + Map registeredNumsMap = new HashMap<>(); + for (GridStatisticsDTO registeredNum : registeredNums) { + registeredNumsMap.put(registeredNum.getGridId(), registeredNum.getRegisteredNum()); + } + + //NO.1-1 检索网格结案数 + List closedNums = this.selectGridClosedNum(beginTime, endTime); + Map closedNumsMap = new HashMap<>(); + for (GridStatisticsDTO closedNum : closedNums) { + closedNumsMap.put(closedNum.getGridId(), closedNum.getClosedNum()); + } + //NO.1-2 检索网格派遣数 + List distributeNums = this.selectGridDistributeNum(beginTime, endTime); + Map distributeNumsMap = new HashMap<>(); + for (GridStatisticsDTO distributeNum : distributeNums) { + distributeNumsMap.put(distributeNum.getGridId(), distributeNum.getDistributeNum()); + } + //NO.1-3 检索网格处置数 + List processNums = this.selectGridProcessNum(beginTime, endTime); + Map processNumsMap = new HashMap<>(); + for (GridStatisticsDTO distributeNum : processNums) { + processNumsMap.put(distributeNum.getGridId(), distributeNum.getProcessNum()); + } + + //NO.2 封装统计数据 + for (GridStatisticsDTO gridStatisticsDTO : gridStatisticsDTOS) { + //设置立案数 + gridStatisticsDTO.setRegisteredNum(registeredNumsMap.containsKey(gridStatisticsDTO.getGridId()) ? registeredNumsMap.get(gridStatisticsDTO.getGridId()) : "0"); + //设置结案数 + gridStatisticsDTO.setClosedNum(closedNumsMap.containsKey(gridStatisticsDTO.getGridId()) ? closedNumsMap.get(gridStatisticsDTO.getGridId()) : "0"); + //设置派遣数 + gridStatisticsDTO.setDistributeNum(distributeNumsMap.containsKey(gridStatisticsDTO.getGridId()) ? distributeNumsMap.get(gridStatisticsDTO.getGridId()) : "0"); + //设置处置数 + gridStatisticsDTO.setProcessNum(processNumsMap.containsKey(gridStatisticsDTO.getGridId()) ? processNumsMap.get(gridStatisticsDTO.getGridId()) : "0"); + + //计算网格结案率 + BigDecimal clos = new BigDecimal(gridStatisticsDTO.getClosedNum()); + BigDecimal registered = new BigDecimal(gridStatisticsDTO.getRegisteredNum()); + if ("0".equals(gridStatisticsDTO.getRegisteredNum())) { + gridStatisticsDTO.setRate("0.00"); + } else { + DecimalFormat df2 = new DecimalFormat("#0.00"); + gridStatisticsDTO.setRate(df2.format(clos.divide(registered, 2, BigDecimal.ROUND_HALF_UP))); + } + } + + //NO.2-1 结案率倒序 + gridStatisticsDTOS.sort((o1, o2) -> o1.getRate().compareTo(o2.getRate()) * -1); + + //NO.3 提取排行榜前TOP10 + return gridStatisticsDTOS.subList(0, 10); + } + + @Override + public List selectGrids(String beginTime, String endTime) { + return this.baseMapper.selectGrids(); + } + + /** + * 检索符合条件的网格立案数 + * + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 各网格立案数返回 + */ + @Override + public List selectGridRegisteredNum(String beginTime, String endTime) { + EntityWrapper entityWrapper = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(beginTime)) { + entityWrapper.ge("b.REGISTER_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + entityWrapper.le("b.REGISTER_TIME", endTime); + } + return baseMapper.selectGridRegisteredNum(entityWrapper); + } + + @Override + public List selectGridClosedNum(String beginTime, String endTime) { + EntityWrapper entityWrapper = new EntityWrapper<>(); + if (ToolUtil.isNotEmpty(beginTime)) { + entityWrapper.ge("b.CLOSE_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + entityWrapper.le("b.CLOSE_TIME", endTime); + } + return baseMapper.selectGridClosedNum(entityWrapper); + } + + @Override + public List selectGridDistributeNum(String beginTime, String endTime) { + EntityWrapper entityWrapper = new EntityWrapper<>(); + + //派遣时间判定 + Wrapper disWrapper = entityWrapper.orNew(); + Wrapper distributeWrapper = disWrapper.orNew(); + if (ToolUtil.isNotEmpty(beginTime)) { + distributeWrapper.ge("b.DISTRIBUTE_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + distributeWrapper.le("b.DISTRIBUTE_TIME", endTime); + } + + //结案时间判定(直接办结案卷) + Wrapper closedWrapper = disWrapper.orNew(); + if (ToolUtil.isNotEmpty(beginTime)) { + closedWrapper.ge("b.CLOSE_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + closedWrapper.le("b.CLOSE_TIME", endTime); + } + + return baseMapper.selectGridDistributeNum(entityWrapper); + } + + @Override + public List selectGridProcessNum(String beginTime, String endTime) { + EntityWrapper entityWrapper = new EntityWrapper<>(); + //处置时间判定 + Wrapper disWrapper = entityWrapper.orNew(); + Wrapper distributeWrapper = disWrapper.orNew(); + if (ToolUtil.isNotEmpty(beginTime)) { + distributeWrapper.ge("b.PROCESS_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + distributeWrapper.le("b.PROCESS_TIME", endTime); + } + + //结案时间判定(直接办结案卷) + Wrapper closedWrapper = disWrapper.orNew(); + if (ToolUtil.isNotEmpty(beginTime)) { + closedWrapper.ge("b.CLOSE_TIME", beginTime); + } + if (ToolUtil.isNotEmpty(endTime)) { + closedWrapper.le("b.CLOSE_TIME", endTime); + } + return baseMapper.selectGridProcessNum(entityWrapper); + } +} \ No newline at end of file diff --git a/casic-service-assess/pom.xml b/casic-service-assess/pom.xml index 825851b..b87e2a1 100644 --- a/casic-service-assess/pom.xml +++ b/casic-service-assess/pom.xml @@ -88,4 +88,4 @@ - + \ No newline at end of file