普测计划模块代码提交

process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java

@@ -1,5 +1,7 @@
 package com.njcn.process.controller;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
@@ -7,10 +9,10 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.process.pojo.param.RGeneralSurveyPlanAddParm;
-import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm;
-import com.njcn.process.pojo.param.RGeneralSurveyPlandetailQueryParm;
-import com.njcn.process.pojo.param.SurveyResultUploadParam;
+import com.njcn.poi.util.PoiUtil;
+import com.njcn.process.pojo.param.*;
+import com.njcn.process.pojo.po.SurveyPlanExcel;
+import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO;
 import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO;
 import com.njcn.process.service.RGeneralSurveyPlanDetailService;
 import com.njcn.process.service.RGeneralSurveyPlanPOService;
@@ -20,10 +22,12 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -46,14 +50,16 @@ public class RGeneralSurveyPlanController extends BaseController {
 
     private @Autowired
     RGeneralSurveyPlanDetailService rGeneralSurveyPlanDetailService;
-    /**
-     * 查询所有数据
-     * @author qijian
-     * @date 2022/11/11
-     */
+    /** 
+    * @Description: 新增/修改普测计划
+    * @Param: [rGeneralSurveyPlanAddParm] 
+    * @return: com.njcn.common.pojo.response.HttpResult<java.lang.Boolean> 
+    * @Author: clam
+    * @Date: 2022/11/22 
+    */ 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/addPlan")
-    @ApiOperation("新增普测计划")
+    @ApiOperation("新增/修改普测计划")
     @ApiImplicitParam(name = "rGeneralSurveyPlanAddParm", value = "新增普测计划参数", required = true)
     public HttpResult<Boolean> addPlan(@RequestBody RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm){
         String methodDescribe = getMethodDescribe("addPlan");
@@ -75,7 +81,7 @@ public class RGeneralSurveyPlanController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryPlan")
-    @ApiOperation("查询普测计划")
+    @ApiOperation("查询普测计划-新建页面")
     @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true)
     public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlan(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
         String methodDescribe = getMethodDescribe("queryPlan");
@@ -84,6 +90,28 @@ public class RGeneralSurveyPlanController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryPlanAudit")
+    @ApiOperation("查询普测计划-审核页面")
+    @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true)
+    public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
+        String methodDescribe = getMethodDescribe("queryPlanAudit");
+
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/queryPlanResult")
+    @ApiOperation("查询普测计划-结果页面")
+    @ApiImplicitParam(name = "rGeneralSurveyPlanQueryParm", value = "普测计划查询参数", required = true)
+    public HttpResult<IPage<RGeneralSurveyPlanVO>> queryPlanResult(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){
+        String methodDescribe = getMethodDescribe("queryPlanResult");
+
+        IPage<RGeneralSurveyPlanVO> rGeneralSurveyPlanVOS  = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/queryPlandetail")
     @ApiOperation("根据planNO查询普测计划详情")
@@ -95,6 +123,8 @@ public class RGeneralSurveyPlanController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanDetailVOIPage, methodDescribe);
     }
 
+
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPLOAD)
     @PostMapping("/surveyResultUpload")
     @ApiOperation("上传普测结果报告")
@@ -121,4 +151,39 @@ public class RGeneralSurveyPlanController extends BaseController {
 
     }
 
+    @ResponseBody
+    @ApiOperation("导出普测计划信息")
+    @PostMapping(value = "exportSurveyPlan")
+    @ApiImplicitParam(name = "planIdList", value = "普测计划详情查询参数", required = true)
+    public HttpResult<String> exportSurveyPlan(HttpServletResponse response,@RequestBody List<String> planIdList) {
+        String methodDescribe = getMethodDescribe("exportSurveyPlan");
+        String fileName = "普测计划信息.xls";
+        List<SurveyPlanExcel> baseExcelList = null;
+        try {
+            baseExcelList = rGeneralSurveyPlanPOService.exportSurveyPlan(planIdList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
+        }
+        ExportParams exportExcel = new ExportParams("普测计划信息", "普测计划信息");
+        Workbook workbook = ExcelExportUtil.exportExcel(exportExcel, SurveyPlanExcel.class, baseExcelList);
+        PoiUtil.exportFileByWorkbook(workbook, fileName, response);
+        return null;
+    }
+
+    @ResponseBody
+    @ApiOperation("普测计划信息问题件新增查询")
+    @PostMapping(value = "querySurveyPlanOnQuestion")
+    @ApiImplicitParam(name = "questionQueryParm", value = "普测计划信息问题件查询参数", required = true)
+    public  HttpResult<List<RGeneralSurveyPlanDetailOnQuestionVO>>  querySurveyPlanOnQuestion(@Validated @RequestBody SurveyPlanQuestionQueryParm questionQueryParm) {
+        String methodDescribe = getMethodDescribe("querySurveyPlanOnQuestion");
+
+        List<RGeneralSurveyPlanDetailOnQuestionVO> list= rGeneralSurveyPlanPOService.querySurveyPlanOnQuestion(questionQueryParm);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+
+    }
+
+
+
 }

process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java

@@ -1,7 +1,13 @@
 package com.njcn.process.mapper;
 
 import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm;
 import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail;
+import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 
@@ -13,4 +19,18 @@ import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail;
  * @version V1.0.0
  */
 public interface RGeneralSurveyPlanDetailMapper extends MppBaseMapper<RGeneralSurveyPlanDetail> {
+    @Select ("SELECT\n" +
+            "\ta.plan_name as planName,\n" +
+            "\tb.voltage_level as voltageLevel,\n" +
+            "\tb.sub_id as subId,\n" +
+            "\tb.sub_name as subName,\n" +
+            "\tb.busbar_id as busbarId,\n" +
+            "\tb.busbar_name as busbarName\n" +
+            "FROM\n" +
+            "\tr_general_survey_plan a\n" +
+            "INNER JOIN r_general_survey_plan_detail b ON a.plan_no = b.plan_no\n" +
+            "WHERE\n" +
+            "\ta.org_no = #{questionQueryParm.orgNo} and a.plan_name LIKE CONCAT('%', #{questionQueryParm.planName}, '%')\n" +
+            "AND DATE_FORMAT(a.upload_time, '%Y%m') = DATE_FORMAT(#{questionQueryParm.planStartTime}, '%Y%m')")
+    List<RGeneralSurveyPlanDetailOnQuestionVO> querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm);
 }

process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanPOMapper.java

@@ -13,4 +13,5 @@ import com.njcn.process.pojo.po.RGeneralSurveyPlanPO;
  * @version V1.0.0
  */
 public interface RGeneralSurveyPlanPOMapper extends MppBaseMapper<RGeneralSurveyPlanPO> {
+
 }

process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java

@@ -1,97 +0,0 @@
-package com.njcn.process.pojo.param;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Description:
- * 接口文档访问地址：http://serverIP:port/swagger-ui.html
- * Date: 2022/11/11  15:20【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm")
-@Data
-public class RGeneralSurveyPlanAddParm {
-
-    @ApiModelProperty(value="单位ID")
-    private String orgNo;
-
-    @ApiModelProperty(value="普测计划编号")
-    private String planNo;
-
-    @ApiModelProperty(value="普测计划名称")
-    private String planName;
-
-    @ApiModelProperty(value="计划开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date planStartTime;
-
-    @ApiModelProperty(value="计划结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date planEndTime;
-
-    @ApiModelProperty(value="计划负责人")
-    private String leader;
-    @ApiModelProperty(value="详细情况")
-    private String description;
-
-    @ApiModelProperty(value="计划详细情况母线相关")
-    private List<RGeneralSurveyPlanDetailAddParm> rGeneralSurveyPlanDetailAddParm;
-    @Data
-    @ApiModel(value="计划详细情况母线相关")
-    public static class RGeneralSurveyPlanDetailAddParm{
-
-        @ApiModelProperty(value="变电站ID")
-        private String subId;
-
-        @ApiModelProperty(value="变电站名称")
-        private String subName;
-
-        @ApiModelProperty(value="变电站电压等级")
-        private String voltageLevel;
-
-        @ApiModelProperty(value="母线ID")
-        private String busbarId;
-
-        @ApiModelProperty(value="母线名称")
-        private String busbarName;
-
-        @ApiModelProperty(value="离线监测点id")
-        private String measurementPointId;
-        /**
-         * 测试开始时间
-         */
-        @ApiModelProperty(value="测试开始时间")
-        @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-        private Date generalSurveyStartTime;
-
-        /**
-         * 测试结束时间
-         */
-        @ApiModelProperty(value="测试结束时间")
-        @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-        private Date generalSurveyEndTime;
-
-        /**
-         * 测试日期
-         */
-        @ApiModelProperty(value="测试日期")
-        @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-        private Date generalSurveyTime;
-
-        /**
-         * 测试负责人
-         */
-        @ApiModelProperty(value="测试负责人")
-        private String generalSurveyLeader;
-
-    }
-
-}

process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java

@@ -1,47 +0,0 @@
-package com.njcn.process.pojo.param;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-/**
- * Description:
- * 接口文档访问地址：http://serverIP:port/swagger-ui.html
- * Date: 2022/11/11  15:20【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm")
-@Data
-public class RGeneralSurveyPlanQueryParm {
-
-    @NotNull(message="当前页不能为空！")
-    @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
-    /**显示条数*/
-    @NotNull(message="显示条数不能为空！")
-    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
-    private Integer pageSize;
-
-    @ApiModelProperty(value="单位ID")
-    private String orgNo;
-
-    @ApiModelProperty(value="计划开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date planStartTime;
-
-    @ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)")
-    private String status;
-
-    @ApiModelProperty(value="文件是否上传(0:否 1:是)")
-    private String isFileUpload;
-
-
-}

process-boot/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java

@@ -1,36 +0,0 @@
-package com.njcn.process.pojo.param;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-/**
- * Description:
- * 接口文档访问地址：http://serverIP:port/swagger-ui.html
- * Date: 2022/11/11  15:20【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm")
-@Data
-public class RGeneralSurveyPlandetailQueryParm {
-
-    @NotNull(message="当前页不能为空！")
-    @Min(value = 1, message = "当前页不能为0")
-    @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true)
-    private Integer currentPage;
-    /**显示条数*/
-    @NotNull(message="显示条数不能为空！")
-    @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
-    private Integer pageSize;
-
-    @ApiModelProperty(value="普测计划编号")
-    private String planNo;
-
-
-
-}

process-boot/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java

@@ -1,31 +0,0 @@
-package com.njcn.process.pojo.param;
-
-import com.njcn.web.constant.ValidMessage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-/**
- * 未建档干扰源用户入网上传Param
- *
- * @author qijian
- * @version 1.0.0
- * @createTime 2022/11/11 10:34
- */
-@Data
-public class SurveyResultUploadParam {
-
-    @ApiModelProperty(name = "planId",required = true)
-    @NotBlank(message = ValidMessage.ID_NOT_BLANK)
-    private String planId;
-
-    @ApiModelProperty(name = "files",value = "普测结果报告",required = true)
-    @NotNull(message = "普测结果报告")
-    private MultipartFile[] files;
-
-
-
-}

process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java

@@ -1,113 +0,0 @@
-package com.njcn.process.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 
- * Description:
- * 接口文档访问地址：http://serverIP:port/swagger-ui.html
- * Date: 2022/11/11  11:28【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-/**
-    * 普测计划详情表
-    */
-@ApiModel(value="com-njcn-process-pojo-po-RGeneralSurveyPlanDetail")
-@Data
-@TableName(value = "r_general_survey_plan_detail")
-public class RGeneralSurveyPlanDetail {
-    /**
-     * 普测计划编号
-     */
-    @MppMultiId(value = "plan_no")
-    @ApiModelProperty(value="普测计划编号")
-    private String planNo;
-    /**
-     * 母线ID
-     */
-
-    @MppMultiId(value = "busbar_id")
-    @ApiModelProperty(value="母线ID")
-    private String busbarId;
-
-    /**
-     * 测试开始时间
-     */
-    @TableField(value = "general_survey_start_time")
-    @ApiModelProperty(value="测试开始时间")
-    private Date generalSurveyStartTime;
-
-    /**
-     * 测试结束时间
-     */
-    @TableField(value = "general_survey_end_time")
-    @ApiModelProperty(value="测试结束时间")
-    private Date generalSurveyEndTime;
-
-    /**
-     * 测试日期
-     */
-    @TableField(value = "general_survey_time")
-    @ApiModelProperty(value="测试日期")
-    private Date generalSurveyTime;
-
-    /**
-     * 测试负责人
-     */
-    @TableField(value = "general_survey_leader")
-    @ApiModelProperty(value="测试负责人")
-    private String generalSurveyLeader;
-
-    /**
-     * 变电站ID
-     */
-    @TableField(value = "sub_id")
-    @ApiModelProperty(value="变电站ID")
-    private String subId;
-
-    /**
-     * 变电站名称
-     */
-    @TableField(value = "sub_name")
-    @ApiModelProperty(value="变电站名称")
-    private String subName;
-
-    /**
-     * 变电站电压等级
-     */
-    @TableField(value = "voltage_level")
-    @ApiModelProperty(value="变电站电压等级")
-    private String voltageLevel;
-
-
-
-    /**
-     * 母线名称
-     */
-    @TableField(value = "busbar_name")
-    @ApiModelProperty(value="母线名称")
-    private String busbarName;
-
-    /**
-     * 离线监测点id
-     */
-    @TableField(value = "measurement_point_id")
-    @ApiModelProperty(value="离线监测点id")
-    private String measurementPointId;
-
-    /**
-     * 是否生成问题(0:否 1:是)
-     */
-    @TableField(value = "is_problem")
-    @ApiModelProperty(value="是否生成问题(0:否 1:是)")
-    private Byte isProblem;
-}

process-boot/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java

@@ -1,126 +0,0 @@
-package com.njcn.process.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 
- * Description:
- * 接口文档访问地址：http://serverIP:port/swagger-ui.html
- * Date: 2022/11/11  11:24【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-/**
-    * 普测计划表
-    */
-@ApiModel(value="com-njcn-process-pojo-po-RGeneralSurveyPlanPO")
-@Data
-@TableName(value = "r_general_survey_plan")
-public class RGeneralSurveyPlanPO {
-    /**
-     * 单位ID
-     */
-    @TableField(value = "org_no")
-    @ApiModelProperty(value="单位ID")
-    private String orgNo;
-
-    /**
-     * 普测计划编号
-     */
-    @MppMultiId(value = "plan_no")
-    @ApiModelProperty(value="普测计划编号")
-    private String planNo;
-
-    /**
-     * 普测计划名称
-     */
-    @TableId(value = "plan_name")
-    @ApiModelProperty(value="普测计划名称")
-    private String planName;
-
-    /**
-     * 计划生成时间
-     */
-    @TableField(value = "plan_create_time")
-    @ApiModelProperty(value="计划生成时间")
-    private Date planCreateTime = new Date();
-
-    /**
-     * 计划开始时间
-     */
-    @TableField(value = "plan_start_time")
-    @ApiModelProperty(value="计划开始时间")
-    private Date planStartTime;
-
-    /**
-     * 计划结束时间
-     */
-    @TableField(value = "plan_end_time")
-    @ApiModelProperty(value="计划结束时间")
-    private Date planEndTime;
-
-    /**
-     * 实际完成时间
-     */
-    @TableField(value = "plan_complate_time")
-    @ApiModelProperty(value="实际完成时间")
-    private Date planComplateTime;
-
-    /**
-     * 计划负责人
-     */
-    @TableField(value = "leader")
-    @ApiModelProperty(value="计划负责人")
-    private String leader;
-
-    /**
-     * 计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)
-     */
-    @TableField(value = "status")
-    @ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)")
-    private int status;
-
-    /**
-     * 详情
-     */
-    @TableField(value = "description")
-    @ApiModelProperty(value="详情")
-    private String description;
-
-    /**
-     * 文件是否上传(0:否 1:是)
-     */
-    @TableField(value = "is_file_upload")
-    @ApiModelProperty(value="文件是否上传(0:否 1:是)")
-    private Integer isFileUpload;
-
-    /**
-     * 上传文件数量
-     */
-    @TableField(value = "file_count")
-    @ApiModelProperty(value="上传文件数量")
-    private Integer fileCount ;
-
-    /**
-     * 文件路径
-     */
-    @TableField(value = "file_path")
-    @ApiModelProperty(value="文件路径")
-    private String filePath;
-
-    /**
-     * 上传时间
-     */
-    @TableField(value = "upload_time")
-    @ApiModelProperty(value="上传时间")
-    private Date uploadTime;
-}

process-boot/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java

@@ -1,127 +0,0 @@
-package com.njcn.process.pojo.vo;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Description:
- * 接口文档访问地址：http://serverIP:port/swagger-ui.html
- * Date: 2022/11/11  15:20【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm")
-@Data
-public class RGeneralSurveyPlanVO {
-
-    @ApiModelProperty(value="单位ID")
-    private String orgNo;
-
-    @ApiModelProperty(value="普测计划编号")
-    private String planNo;
-
-    @ApiModelProperty(value="普测计划名称")
-    private String planName;
-
-    @ApiModelProperty(value="计划开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date planStartTime;
-
-    @ApiModelProperty(value="计划结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date planEndTime;
-
-    @ApiModelProperty(value="变电站数量")
-    private Long subCount;
-
-    @ApiModelProperty(value="母线数量")
-    private Long busCount;
-
-    @ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)")
-    private int status;
-
-    @TableField(value = "is_file_upload")
-    @ApiModelProperty(value="文件是否上传(0:否 1:是)")
-    private Byte isFileUpload;
-
-    /**
-     * 上传文件数量
-     */
-    @TableField(value = "file_count")
-    @ApiModelProperty(value="上传文件数量")
-    private Integer fileCount;
-
-    /**
-     * 文件路径
-     */
-    @TableField(value = "file_path")
-    @ApiModelProperty(value="文件路径")
-    private String filePath;
-
-    /**
-     * 上传时间
-     */
-    @TableField(value = "upload_time")
-    @ApiModelProperty(value="上传时间")
-    private Date uploadTime;
-
-    @ApiModelProperty(value="计划详细情况母线相关")
-    private List<RGeneralSurveyPlanDetailVO> rGeneralSurveyPlanDetailVOList;
-    @Data
-    @ApiModel(value="计划详细情况母线相关")
-    public static class RGeneralSurveyPlanDetailVO{
-
-        @ApiModelProperty(value="变电站ID")
-        private String subId;
-
-        @ApiModelProperty(value="变电站名称")
-        private String subName;
-
-        @ApiModelProperty(value="变电站电压等级")
-        private String voltageLevel;
-
-        @ApiModelProperty(value="母线ID")
-        private String busbarId;
-
-        @ApiModelProperty(value="母线名称")
-        private String busbarName;
-
-        @ApiModelProperty(value="离线监测点id")
-        private String measurementPointId;
-        /**
-         * 测试开始时间
-         */
-        @ApiModelProperty(value="测试开始时间")
-        @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-        private Date generalSurveyStartTime;
-
-        /**
-         * 测试结束时间
-         */
-        @ApiModelProperty(value="测试结束时间")
-        @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-        private Date generalSurveyEndTime;
-
-        /**
-         * 测试日期
-         */
-        @ApiModelProperty(value="测试日期")
-        @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-        private Date generalSurveyTime;
-
-        /**
-         * 测试负责人
-         */
-        @ApiModelProperty(value="测试负责人")
-        private String generalSurveyLeader;
-
-    }
-
-}

process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.jeffreyning.mybatisplus.service.IMppService;
 import com.njcn.process.pojo.param.RGeneralSurveyPlanAddParm;
 import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm;
+import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm;
 import com.njcn.process.pojo.param.SurveyResultUploadParam;
 import com.njcn.process.pojo.po.RGeneralSurveyPlanPO;
+import com.njcn.process.pojo.po.SurveyPlanExcel;
+import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO;
 import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO;
 
 import java.util.List;
@@ -53,4 +56,20 @@ public interface RGeneralSurveyPlanPOService extends IMppService<RGeneralSurveyP
     * @Date: 2022/11/18
     */
     List<String> surveyResultDownload(String planNo);
+    /** 
+    * @Description: exportSurveyPlan 
+    * @Param: [] 
+    * @return: java.util.List<com.njcn.process.pojo.po.SurveyPlanExcel> 
+    * @Author: clam
+    * @Date: 2022/11/21 
+    */ 
+    List<SurveyPlanExcel> exportSurveyPlan(List<String> planIdList);
+    /** 
+    * @Description: querySurveyPlanOnQuestion
+    * @Param: [questionQueryParm] 
+    * @return: java.util.List<com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO> 
+    * @Author: clam
+    * @Date: 2022/11/30 
+    */ 
+    List<RGeneralSurveyPlanDetailOnQuestionVO> querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm);
 }

process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java

@@ -13,9 +13,12 @@ import com.njcn.process.mapper.RGeneralSurveyPlanDetailMapper;
 import com.njcn.process.mapper.RGeneralSurveyPlanPOMapper;
 import com.njcn.process.pojo.param.RGeneralSurveyPlanAddParm;
 import com.njcn.process.pojo.param.RGeneralSurveyPlanQueryParm;
+import com.njcn.process.pojo.param.SurveyPlanQuestionQueryParm;
 import com.njcn.process.pojo.param.SurveyResultUploadParam;
 import com.njcn.process.pojo.po.RGeneralSurveyPlanDetail;
 import com.njcn.process.pojo.po.RGeneralSurveyPlanPO;
+import com.njcn.process.pojo.po.SurveyPlanExcel;
+import com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO;
 import com.njcn.process.pojo.vo.RGeneralSurveyPlanVO;
 import com.njcn.process.service.RGeneralSurveyPlanDetailService;
 import com.njcn.process.service.RGeneralSurveyPlanPOService;
@@ -214,6 +217,57 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl<RGeneralSurv
         return collect;
     }
 
+    /**
+     * @Description: exportSurveyPlan
+     * @Param: []
+     * @return: java.util.List<com.njcn.process.pojo.po.SurveyPlanExcel>
+     * @Author: clam
+     * @Date: 2022/11/21
+     */
+    @Override
+    public List<SurveyPlanExcel> exportSurveyPlan(List<String> planIdList) {
+        List<SurveyPlanExcel> surveyPlanExcels = new ArrayList<> ();
+        LambdaQueryWrapper<RGeneralSurveyPlanPO> queryWrapper = new LambdaQueryWrapper<> ();
+        queryWrapper.in (RGeneralSurveyPlanPO::getPlanNo,planIdList);
+        List<RGeneralSurveyPlanPO> rGeneralSurveyPlanPOS = rGeneralSurveyPlanPOMapper.selectList (queryWrapper);
+        LambdaQueryWrapper<RGeneralSurveyPlanDetail> lambdaQueryWrapper = new LambdaQueryWrapper<> ();
+        lambdaQueryWrapper.in (RGeneralSurveyPlanDetail::getPlanNo, planIdList);
+        List<RGeneralSurveyPlanDetail> rGeneralSurveyPlanDetails = rGeneralSurveyPlanDetailMapper.selectList (lambdaQueryWrapper);
+        rGeneralSurveyPlanPOS.forEach (temp->{
+            SurveyPlanExcel surveyPlanExcel = new SurveyPlanExcel();
+            BeanUtils.copyProperties (temp, surveyPlanExcel);
+
+            long Busbarcount = rGeneralSurveyPlanDetails.stream ( ).
+                    filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))).
+                    map (RGeneralSurveyPlanDetail::getBusbarId).distinct ( ).count ( );
+
+            long Subcount = rGeneralSurveyPlanDetails.stream ( ).
+                    filter (surveyPlanDetail -> Objects.equals (surveyPlanDetail.getPlanNo ( ), temp.getPlanNo ( ))).
+                    map (RGeneralSurveyPlanDetail::getSubId).distinct ( ).count ( );
+            surveyPlanExcel.setBusCount (Busbarcount);
+            surveyPlanExcel.setSubCount (Subcount);
+            surveyPlanExcels.add (surveyPlanExcel);
+        });
+
+        return surveyPlanExcels;
+    }
+
+    /**
+     * @param questionQueryParm
+     * @Description: querySurveyPlanOnQuestion
+     * @Param: [questionQueryParm]
+     * @return: java.util.List<com.njcn.process.pojo.vo.RGeneralSurveyPlanDetailOnQuestionVO>
+     * @Author: clam
+     * @Date: 2022/11/30
+     */
+    @Override
+    public List<RGeneralSurveyPlanDetailOnQuestionVO> querySurveyPlanOnQuestion(SurveyPlanQuestionQueryParm questionQueryParm) {
+        List<RGeneralSurveyPlanDetailOnQuestionVO> rGeneralSurveyPlanDetailOnQuestionVOS = new ArrayList<> ();
+        rGeneralSurveyPlanDetailOnQuestionVOS =rGeneralSurveyPlanDetailMapper.querySurveyPlanOnQuestion(questionQueryParm);
+
+        return rGeneralSurveyPlanDetailOnQuestionVOS;
+    }
+
     /**
      * 上传文件到Minio
      *