履职内容库增加点位ID

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/web/page/TableDataInfo.java

@@ -24,7 +24,7 @@ public class TableDataInfo<T> implements Serializable {
     /**
      * 列表数据
      */
-    private List<?> rows;
+    private List<T> rows;
 
     /**
      * 消息状态码
@@ -48,7 +48,7 @@ public class TableDataInfo<T> implements Serializable {
      * @param list  列表数据
      * @param total 总记录数
      */
-    public TableDataInfo(List<?> list, int total) {
+    public TableDataInfo(List<T> list, int total) {
         this.rows = list;
         this.total = total;
     }
@@ -97,11 +97,11 @@ public class TableDataInfo<T> implements Serializable {
         this.total = total;
     }
 
-    public List<?> getRows() {
+    public List<T> getRows() {
         return rows;
     }
 
-    public void setRows(List<?> rows) {
+    public void setRows(List<T> rows) {
         this.rows = rows;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreMessageCenterServiceImpl.java

@@ -61,7 +61,7 @@ public class CoreMessageCenterServiceImpl extends ServiceImpl<CoreMessageCenterM
     @Override
     public TableDataInfo selectByPage(CoreMessageCenterDTO coreMessageCenterDTO) {
         Page<CoreMessageCenterVO> coreMessageCenterPage = coreMessageCenterMapper.selectByPage(coreMessageCenterDTO.getPageRequest(), coreMessageCenterDTO);
-        TableDataInfo<CoreMessageCenter> tableDataInfo = new TableDataInfo();
+        TableDataInfo<CoreMessageCenterVO> tableDataInfo = new TableDataInfo();
         tableDataInfo.setMsg("操作成功");
         tableDataInfo.setCode(200);
         tableDataInfo.setTotal(coreMessageCenterPage.getTotal());

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppRulePointMapper.xml

@@ -2,9 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppRulePointMapper">
     <select id="selectDataListByItemId" resultType="com.xunmei.core.resumption.dto.rulePoint.AppRulePointDetailDto">
-        select p.*,a.name as areaName
+        select p.*,a.name as areaName,c.check_name as checkName
         from core_resumption_rule_point p
         left join sys_area a on p.area_id = a.id
+        left join sys_area_check c on p.check_id=c.id
         where item_id = #{itemId}
           and p.deleted = 0
         <if test="pointName!=null and pointName!=''">

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaCheckController.java

@@ -1,7 +1,9 @@
 package com.xunmei.system.controller;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.domain.vo.SysAreaCheckVO;
@@ -45,6 +47,7 @@ public class SysAreaCheckController extends BaseController {
     private ISysAreaService sysAreaService;
     @Autowired
     private SysOrgMapper sysOrgMapper;
+
     /**
      * 查询区域采集点列表
      */
@@ -123,7 +126,7 @@ public class SysAreaCheckController extends BaseController {
     public AjaxResult getAreaCheckInfoByOrg(@PathVariable(value = "orgId", required = false) Long orgId) {
         AjaxResult ajax = AjaxResult.success();
         SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);
-        if (null==sysOrg.getType()){
+        if (null == sysOrg.getType()) {
             return error("该机构没有机构类型，请维护！");
         }
         List<SysAreaCheck> sysAreaChecks = sysAreaCheckService.selectByOrgId(orgId);
@@ -132,16 +135,16 @@ public class SysAreaCheckController extends BaseController {
     }
 
     /**
-     *按机构类型获取所有点位
+     * 按机构类型获取所有点位
      */
     @ApiOperation(value = "按机构类型获取所有点位")
-    @GetMapping("/orgType/{orgType}")
+    @GetMapping("/orgtype/{orgType}")
     public AjaxResult listByOrgType(@PathVariable Integer orgType) {
-//        SysArea condition = new SysArea();
-//        condition.setOrgType(orgType.toString());
-//        condition.setPageNum(1L);
-//        condition.setPageSize(9999L);
-//        TableDataInfo table= sysAreaCheckService.selectPage(condition);
-        return success();
+        SysAreaCheckDTO condition = new SysAreaCheckDTO();
+        condition.setOrgType(orgType.toString());
+        condition.setPageNum(1);
+        condition.setPageSize(9999);
+        TableDataInfo<SysAreaCheck> table = sysAreaCheckService.selectPage(condition);
+        return success(table.getRows().stream().map(r -> new IdNameVo(r.getId(), r.getCheckName(), null)).collect(Collectors.toList()));
     }
 }