注释流程测试类

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -6,6 +6,7 @@ import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
+import com.huaxu.task.dto.PlanManageDto;
 import com.huaxu.task.entity.PlanManage;
 import com.huaxu.task.service.PlanManageService;
 import com.huaxu.util.DatesUtil;
@@ -76,38 +77,38 @@ public class PlanManageController {
 
     @GetMapping("/plan/select")
     @ApiOperation(value = "查询巡检计划")
-    public AjaxMessage<List<PlanManage>> selectPlan(
+    public AjaxMessage<Pagination<PlanManageDto>> selectPlan(
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "计划单号或计划名称", required = true) @RequestParam(required = false) String key,
             @ApiParam(value = "计划安排起始日期", required = true) @RequestParam(required = false) String startDate,
             @ApiParam(value = "计划安排截至日期", required = true) @RequestParam(required = false) String endDate){
 
+        PlanManageDto planManageDto = new PlanManageDto();
         //根据用户编号，获取用户的权限
         LoginUser loginUser = UserUtil.getCurrentUser();
-        Map<String,Object> map =new HashMap<String,Object>();
-        map.put("tenantId",loginUser.getTenantId());
-        map.put("key",key);
-        map.put("startDate",startDate);
-        map.put("endDate",endDate);
-        map.put("permissonType",loginUser.getPermissonType());
-        map.put("programItem",loginUser.getProgramItemList());
-        IPage<PlanManage> iPage = new Page<>(pageNum, pageSize);
-
-
-//        iPage = planManageService.selectPlanByIdAndDate(iPage, alarmSettingDto);
-//        Pagination<AlarmSettingDto> pages = new Pagination<>(iPage);
-//        for(AlarmSettingDto alarm : pages.getList()){
-//            alarm.setCompanyOrgName(orgInfoUtil.getOrgName(alarm.getCompanyOrgId()));
-//            alarm.setDeptOrgName(orgInfoUtil.getOrgName(alarm.getDeptOrgId()));
-//        }
-//        return new AjaxMessage<>(ResultStatus.OK, pages);
-
-        List<PlanManage> list = planManageService.selectPlanByIdAndDate(map);
-
-
+//        Map<String,Object> map =new HashMap<String,Object>();
+//        map.put("tenantId",loginUser.getTenantId());
+//        map.put("key",key);
+//        map.put("startDate",startDate);
+//        map.put("endDate",endDate);
+//        map.put("permissonType",loginUser.getPermissonType());
+//        map.put("programItem",loginUser.getProgramItemList());
+//        IPage<PlanManage> iPage = new Page<>(pageNum, pageSize);
+        planManageDto.setTenantId(loginUser.getTenantId());
+        planManageDto.setProgramItems(loginUser.getProgramItemList());
+        planManageDto.setUserType(loginUser.getType());
+        //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
+        planManageDto.setPermissonType(loginUser.getPermissonType());
+        IPage<PlanManageDto> iPage = new Page<>(pageNum, pageSize);
+        iPage = planManageService.selectPage(iPage, planManageDto);
+        Pagination<PlanManageDto> pages = new Pagination<>(iPage);
+        for(PlanManageDto plan : pages.getList()){
+            //plan.setCompanyOrgName(orgInfoUtil.getOrgName(plan.getCompanyOrgId()));
+            //plan.setDeptOrgName(orgInfoUtil.getOrgName(plan.getDeptOrgId()));
+        }
+        return new AjaxMessage<>(ResultStatus.OK, pages);
 
-        return new AjaxMessage<List<PlanManage>>(ResultStatus.OK,list);
     }
 
 

operation_manager/src/main/java/com/huaxu/task/dao/PlanManageMapper.java

@@ -1,7 +1,11 @@
 package com.huaxu.task.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaxu.task.dto.PlanManageDto;
 import com.huaxu.task.entity.PlanManage;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -18,4 +22,6 @@ public interface PlanManageMapper {
     int updateByPrimaryKeySelective(PlanManage record);
 
     List<PlanManage> selectPlanByIdAndDate(Map<String,Object> map);
+
+    Page<PlanManageDto> findPage(IPage<PlanManageDto> page, @Param("plan") PlanManageDto planManageDto);
 }

operation_manager/src/main/java/com/huaxu/task/dto/PlanManageDto.java

@@ -1,4 +1,55 @@
 package com.huaxu.task.dto;
 
-public class PlanManageDto {
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.huaxu.model.ProgramItem;
+import com.huaxu.task.entity.PlanManage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("计划管理")
+public class PlanManageDto extends PlanManage {
+    /**
+     * 所属公司id
+     */
+    @ApiModelProperty(value = "所属公司id")
+    private Integer companyOrgId;
+    /**
+     * 所属公司名称
+     */
+    @ApiModelProperty(value = "所属公司名称")
+    private String companyOrgName;
+    /**
+     * 所属部门id
+     */
+    @ApiModelProperty(value = "所属部门id")
+    private Integer deptOrgId;
+    /**
+     * 所属部门名称
+     */
+    @ApiModelProperty(value = "所属部门名称")
+    private String deptOrgName;
+    /**
+     * 权限
+     */
+    @ApiModelProperty(value ="权限",hidden = true)
+    @JsonIgnore
+    private List<ProgramItem> programItems;
+    /**
+     * 属性名称
+     */
+    @ApiModelProperty(value="用户权限类型",hidden = true)
+    @JsonIgnore
+    private Integer permissonType;
+    /**
+     * 用户类型
+     */
+    @ApiModelProperty(value = "用户类型(-9999 超管 -999普通用户 2普通用户)",hidden = true)
+    @JsonIgnore
+    private String userType;
+
+
 }

operation_manager/src/main/java/com/huaxu/task/service/PlanManageService.java

@@ -1,5 +1,7 @@
 package com.huaxu.task.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.task.dto.PlanManageDto;
 import com.huaxu.task.entity.PlanManage;
 
 import java.util.List;
@@ -17,9 +19,8 @@ public interface PlanManageService {
     int updateByPrimaryKeySelective(PlanManage record);
 
     /**
-     * 按计划单号或计划名称及时间查询巡检计划
-     * @param map
-     * @return
+     *分页查询巡检计划单
      */
-    List<PlanManage> selectPlanByIdAndDate(Map<String,Object> map);
+    IPage<PlanManageDto> selectPage(IPage<PlanManageDto> page, PlanManageDto planManageDto);
+
 }

operation_manager/src/main/java/com/huaxu/task/service/impl/PlanManageServiceImpl.java

@@ -1,6 +1,8 @@
 package com.huaxu.task.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.task.dao.PlanManageMapper;
+import com.huaxu.task.dto.PlanManageDto;
 import com.huaxu.task.entity.PlanManage;
 import com.huaxu.task.service.PlanManageService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,9 +28,8 @@ public class PlanManageServiceImpl implements PlanManageService {
     }
 
     @Override
-    public List<PlanManage> selectPlanByIdAndDate(Map<String, Object> map) {
-        return planManageMapper.selectPlanByIdAndDate(map);
+    public IPage<PlanManageDto> selectPage(IPage<PlanManageDto> page, PlanManageDto planManageDto){
+        return planManageMapper.findPage(page,planManageDto);
     }
 
-
 }

operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -303,4 +303,48 @@
     order by date_create desc
   </select>
 
+
+  <select id="findPage" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from sc_plan_manage t1
+    <where>
+      <if test="plan.tenantId != null and plan.tenantId != ''">
+        and t1.tenant_id = #{plan.tenantId}
+      </if>
+      <if test="plan.key != null and plan.key != ''">
+        and (t1.plan_id like CONCAT('%',#{plan.key},'%') or t1.plan_name like CONCAT('%',#{plan.key},'%'))
+      </if>
+      <if test="plan.userType!=null and plan.userType!=-999 and plan.userType!=-9999 and  plan.programItems != null and plan.programItems.size() > 0">
+        <if test="plan.permissonType == 5 or alarm.plan == 2">
+          and ( t1.DEPT_ORG_ID in
+          <foreach collection="plan.programItems" item="item" open="(" close=")" separator=",">
+            #{item.orgId}
+          </foreach>
+          or
+          t1.COMPANY_ORG_ID in
+          <foreach collection="plan.programItems" item="item" open="(" close=")" separator=",">
+            #{item.orgId}
+          </foreach>
+          )
+        </if>
+        <if test="plan.permissonType == 4 or plan.permissonType == 3">
+          and t2.DEPT_ORG_ID in
+          <foreach collection="plan.programItems" item="item" open="(" close=")" separator=",">
+            #{item.orgId}
+          </foreach>
+        </if>
+        <if test="plan.permissonType == 1">
+          and t1.COMPANY_ORG_ID in
+          <foreach collection="plan.programItems" item="item" open="(" close=")" separator=",">
+            #{item.orgId}
+          </foreach>
+          and (t1.DEPT_ORG_ID is null or t1.DEPT_ORG_ID =0)
+        </if>
+      </if>
+      and t1.plan_status =  #{planStatus,jdbcType=INTEGER}
+    </where>
+    order by t1.date_create
+  </select>
+
 </mapper>