Merge remote-tracking branch 'origin/feature/subCheck' into feature/subCheck

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubInfoGridRelationController.java

@@ -26,6 +26,7 @@ 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.SubInfoGridRelationDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.excel.SubInfoGridRelationExcel;
 import com.elink.esua.epdc.service.SubInfoGridRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +92,16 @@ public class SubInfoGridRelationController {
         ExcelUtils.exportExcelToTarget(response, null, list, SubInfoGridRelationExcel.class);
     }
 
+    /*
+     *
+     * 根据部门id和部门类型查询 所属网格
+     * @author wk
+     * @date 2020-12-08 13:49
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
+     */
+    @GetMapping("getgrids/{infoId}")
+    public Result<List<SysDeptDTO>>getsubDetailGrids(@PathVariable("infoId") String infoId){
+        return subInfoGridRelationService.getsubDetailGrids(infoId);
+    }
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubInfoGridRelationDao.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.entity.SubInfoGridRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -51,4 +52,7 @@ public interface SubInfoGridRelationDao extends BaseDao<SubInfoGridRelationEntit
      * @return void
      */
     void deleteInfoByInfoId(String infoId);
+
+
+    List<SysDeptDTO> selectGrids(String infoId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubInfoGridRelationService.java

@@ -19,7 +19,9 @@ 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.SubInfoGridRelationDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.entity.SubInfoGridRelationEntity;
 
 import java.util.List;
@@ -101,4 +103,14 @@ public interface SubInfoGridRelationService extends BaseService<SubInfoGridRelat
     * @return java.util.List<com.elink.esua.epdc.entity.SubInfoGridRelationEntity>
     */
     List<SubInfoGridRelationEntity> selectListByInfoId(String infoId);
+
+    /*
+     *
+     * 根据infoId所属网格
+     * @param infoId
+     * @author wk
+     * @date 2020-12-10 10:52
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
+     */
+    Result<List<SysDeptDTO>> getsubDetailGrids(String infoId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubInfoGridRelationServiceImpl.java

@@ -23,8 +23,10 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.SubInfoGridRelationDao;
 import com.elink.esua.epdc.dto.SubInfoGridRelationDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.entity.SubInfoGridRelationEntity;
 import com.elink.esua.epdc.redis.SubInfoGridRelationRedis;
 import com.elink.esua.epdc.service.SubInfoGridRelationService;
@@ -106,4 +108,10 @@ public class SubInfoGridRelationServiceImpl extends BaseServiceImpl<SubInfoGridR
         return baseDao.selectListByInfoId(infoId);
     }
 
+    @Override
+    public Result<List<SysDeptDTO>> getsubDetailGrids(String infoId) {
+        List<SysDeptDTO> list = baseDao.selectGrids(infoId);
+        return new Result<List<SysDeptDTO>>().ok(list);
+    }
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubInfoGridRelationDao.xml

@@ -23,5 +23,18 @@
         WHERE INFO_ID = #{infoId}
     </delete>
 
+    <select id="selectGrids" resultType="com.elink.esua.epdc.dto.SysDeptDTO">
+        SELECT
+            a.GRID_ID as id,
+            b.`name`
+
+        FROM
+            `epdc_sub_info_grid_relation`  a
+            LEFT JOIN esua_epdc_admin.sys_dept  b on a.GRID_ID = b.id and b.del_flag = 0
+        WHERE
+             a.DEL_FLAG = 0
+            AND  a.INFO_ID = #{infoId}
+    </select>
+
 
 </mapper>