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

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationDTO.java

@@ -106,4 +106,5 @@ public class CoreMonitoringTaskRegistrationDTO  extends PageRequest {
     /** 异常数 */
     @ApiModelProperty(value = "异常数")
     private Integer exceptionCount;
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -133,13 +133,23 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             TMonitoringRetrievalPlan plan1 = tMonitoringRetrievalPlanMapper.selectById(plan.getParentId());
             tMonitoringRetrievalPlanVO.setParentFrequency(plan1.getPlanFrequency());
         }
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("is_deleted",0);
+        queryWrapper.eq("parent_id",id);
+        List<TMonitoringRetrievalPlan> list = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
+        list.add(plan);
+        List<Long> collect = list.stream().map(TMonitoringRetrievalPlan::getId).collect(Collectors.toList());
         boolean isEdit = false;
         boolean isComplete = false;
         if (plan.getParentId() != null) {
             isEdit = true;
         }
         tMonitoringRetrievalPlanVO.setIsEdit(isEdit);
-        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectComplete(id);
+        List<String>status=new ArrayList<>();
+        status.add("2");
+        status.add("3");
+        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(collect, status);
+
         if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks) && plan.getParentId() == null) {
             isComplete = true;
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluatePlanController.java

@@ -1,6 +1,7 @@
 package com.xunmei.core.evaluate.controller;
 
 
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -8,10 +9,14 @@ import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.evaluate.domain.CoreEvaluatePlan;
 import com.xunmei.core.evaluate.dto.CoreEvaluatePlanDTO;
 import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
 import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
+import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,15 +37,21 @@ import java.util.List;
 public class CoreEvaluatePlanController extends BaseController {
     @Autowired
     private ICoreEvaluatePlanService coreEvaluatePlanService;
-
+    @Autowired
+    private RemoteOrgService remoteOrgService;
     /**
      * 查询外包评价计划列表
      */
     @ApiOperation(value = "查询CoreEvaluatePlan列表分页")
     @RequiresPermissions("core:evaluatePlan:list")
     @GetMapping("/list")
-    public TableDataInfo list(EvaluateQueryDTO coreEvaluatePlan) {
-        return coreEvaluatePlanService.selectPage(coreEvaluatePlan);
+    public AjaxResult list(EvaluateQueryDTO coreEvaluatePlan) {
+        AjaxResult ajax = AjaxResult.success();
+        SysOrg sysOrg = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
+        TableDataInfo<CoreEvaluatePlanListVO> coreEvaluatePlanListVOTableDataInfo = coreEvaluatePlanService.selectPage(coreEvaluatePlan);
+        ajax.put("data", coreEvaluatePlanListVOTableDataInfo);
+        ajax.put("isEdit", sysOrg.getId());
+        return ajax;
     }
 
     @ApiOperation(value = "查询CoreEvaluatePlan列表全部")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -164,6 +164,7 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
      */
     List<CoreMonitoringRetrievalTask> selectCompleteByPlanId(Long planId);
 
+
     void deleteWaitTaskByPlanId(@Param("planId") Long planId);
 
     void updateDeleteTaskByPlanId(@Param("planId") Long planId, @Param("isDeleted") Integer isDeleted);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -149,16 +149,12 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Override
     public TableDataInfo selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
+        coreMonitoringTaskRegistrationDTO.setRetrievalUser(SecurityUtils.getUserId());
         if (null == coreMonitoringTaskRegistrationDTO.getOrgId()) {
             coreMonitoringTaskRegistrationDTO.setOrgId(loginUser.getOrgId());
         }
         Page<AppCoreMonitoringRetrievalTaskVO> coreMonitoringRetrievalTaskPage = baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO.getPageRequest(), coreMonitoringTaskRegistrationDTO);
-        TableDataInfo<AppCoreMonitoringRetrievalTaskVO> tableDataInfo = new TableDataInfo();
-        tableDataInfo.setMsg("操作成功");
-        tableDataInfo.setCode(200);
-        tableDataInfo.setTotal(coreMonitoringRetrievalTaskPage.getTotal());
-        tableDataInfo.setRows(coreMonitoringRetrievalTaskPage.getRecords());
-        return tableDataInfo;
+        return TableDataInfo.build(coreMonitoringRetrievalTaskPage);
     }
 
 
@@ -175,7 +171,6 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public List<CoreMonitoringRetrievalTask> selectComplete(Long planId) {
-
         return coreMonitoringRetrievalTaskMapper.selectCompleteByPlanId(planId);
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/access/TMonitoringRetrievalPlanMapper.xml

@@ -79,7 +79,7 @@
     <select id="selectPageList" resultType="com.xunmei.core.access.vo.TMonitoringRetrievalPlanVO">
         SELECT
         IFNULL( b.org_id, a.org_id ) AS parentOrgId,
-        a.id,
+        a.id as id,
         a.plan_name,
         a.org_id,
         a.org_name,

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluatePlanMapper.xml

@@ -60,6 +60,7 @@
         a.id,
         a.org_name,
         a.evaluate_name,
+               a.org_id,
                a.build_task_now,
         d.dict_label AS orgType,
         GROUP_CONCAT( c.role_name ) AS roleName,

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -158,6 +158,7 @@
         <if test="request.moth !=null">
             and a.ymd_date like concat('%', #{request.moth}, '%')
         </if>
+        AND a.role_id IN (SELECT role_id FROM sys_user_role WHERE user_id=#{request.retrievalUser})
         GROUP BY
         a.id
         ORDER BY FIELD(a.`status`,'1','0','2','3'),

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -411,6 +411,8 @@
         (
         SELECT
         h.user_id AS is_manager,
+<!--        ur. role_names,-->
+<!--        ur. roleIds,-->
         GROUP_CONCAT(sr.role_name) role_names,
         CONCAT(",",GROUP_CONCAT( sr.id ),",") as roleIds,
         u.id,
@@ -453,6 +455,10 @@
         sys_user u
         LEFT JOIN sys_org o ON u.original_org_id = o.id
         LEFT JOIN ( SELECT user_id FROM sys_user_role uo LEFT JOIN sys_role ro ON uo.role_id = ro.id WHERE ro.role_name
+<!--        LIKE '%安全保卫管理人员' group by user_id) h ON h.user_id = u.id-->
+<!--        LEFT JOIN (select sro.user_id, GROUP_CONCAT(sr.role_name) role_names,-->
+<!--        CONCAT(",",GROUP_CONCAT( sr.id ),",") as roleIds from sys_user_role sro-->
+<!--        LEFT JOIN sys_role sr on sro.role_id=sr.id) ur on ur.user_id = u.id-->
         LIKE '%安全保卫管理人员' ) h ON h.user_id = u.id
         LEFT JOIN sys_user_role sro on u.id=sro.user_id
         LEFT JOIN sys_role sr on sro.role_id=sr.id
@@ -502,10 +508,10 @@
         <if test="info.onlyManager ==true">
             AND t.is_manage ='Y'
         </if>
-<!--        <if test="info.onlyManager ==false or info.onlyManager==null">-->
-<!--            AND (t.is_manage is NULL OR t.is_manage ='N')-->
-<!--        </if>-->
-        ORDER BY t.org_id DESC
+        <!--        <if test="info.onlyManager ==false or info.onlyManager==null">-->
+        <!--            AND (t.is_manage is NULL OR t.is_manage ='N')-->
+        <!--        </if>-->
+        ORDER BY  t.org_id DESC, t.id DESC
     </select>
     <select id="selectrolesByOrgId" resultType="com.xunmei.system.api.domain.SysRole">
         SELECT r.*
@@ -707,32 +713,28 @@
         </foreach>
     </select>
     <select id="selectSecurityUser" resultType="com.xunmei.system.util.SecurityUserExport">
-        SELECT
-            c.id AS orgId,
-            c.short_name AS orgName,
-            b.`name` AS name,
-            IFNULL( b.gender, 2 ) AS gender,
-            b.card AS card,
-            TIMESTAMPDIFF( YEAR, a.born_time, NOW() ) AS age,
-            a.dept_id AS departmentName,
-            a.duties AS nowDuties,
-            a.is_full_time AS isFullTime,
-            a.work_type AS workType,
-            a.entry_time AS entryTime,
-            TIMESTAMPDIFF( MONTH, a.work_time, NOW() ) AS workDuration,
-            a.highest_education AS highestEducation,
-            a.education_type AS educationType,
-            a.professional_qualifications AS professionalQualifications,
-            a.certificate_work AS certificateWork,
-            a.certificate_fail_reason AS certificateFailReason,
-            a.responsibilities_leader_name AS responsibilitiesLeaderName,
-            a.responsibilities_leader_duties AS responsibilitiesLeaderDuties
-        FROM
-            sys_user_information a
-                LEFT JOIN sys_user b ON a.user_id = b.id
-                LEFT JOIN sys_org c ON c.id = b.org_id
-        WHERE
-            b.deleted = 0
-
+        SELECT c.id                                     AS orgId,
+               c.short_name                             AS orgName,
+               b.`name`                                 AS name,
+               IFNULL(b.gender, 2)                      AS gender,
+               b.card                                   AS card,
+               TIMESTAMPDIFF(YEAR, a.born_time, NOW())  AS age,
+               a.dept_id                                AS departmentName,
+               a.duties                                 AS nowDuties,
+               a.is_full_time                           AS isFullTime,
+               a.work_type                              AS workType,
+               a.entry_time                             AS entryTime,
+               TIMESTAMPDIFF(MONTH, a.work_time, NOW()) AS workDuration,
+               a.highest_education                      AS highestEducation,
+               a.education_type                         AS educationType,
+               a.professional_qualifications            AS professionalQualifications,
+               a.certificate_work                       AS certificateWork,
+               a.certificate_fail_reason                AS certificateFailReason,
+               a.responsibilities_leader_name           AS responsibilitiesLeaderName,
+               a.responsibilities_leader_duties         AS responsibilitiesLeaderDuties
+        FROM sys_user_information a
+                 LEFT JOIN sys_user b ON a.user_id = b.id
+                 LEFT JOIN sys_org c ON c.id = b.org_id
+        WHERE b.deleted = 0
     </select>
 </mapper>