Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/controller/AppCockpitController.java

@@ -5,34 +5,30 @@ import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.core.board.dto.app.AppTaskRankingDto;
 import com.xunmei.core.board.service.AppCockpitService;
-import com.xunmei.core.board.service.CockpitService;
 import com.xunmei.core.board.vo.app.*;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
-
+import java.util.Date;
 /**
  * 驾驶舱
  *
  * @author xunmei
  * @date 2023-09-06
  */
-@Api(tags = {"驾驶舱"})
+@ApiOperation(value = "APP驾驶舱")
 @RestController
 @RequestMapping("/cockpit/app")
 //@RequiresPermissions("core:cockpit")
 public class AppCockpitController extends BaseController {
     @Resource
-    AppCockpitService cockpitService;
+    AppCockpitService appCockpitService;
 
     /**
      * 履职排名
@@ -40,7 +36,7 @@ public class AppCockpitController extends BaseController {
     @ApiOperation(value = "履职排名")
     @GetMapping("/ranking/resumption")
     public AjaxResult taskRanking(AppTaskRankingDto dto) {
-        List<AppTaskRankingVo> rankingVos = cockpitService.taskRanking(dto);
+        List<AppTaskRankingVo> rankingVos = appCockpitService.taskRanking(dto);
         return success(rankingVos);
     }
 
@@ -51,31 +47,32 @@ public class AppCockpitController extends BaseController {
     @ApiOperation(value = "基础信息")
     @GetMapping("/baseInfo")
     public AjaxResult baseInfo() {
-        AppBaseInfoVo vo = new AppBaseInfoVo();
-        vo.setSecurityFacilities(new AppBaseInfoSecurityFacilitiesVo());
-        vo.setBanking2015(new AppGa38RateVo());
-        vo.setOfflineATM2015(new AppGa38RateVo());
-        vo.setBanking2021(new AppGa38RateVo());
-        vo.setOfflineATM2021(new AppGa38RateVo());
-
-        vo.setBusinessStoreInfo(new HashMap<>());
-        vo.getBusinessStoreInfo().put("一类库", 50);
-        vo.getBusinessStoreInfo().put("二类库", 50);
-        vo.getBusinessStoreInfo().put("三类库", 50);
-        vo.getBusinessStoreInfo().put("四类库", 50);
-
-
-        vo.setSecurityPeopleInfo(new HashMap<>());
-        vo.getSecurityPeopleInfo().put("未配备", 40);
-        vo.getSecurityPeopleInfo().put("已配备", 40);
-
-        vo.setOnlineATMPropertyRight(new HashMap<>());
-        vo.getOnlineATMPropertyRight().put("穿墙式设备",40);
-        vo.getOnlineATMPropertyRight().put("大堂式设备",40);
-
-        vo.setOfflineATMPropertyRight(new HashMap<>());
-        vo.getOfflineATMPropertyRight().put("穿墙式设备",40);
-        vo.getOfflineATMPropertyRight().put("大堂式设备",40);
+        AppBaseInfoVo vo= appCockpitService.baseInfo();
+//        AppBaseInfoVo vo = new AppBaseInfoVo();
+//        vo.setSecurityFacilities(new AppBaseInfoSecurityFacilitiesVo());
+//        vo.setBanking2015(new AppGa38RateVo());
+//        vo.setOfflineATM2015(new AppGa38RateVo());
+//        vo.setBanking2021(new AppGa38RateVo());
+//        vo.setOfflineATM2021(new AppGa38RateVo());
+//
+//        vo.setBusinessStoreInfo(new HashMap<>());
+//        vo.getBusinessStoreInfo().put("一类库", 50);
+//        vo.getBusinessStoreInfo().put("二类库", 50);
+//        vo.getBusinessStoreInfo().put("三类库", 50);
+//        vo.getBusinessStoreInfo().put("四类库", 50);
+//
+//
+//        vo.setSecurityPeopleInfo(new HashMap<>());
+//        vo.getSecurityPeopleInfo().put("未配备", 40);
+//        vo.getSecurityPeopleInfo().put("已配备", 40);
+//
+//        vo.setOnlineATMPropertyRight(new HashMap<>());
+//        vo.getOnlineATMPropertyRight().put("穿墙式设备",40);
+//        vo.getOnlineATMPropertyRight().put("大堂式设备",40);
+//
+//        vo.setOfflineATMPropertyRight(new HashMap<>());
+//        vo.getOfflineATMPropertyRight().put("穿墙式设备",40);
+//        vo.getOfflineATMPropertyRight().put("大堂式设备",40);
         return success(vo);
     }
 
@@ -85,8 +82,47 @@ public class AppCockpitController extends BaseController {
     @ApiOperation(value = "总览")
     @GetMapping("/overview")
     public AjaxResult overview()   throws ExecutionException, InterruptedException, TimeoutException {
-        AppOverviewVo vo = cockpitService.overview();
+        AppOverviewVo vo = appCockpitService.overview();
+        return success(vo);
+    }
+
+    /**
+     * 综合数据-履职
+     */
+    @ApiOperation(value = "综合数据-履职")
+    @GetMapping("/synthetic/resumption")
+    public AjaxResult syntheticResumption(Date month) {
+        AppSyntheticResumptionVo vo = appCockpitService.syntheticResumption(month);
+        return success(vo);
+    }
 
+    /**
+     * 综合数据-问题整改
+     */
+    @ApiOperation(value = "综合数据-问题整改")
+    @GetMapping("/synthetic/question")
+    public AjaxResult syntheticQuestion(Date month) {
+        AppSyntheticQuestionVo vo = appCockpitService.syntheticQuestion(month);
+        return success(vo);
+    }
+
+    /**
+     * 综合数据-安全检查
+     */
+    @ApiOperation(value = "综合数据-安全检查")
+    @GetMapping("/synthetic/safethcheck")
+    public AjaxResult syntheticSafetycheck(Date month) {
+        AppSyntheticSafetycheckVo vo = appCockpitService.syntheticSafetyCheck(month);
+        return success(vo);
+    }
+
+    /**
+     * 综合数据-安全检查
+     */
+    @ApiOperation(value = "综合数据-其它")
+    @GetMapping("/synthetic/other")
+    public AjaxResult syntheticOther(Date month) {
+        AppSyntheticOtherVo vo = appCockpitService.syntheticOther(month);
         return success(vo);
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/controller/WebCockpitController.java

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
  * @author xunmei
  * @date 2023-09-06
  */
-@Api(tags = {"驾驶舱"})
+@ApiOperation(value = "驾驶舱")
 @RestController
 @RequestMapping("/cockpit")
 //@RequiresPermissions("core:cockpit")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/dto/app/AppOrgBaseInfoDto.java

@@ -0,0 +1,45 @@
+package com.xunmei.core.board.dto.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * APP驾驶舱机构基础信息
+ */
+@Data
+public class AppOrgBaseInfoDto {
+    @ApiModelProperty("机构总数")
+    private int total;
+    @ApiModelProperty("未达标数量")
+    private int unreachedCount;
+    @ApiModelProperty("营业网点数数量")
+    private int bankingCount;
+    @ApiModelProperty("离行数量")
+    private int offATMCount;
+    @ApiModelProperty("营业网点GA38-2021达标数量")
+    private int bankingGA382021 ;
+    @ApiModelProperty("营业网点GA38-20215达标数量")
+    private int bankingGA382015 ;
+    @ApiModelProperty("离行GA38-2021达标数量")
+    private int offATMGA382021 ;
+    @ApiModelProperty("离行GA38-2015达标数量")
+    private int offATMGA382015;
+    @ApiModelProperty("一类库数量")
+    private int businessLibraryOne;
+    @ApiModelProperty("二类库数量")
+    private int businessLibraryTwo;
+    @ApiModelProperty("三类库数量")
+    private int businessLibraryThree;
+    @ApiModelProperty("四类库数量")
+    private int businessLibraryFour;
+    @ApiModelProperty("有配置保安数量")
+    private int orgWithSecurityCount;
+    @ApiModelProperty("营业网点大堂式设备数量")
+    private int bankingObbyDeviceCount;
+    @ApiModelProperty("营业网点穿墙式设备数量")
+    private int bankingWallDeviceCount;
+    @ApiModelProperty("离行大堂式设备数量")
+    private int offATMObbyDeviceCount;
+    @ApiModelProperty("离行穿墙式设备数量")
+    private int offATMWallDeviceCount;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/dto/app/AppSyntheticTaskCategoryDto.java

@@ -0,0 +1,15 @@
+package com.xunmei.core.board.dto.app;
+
+import lombok.Data;
+
+/**
+ * APP综合数据，任务分类的完成信息
+ */
+@Data
+public class AppSyntheticTaskCategoryDto {
+    private String planType;
+
+    private int total;
+
+    private int completed;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/dto/app/AppTaskRankingDto.java

@@ -10,9 +10,9 @@ import lombok.Data;
  */
 @Data
 public class AppTaskRankingDto {
-    @ApiModelProperty("0：升序，1：降序")
-    public  int desc;
+    @ApiModelProperty(value = "0：升序，1：降序")
+    private Integer desc = 1;
 
-    @ApiModelProperty("月份")
-    public Date month;
+    @ApiModelProperty(value ="月份")
+    private Date month;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/mapper/AppCockpitMapper.java

@@ -2,10 +2,13 @@ package com.xunmei.core.board.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.core.board.dto.app.AppGA38InfoDto;
+import com.xunmei.core.board.dto.app.AppOrgBaseInfoDto;
 import com.xunmei.core.board.dto.app.AppOverviewTaskInfoDto;
+import com.xunmei.core.board.dto.app.AppSyntheticTaskCategoryDto;
 import com.xunmei.core.board.vo.app.AppOverviewVo;
 import org.apache.ibatis.annotations.Param;
 import  java.util.Date;
+import java.util.List;
 
 public interface AppCockpitMapper extends BaseMapper {
     /**
@@ -75,4 +78,13 @@ public interface AppCockpitMapper extends BaseMapper {
      * @return
      */
     AppOverviewTaskInfoDto selectOverViewQuestionInfo(@Param("orgPath") String orgPath, @Param("date") Date date);
+
+    /**
+     * 获取机构（暂时只查营业网点、离行）基础信息
+     * @param orgPath
+     * @return
+     */
+    AppOrgBaseInfoDto selectOrgBaseInfo(@Param("orgPath") String orgPath);
+
+    List<AppSyntheticTaskCategoryDto> selectSyntheticResumption (@Param("orgPath") String orgPath,@Param("startDate") Date startDate,@Param("endDate") Date endDate);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/AppCockpitService.java

@@ -1,13 +1,12 @@
 package com.xunmei.core.board.service;
 
 import com.xunmei.core.board.dto.app.AppTaskRankingDto;
-import com.xunmei.core.board.vo.app.AppBaseInfoVo;
-import com.xunmei.core.board.vo.app.AppOverviewVo;
-import com.xunmei.core.board.vo.app.AppTaskRankingVo;
+import com.xunmei.core.board.vo.app.*;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
+import  java.util.Date;
 
 public interface AppCockpitService {
     /**
@@ -28,4 +27,32 @@ public interface AppCockpitService {
      * @return
      */
     AppOverviewVo overview()  throws ExecutionException, InterruptedException, TimeoutException;
+
+    /**
+     * 综合数据-履职
+     * @param month
+     * @return
+     */
+    AppSyntheticResumptionVo syntheticResumption(Date month);
+
+    /**
+     * 综合数据-问题整改
+     * @param month
+     * @return
+     */
+    AppSyntheticQuestionVo syntheticQuestion(Date month);
+
+    /**
+     * 综合数据-安全检查
+     * @param month
+     * @return
+     */
+    AppSyntheticSafetycheckVo syntheticSafetyCheck(Date month);
+
+    /**
+     * 综合数据-其它
+     * @param month
+     * @return
+     */
+    AppSyntheticOtherVo syntheticOther(Date month);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/impl/AppCockpitServiceImpl.java

@@ -13,15 +13,13 @@ import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.board.dto.app.AppGA38InfoDto;
+import com.xunmei.core.board.dto.app.AppOrgBaseInfoDto;
 import com.xunmei.core.board.dto.app.AppOverviewTaskInfoDto;
 import com.xunmei.core.board.dto.app.AppTaskRankingDto;
 import com.xunmei.core.board.mapper.AppCockpitMapper;
 import com.xunmei.core.board.mapper.CockpitMapper;
 import com.xunmei.core.board.service.AppCockpitService;
-import com.xunmei.core.board.vo.app.AppBaseInfoVo;
-import com.xunmei.core.board.vo.app.AppOverviewItemVo;
-import com.xunmei.core.board.vo.app.AppOverviewVo;
-import com.xunmei.core.board.vo.app.AppTaskRankingVo;
+import com.xunmei.core.board.vo.app.*;
 import com.xunmei.core.board.vo.web.TaskStatisticVo;
 import com.xunmei.core.thread.ThreadPoolConfig;
 import com.xunmei.system.api.RemoteOrgService;
@@ -56,6 +54,12 @@ public class AppCockpitServiceImpl implements AppCockpitService {
     @Qualifier(ThreadPoolConfig.SOC_EXECUTOR)
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
+    /**
+     * 履职排名
+     *
+     * @param dto
+     * @return
+     */
     @Override
     public List<AppTaskRankingVo> taskRanking(AppTaskRankingDto dto) {
         DateRange range = DateUtils.getStartAndEnd(dto.getMonth(), CycleCommonEnum.MONTHLY);
@@ -104,9 +108,59 @@ public class AppCockpitServiceImpl implements AppCockpitService {
         return r;
     }
 
+    /**
+     * 基础信息
+     *
+     * @return
+     */
     @Override
     public AppBaseInfoVo baseInfo() {
-        return null;
+        SysOrg org = remoteOrgService.selectOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
+        if (ObjectUtil.isNull(org)) {
+            throw new ServiceException("登录机构不存在");
+        }
+
+        AppBaseInfoVo vo = new AppBaseInfoVo();
+        AppOrgBaseInfoDto baseInfoDto = appCockpitMapper.selectOrgBaseInfo(org.getPath());
+        vo.setSecurityFacilities(new AppBaseInfoSecurityFacilitiesVo());
+        vo.getSecurityFacilities().setGa382015(baseInfoDto.getBankingGA382015() + baseInfoDto.getOffATMGA382015());
+        vo.getSecurityFacilities().setGa382021(baseInfoDto.getBankingGA382021() + baseInfoDto.getOffATMGA382021());
+        vo.getSecurityFacilities().setGa38Unreached(baseInfoDto.getUnreachedCount());
+
+        vo.setBanking2021(new AppGa38RateVo());
+        vo.getBanking2021().setTotal(baseInfoDto.getBankingCount());
+        vo.getBanking2021().setRate(computeRate(baseInfoDto.getBankingCount(), baseInfoDto.getBankingGA382021()));
+
+        vo.setBanking2015(new AppGa38RateVo());
+        vo.getBanking2015().setTotal(baseInfoDto.getBankingCount());
+        vo.getBanking2015().setRate(computeRate(baseInfoDto.getBankingCount(), baseInfoDto.getBankingGA382015()));
+
+        vo.setOfflineATM2021(new AppGa38RateVo());
+        vo.getOfflineATM2021().setTotal(baseInfoDto.getOffATMCount());
+        vo.getOfflineATM2021().setRate(computeRate(baseInfoDto.getOffATMCount(), baseInfoDto.getOffATMGA382021()));
+
+        vo.setOfflineATM2015(new AppGa38RateVo());
+        vo.getOfflineATM2015().setTotal(baseInfoDto.getOffATMCount());
+        vo.getOfflineATM2015().setRate(computeRate(baseInfoDto.getOffATMCount(), baseInfoDto.getOffATMGA382015()));
+
+        vo.setBusinessStoreInfo(new HashMap<>());
+        vo.getBusinessStoreInfo().put("一类库", baseInfoDto.getBusinessLibraryOne());
+        vo.getBusinessStoreInfo().put("二类库", baseInfoDto.getBusinessLibraryTwo());
+        vo.getBusinessStoreInfo().put("三类库", baseInfoDto.getBusinessLibraryThree());
+        vo.getBusinessStoreInfo().put("四类库", baseInfoDto.getBusinessLibraryFour());
+
+        vo.setSecurityPeopleInfo(new HashMap<>());
+        vo.getSecurityPeopleInfo().put("已配备", baseInfoDto.getOrgWithSecurityCount());
+        vo.getSecurityPeopleInfo().put("未配备", baseInfoDto.getBankingCount() - baseInfoDto.getOrgWithSecurityCount());
+
+        vo.setOnlineATMPropertyRight(new HashMap<>());
+        vo.getOnlineATMPropertyRight().put("穿墙式设备", baseInfoDto.getOffATMWallDeviceCount());
+        vo.getOnlineATMPropertyRight().put("大堂式设备", baseInfoDto.getOffATMObbyDeviceCount());
+
+        vo.setOfflineATMPropertyRight(new HashMap<>());
+        vo.getOfflineATMPropertyRight().put("穿墙式设备", baseInfoDto.getOffATMWallDeviceCount());
+        vo.getOfflineATMPropertyRight().put("大堂式设备", baseInfoDto.getOffATMObbyDeviceCount());
+        return vo;
     }
 
     /**
@@ -192,36 +246,44 @@ public class AppCockpitServiceImpl implements AppCockpitService {
         return vo;
     }
 
+    @Override
+    public AppSyntheticResumptionVo syntheticResumption(Date month) {
+        return new AppSyntheticResumptionVo();
+    }
+
+    @Override
+    public AppSyntheticQuestionVo syntheticQuestion(Date month) {
+        return new AppSyntheticQuestionVo();
+    }
+
+    @Override
+    public AppSyntheticSafetycheckVo syntheticSafetyCheck(Date month) {
+        return new AppSyntheticSafetycheckVo();
+    }
+
+    @Override
+    public AppSyntheticOtherVo syntheticOther(Date month) {
+        return new AppSyntheticOtherVo();
+    }
+
     private AppOverviewItemVo computeOverviewItem(AppOverviewTaskInfoDto dto) {
 
         AppOverviewItemVo vo = new AppOverviewItemVo();
-        if(ObjectUtil.isNull(dto)){
+        if (ObjectUtil.isNull(dto)) {
             vo.setShouldComplete(0);
             vo.setCurrentCompletedCount(0);
             vo.setCurrentCompletedRate(0F);
             vo.setCompare(0F);
-            
-            return  vo;
+
+            return vo;
         }
         vo.setCurrentCompletedCount(dto.getCompleted());
         vo.setShouldComplete(dto.getTotal());
-        if (ObjectUtil.equal(dto.getTotal(), 0) || ObjectUtil.isNull(dto.getTotal())) {
-            vo.setCurrentCompletedRate(1F);
-        } else if (ObjectUtil.equal(dto.getCompleted(), 0) || ObjectUtil.isNull(dto.getCompleted())) {
-            vo.setCurrentCompletedCount(0);
-        } else {
-            vo.setCurrentCompletedRate(((float) dto.getCompleted()) / dto.getTotal());
-        }
-
-        float prevRate = 0;
-        if (ObjectUtil.equal(dto.getPrevTotal(), 0) || ObjectUtil.isNull(dto.getPrevTotal())) {
-            prevRate = 1F;
-        } else if (ObjectUtil.isNotNull(dto.getPrevCompleted())) {
-            prevRate = ((float) dto.getPrevCompleted()) / dto.getPrevTotal();
-        }
-
+        vo.setCurrentCompletedRate(computeRate(dto.getTotal(), dto.getCompleted()));
+        float prevRate = computeRate(dto.getPrevTotal(), dto.getPrevCompleted());
         vo.setPrevCompletedRate(prevRate);
         vo.setCompare(vo.getCurrentCompletedRate() - prevRate);
+
         return vo;
     }
 
@@ -235,15 +297,26 @@ public class AppCockpitServiceImpl implements AppCockpitService {
      */
     private AppOverviewItemVo computeGa38(int total, int completed, int currentCompleted, int prevCompleted) {
         AppOverviewItemVo vo = new AppOverviewItemVo();
-        if (ObjectUtil.equal(total, 0)) {
-            vo.setCurrentCompletedRate(1F);
-        } else {
-            vo.setCurrentCompletedRate(((float) completed) / total);
-        }
-
+        vo.setCurrentCompletedRate(computeRate(total, completed));
         vo.setCompare(((float) currentCompleted) - prevCompleted);
         vo.setCurrentCompletedCount(currentCompleted);
         return vo;
     }
 
+    /**
+     * 计算比例
+     *
+     * @param total
+     * @param divisor
+     * @return
+     */
+    private float computeRate(Integer total, Integer divisor) {
+        if (ObjectUtil.equal(total, 0) || ObjectUtil.isNull(total)) {
+            return 1F;
+        } else if (ObjectUtil.equal(divisor, 0) || ObjectUtil.isNull(divisor)) {
+            return 0F;
+        } else {
+            return (divisor.floatValue() / total.floatValue());
+        }
+    }
 }

soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -105,7 +105,7 @@
           and org_path like concat(#{orgPath}, '%')
     </select>
 
-    <select id="selectOrgBaseInfo">
+    <select id="selectOrgBaseInfo" resultType="com.xunmei.core.board.dto.app.AppOrgBaseInfoDto">
         SELECT
             count(0) as total,
             sum(if(oh.org_id is null,1,0)) as unreachedCount,
@@ -140,9 +140,27 @@
                             GROUP BY org_id) oh ON o.id = oh.org_id
                 LEFT JOIN sys_org_extend oe on o.id=oe.org_id
         WHERE
-            o.deleted = 0 and org_path like concat(#{orgPath}, '%')
+            o.deleted = 0 and path like concat(#{orgPath}, '%')
           AND (
                     o.type = 4
                 OR o.type = 5)
     </select>
+    <select id="selectSyntheticResumption" resultType="com.xunmei.core.board.dto.app.AppSyntheticTaskCategoryDto">
+        SELECT
+            p.plan_type,
+            count( 0 ) AS total,
+            sum(
+                    IF
+                        ( r.STATUS = 3, 1, 0 )) AS completed,
+            sum( r.exception_count ) AS exceptionCount
+        FROM
+            core_resumption r
+                INNER JOIN core_resumption_plan p ON r.plan_id = p.id
+        WHERE
+            r.ymd_date BETWEEN #{startDate}
+                AND #{endDate}
+          AND r.org_path LIKE CONCAT( #{orgPath}, '%' )
+        GROUP BY
+            p.plan_type
+    </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -9,7 +9,7 @@
         <result property="planName" column="plan_name"/>
         <result property="planCycle" column="plan_cycle"/>
         <result property="execOrgType" column="exec_org_type"/>
-        <result property="checkOrgType" column="check_org_type"/>
+<!--        <result property="checkOrgType" column="check_org_type"/>-->
         <result property="planStatus" column="plan_status"/>
         <result property="startDate" column="start_date"/>
         <result property="endDate" column="end_date"/>
@@ -40,7 +40,7 @@
         <result property="planCreateOrgName" column="plan_create_org_name"/>
         <result property="planOfOrgName" column="plan_of_org_name"/>
         <result property="execOrg" column="exec_org"/>
-        <result property="checkOrg" column="check_org"/>
+<!--        <result property="checkOrg" column="check_org"/>-->
         <!-- 角色关系映射 -->
         <collection property="roleList" ofType="com.xunmei.system.api.domain.SysRole">
             <result column="role_name" property="roleName"/>
@@ -192,9 +192,9 @@
     <select id="selectCoreSafecheckPlanPage" resultMap="CoreSafecheckPlanResult">
         SELECT
         GROUP_CONCAT(DISTINCT role_name) as role_names,
-        GROUP_CONCAT( tem.check_org_name) as check_org,
+#         GROUP_CONCAT( tem.check_org_name) as check_org,
         GROUP_CONCAT( tem.exec_org_name) as exec_org,
-        GROUP_CONCAT( tem.dict_label) as type_names,
+        GROUP_CONCAT(DISTINCT tem.dict_label) as type_names,
         tem.*
         FROM
         (