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

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/KpiGridIdsFormDTO.java

@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 阵地建设 - 详情查询网格数据接收类
+ *
+ * @author sarnath
+ * @version 1.0
+ * @date 2020-12-08 11:18
+ */
+@Data
+public class KpiGridIdsFormDTO implements Serializable {
+    //部门类型
+    private String type;
+    //部门id
+    private String gridId;
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -18,6 +18,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
@@ -348,4 +349,16 @@ public class SysDeptController {
         List<ExportKpiResultDTO> list = sysDeptService.getExportTemplateInfo(formDTO);
         return new Result<List<ExportKpiResultDTO>>().ok(list);
     }
+    /*
+     *
+     * 根据部门id和部门类型查询 所属网格
+     * @author wk
+     * @date 2020-12-08 11:16
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
+     */
+    @GetMapping("getKpiGridIds")
+    public Result<List<SysDeptDTO>> getKpiGridIds(KpiGridIdsFormDTO dto){
+        List<SysDeptDTO> list= sysDeptService.getKpiGridIds(dto);
+        return new Result<List<SysDeptDTO>>().ok(list);
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -12,6 +12,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
@@ -230,4 +231,13 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @Date 2020-06-15
      **/
     List<ExportKpiResultDTO> getExportTemplateInfo(ExportTemplateInfoFormDTO formDTO);
+    /*
+     *
+     * 根据部门id和部门类型查询 所属网格
+     * @param dto
+     * @author wk
+     * @date 2020-12-08 13:25
+     * @return java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
+     */
+    List<SysDeptDTO> selectKpiGrids (KpiGridIdsFormDTO dto);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -14,6 +14,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
@@ -310,4 +311,13 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @Date 2020-06-15
      **/
     List<ExportKpiResultDTO> getExportTemplateInfo(ExportTemplateInfoFormDTO formDTO);
+
+    /*
+     * 根据部门id和部门类型查询 所属网格
+     * @param dto
+     * @author wk
+     * @date 2020-12-08 13:22
+     * @return java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
+     */
+    List<SysDeptDTO> getKpiGridIds(KpiGridIdsFormDTO dto);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -33,6 +33,7 @@ import com.elink.esua.epdc.dao.SysDeptDao;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
@@ -1106,4 +1107,16 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     public List<ExportKpiResultDTO> getExportTemplateInfo(ExportTemplateInfoFormDTO formDTO) {
         return baseDao.getExportTemplateInfo(formDTO);
     }
+
+    /*
+     *
+     * 根据部门id和部门类型查询 所属网格
+     * @author wk
+     * @date 2020-12-08 13:24
+     * @return java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
+     */
+    @Override
+    public List<SysDeptDTO> getKpiGridIds(KpiGridIdsFormDTO dto) {
+        return baseDao.selectKpiGrids(dto);
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -409,4 +409,24 @@
             and sd.type_key = #{deptTypeKey}
         </if>
     </select>
+
+    <select id="selectKpiGrids" resultType="com.elink.esua.epdc.dto.SysDeptDTO">
+        SELECT
+            d.id,
+			d.`name`
+        FROM
+            sys_dept d
+        WHERE
+        1=1
+        <if test='type != "grid_party"'>
+            and  d.pids LIKE '%${gridId}%'
+            AND NOT EXISTS
+            ( SELECT 1 FROM sys_dept dd WHERE dd.pid = d.id )
+            and
+            d.type_key like 'grid_party'
+        </if>
+        <if test='type == "grid_party"'>
+            and d.id = #{gridId}
+        </if>
+    </select>
 </mapper>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckDetailController.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.SubPositionCheckDetailDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.excel.SubPositionCheckDetailExcel;
 import com.elink.esua.epdc.service.SubPositionCheckDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ import java.util.Map;
  * @since v1.0.0 2020-12-07
  */
 @RestController
-@RequestMapping("subpositioncheckdetail")
+@RequestMapping("subdetail")
 public class SubPositionCheckDetailController {
     
     @Autowired
@@ -90,5 +91,16 @@ public class SubPositionCheckDetailController {
         List<SubPositionCheckDetailDTO> list = subPositionCheckDetailService.list(params);
         ExcelUtils.exportExcelToTarget(response, null, list, SubPositionCheckDetailExcel.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")
+    public Result<List<SysDeptDTO>>getsubDetailGrids(){
+        return subPositionCheckDetailService.getsubDetailGrids();
+    }
 
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -5,10 +5,12 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
 import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -105,4 +107,15 @@ public interface AdminFeignClient {
      */
     @PostMapping("/sys/dept/getExportTemplateInfo")
     Result<List<ExportKpiResultDTO>> getExportTemplateInfo(ExportTemplateInfoFormDTO exportTemplateInfoFormDTO);
+
+    /*
+     *
+     * 根据部门id和部门类型查询 所属网格
+     * @param dto
+     * @author wk
+     * @date 2020-12-08 13:57
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
+     */
+    @GetMapping("/sys/dept/getKpiGridIds")
+    Result<List<SysDeptDTO>> getKpiGridIds(KpiGridIdsFormDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
@@ -63,4 +64,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getExportTemplateInfo", exportTemplateInfoFormDTO);
     }
 
+    @Override
+    public Result<List<SysDeptDTO>> getKpiGridIds(KpiGridIdsFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getKpiGridIds", dto);
+    }
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckDetailService.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.SubPositionCheckDetailDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.entity.SubPositionCheckDetailEntity;
 
 import java.util.List;
@@ -92,4 +94,12 @@ public interface SubPositionCheckDetailService extends BaseService<SubPositionCh
      * @date 2020-12-07
      */
     void delete(String[] ids);
+    /*
+     *
+     * 根据部门id和部门类型查询 所属网格
+     * @author wk
+     * @date 2020-12-08 13:48
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
+     */
+    Result<List<SysDeptDTO>> getsubDetailGrids();
 }

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

@@ -21,11 +21,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.security.user.SecurityUser;
 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.SubPositionCheckDetailDao;
 import com.elink.esua.epdc.dto.SubPositionCheckDetailDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO;
 import com.elink.esua.epdc.entity.SubPositionCheckDetailEntity;
+import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.redis.SubPositionCheckDetailRedis;
 import com.elink.esua.epdc.service.SubPositionCheckDetailService;
 import org.apache.commons.lang3.StringUtils;
@@ -33,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.security.Security;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -49,6 +55,8 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
     @Autowired
     private SubPositionCheckDetailRedis subPositionCheckDetailRedis;
 
+    private AdminFeignClient  adminFeignClient;
+
     @Override
     public PageData<SubPositionCheckDetailDTO> page(Map<String, Object> params) {
         IPage<SubPositionCheckDetailEntity> page = baseDao.selectPage(
@@ -101,4 +109,24 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /*
+     *
+     * 根据部门id和部门类型查询 所属网格
+     * @author wk
+     * @date 2020-12-08 13:48
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
+     */
+    @Override
+    public Result<List<SysDeptDTO>> getsubDetailGrids() {
+        //获取登录用户部门id
+        Long deptId =   SecurityUser.getUser().getDeptId();
+        Result<SysDeptDTO> res =  adminFeignClient.get(deptId);
+        KpiGridIdsFormDTO formDTO = new KpiGridIdsFormDTO();
+        Long gridId =   res.getData().getId();
+        formDTO.setGridId(gridId.toString());
+        String type = res.getData().getTypeKey();
+        formDTO.setType(type);
+        return adminFeignClient.getKpiGridIds(formDTO);
+    }
+
 }