Merge remote-tracking branch 'origin/main'

src/main/java/org/energy/modules/inspection/controller/InspectionResultController.java

@@ -28,6 +28,7 @@ import com.dayu.daf.core.mp.support.Query;
 import com.dayu.daf.core.tool.api.R;
 import com.dayu.daf.core.tool.utils.Func;
 import org.energy.modules.inspection.entity.InspectionTasks;
+import org.energy.modules.leger.entity.InventoryDocument;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,6 +37,8 @@ import org.energy.modules.inspection.vo.InspectionResultVO;
 import org.energy.modules.inspection.service.IInspectionResultService;
 import com.dayu.daf.core.boot.ctrl.DafController;
 
+import java.util.List;
+
 /**
  * 巡检结果 控制器
  *
@@ -109,9 +112,8 @@ public class InspectionResultController extends DafController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入inspectionResult")
-	public R submit(@Valid @RequestBody InspectionResult inspectionResult, @ApiParam(value = "编号", required = true) @RequestParam String taskNo) {
+	public R submit(@Valid @RequestBody InspectionResult inspectionResult) {
-		inspectionResult.setTaskNo(taskNo);
+		String maxResultNo = inspectionResultService.getMaxResultNo("'%" + inspectionResult.getTaskNo() + "%'");
-		String maxResultNo = inspectionResultService.getMaxResultNo("'%" + taskNo + "%'");
 		int number;
 		if (StringUtil.isNotEmpty(maxResultNo)){
 			number = Integer.parseInt(maxResultNo.substring(13));
@@ -120,11 +122,11 @@ public class InspectionResultController extends DafController {
 			number = 1;
 		}
 		String numFormat = String.format("%04d", number);
-		String resultNo = taskNo + numFormat;
+		String resultNo = inspectionResult.getTaskNo() + numFormat;
+		inspectionResult.setResultNo(resultNo);
 		return R.status(inspectionResultService.saveOrUpdate(inspectionResult));
 	}
 
-
 	/**
 	 * 删除 巡检结果
 	 */
@@ -135,5 +137,15 @@ public class InspectionResultController extends DafController {
 		return R.status(inspectionResultService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 列表 技术参数一览
+	 */
+	@GetMapping("/getList")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "列表", notes = "传入inventoryDocument")
+	public R<List<InspectionResult>> getList(InspectionResult inspectionResult) {
+		List<InspectionResult> list = inspectionResultService.list(Condition.getQueryWrapper(inspectionResult));
+		return R.data(list);
+	}
 
 }

src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java

@@ -190,7 +190,7 @@ public class InspectionTasksController extends DafController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "更新", notes = "传入ids")
 	public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return this.approve("1",ids);
+		return this.approve("1",ids, "");
 	}
 
 	/**
@@ -199,19 +199,20 @@ public class InspectionTasksController extends DafController {
 	@PostMapping("/stop")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "更新", notes = "传入ids")
-	public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+	public R stop(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @RequestParam String reason) {
-		return this.approve("2",ids);
+		return this.approve("2",ids, reason);
 	}
 
 	/**
 	 * 启动OR停止 巡检任务
 	 */
-	public R approve(String status, String ids) {
+	public R approve(String status, String ids, String reason) {
 		List<InspectionTasks> list = new ArrayList<>();
 		for (String id : ids.split(",")) {
 			InspectionTasks inspectionTasks = new InspectionTasks();
 			inspectionTasks.setId(Long.parseLong(id));
 			inspectionTasks.setTaskStatus(Long.parseLong(status));
+			inspectionTasks.setCancelReason(reason);
 			list.add(inspectionTasks);
 		}
 		return R.status(inspectionTasksService.updateBatchById(list));

src/main/java/org/energy/modules/inspection/entity/InspectionResult.java

@@ -3,6 +3,7 @@ package org.energy.modules.inspection.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dayu.daf.core.mp.base.BaseEntity;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -45,12 +46,12 @@ public class InspectionResult extends BaseEntity {
      * 任务执行开始时间
      */
     @ApiModelProperty(value = "任务执行开始时间")
-    private String executeStartDate;
+    private LocalDateTime executeStartDate;
     /**
      * 任务执行结束时间
      */
     @ApiModelProperty(value = "任务执行结束时间")
-    private String executeEndDate;
+    private LocalDateTime executeEndDate;
     /**
      * 巡检结果
      */

src/main/java/org/energy/modules/inspection/excel/InspectionTasksExcel.java

@@ -46,11 +46,11 @@ public class InspectionTasksExcel implements Serializable {
 	@ExcelProperty(value = "场站")
 	private String stationExt;
 
-	@ColumnWidth(15)
+	@ColumnWidth(20)
 	@ExcelProperty(value = "任务生成日期")
 	private String taskStartDate;
 
-	@ColumnWidth(15)
+	@ColumnWidth(20)
 	@ExcelProperty(value = "任务完成日期")
 	private String taskEndDate;
 

src/main/java/org/energy/modules/inspection/mapper/InspectionObjectMapper.xml

@@ -62,7 +62,7 @@
     </select>
 
     <select id="getObjectList" resultMap="inspectionObjectResultMap">
-        select object_no, object_name, object_type from i_inspection_object where is_deleted = 0 and istatus = 0
+        select object_no from i_inspection_object where is_deleted = 0 and istatus = 1
     </select>
 
     <select id="getMaxNo" resultType="java.lang.String">

src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml

@@ -46,7 +46,7 @@
     </select>
 
     <select id="getPlanList" resultMap="inspectionPlanResultMap">
-        select plan_no, plan_name, plan_type from i_inspection_plan where is_deleted = 0 and plan_status = '1'
+        select plan_no from i_inspection_plan where is_deleted = 0 and plan_status = '1'
     </select>
 
     <select id="getMaxNo" resultType="java.lang.String">

src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml

@@ -43,7 +43,7 @@
     </select>
 
     <select id="getRouteList" resultMap="inspectionRouteResultMap">
-        select route_no, route_name, type from i_inspection_route where is_deleted = 0
+        select route_no from i_inspection_route where is_deleted = 0 and istatus = 1
     </select>
 
     <select id="getMaxNo" resultType="java.lang.String">

src/main/java/org/energy/modules/smart/controller/OperationItemController.java

@@ -134,11 +134,6 @@ public class OperationItemController extends DafController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "列表", notes = "传入OperationItem")
 	public R<List<OperationItem>> getList(OperationItem operationItem) {
-//		QueryWrapper<OperationItem> qw = new QueryWrapper<>();
-//		qw.orderByAsc("eq_ledger_code");
-//		if (StringUtil.isNotEmpty(operationItem.getOperationTicketNo())) {
-//			qw.lambda().eq(OperationItem::getOperationTicketNo, operationItem.getOperationTicketNo());
-//		}
 		List<OperationItem> list = operationItemService.list(Condition.getQueryWrapper(operationItem));
 		return R.data(list);
 	}

src/main/java/org/energy/modules/smart/controller/OperationTicketController.java

@@ -16,6 +16,7 @@
 package org.energy.modules.smart.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dayu.daf.core.tool.constant.DafConstant;
 import com.xkcoding.http.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,6 +29,7 @@ import com.dayu.daf.core.mp.support.Condition;
 import com.dayu.daf.core.mp.support.Query;
 import com.dayu.daf.core.tool.api.R;
 import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.inspection.entity.InspectionRoute;
 import org.energy.modules.leger.entity.EquipmentLedger;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -37,6 +39,9 @@ import org.energy.modules.smart.vo.OperationTicketVO;
 import org.energy.modules.smart.service.IOperationTicketService;
 import com.dayu.daf.core.boot.ctrl.DafController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 操作票一览 控制器
  *
@@ -80,7 +85,40 @@ public class OperationTicketController extends DafController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入operationTicket")
 	public R<IPage<OperationTicketVO>> page(OperationTicketVO operationTicket, Query query) {
-		IPage<OperationTicketVO> pages = operationTicketService.selectOperationTicketPage(Condition.getPage(query), operationTicket);
+		QueryWrapper<OperationTicketVO> qw = new QueryWrapper<>();
+		//场站
+		if (null != operationTicket.getStation()) {
+			qw.lambda().eq(OperationTicketVO::getStation, operationTicket.getStation());
+		}
+		//操作票编号
+		if (StringUtil.isNotEmpty(operationTicket.getOperationTicketNo())) {
+			qw.lambda().like(OperationTicketVO::getOperationTicketNo, operationTicket.getOperationTicketNo());
+		}
+		//操作票类型
+		if (StringUtil.isNotEmpty(operationTicket.getOperationTicketType())){
+			qw.lambda().like(OperationTicketVO::getOperationTicketType, operationTicket.getOperationTicketType());
+		}
+		//工作负责人
+		if (StringUtil.isNotEmpty(operationTicket.getWorkLeader())) {
+			qw.lambda().like(OperationTicketVO::getWorkLeader, operationTicket.getWorkLeader());
+		}
+		//作业风险等级
+		if (StringUtil.isNotEmpty(operationTicket.getJobRiskLevel())) {
+			qw.lambda().like(OperationTicketVO::getJobRiskLevel, operationTicket.getJobRiskLevel());
+		}
+		//控制等级
+		if (StringUtil.isNotEmpty(operationTicket.getControlLevel())) {
+			qw.lambda().like(OperationTicketVO::getControlLevel, operationTicket.getControlLevel());
+		}
+		//计划开始时间
+		if (StringUtil.isNotEmpty(operationTicket.getPlannedStartTime())) {
+			qw.lambda().like(OperationTicketVO::getPlannedStartTime, operationTicket.getPlannedStartTime());
+		}
+		//状态
+		if (null != operationTicket.getSts()) {
+			qw.lambda().eq(OperationTicketVO::getSts, operationTicket.getSts());
+		}
+		IPage<OperationTicketVO> pages = operationTicketService.selectOperationTicketPageExt(Condition.getPage(query), qw);
 		return R.data(pages);
 	}
 
@@ -125,5 +163,63 @@ public class OperationTicketController extends DafController {
 		return R.status(operationTicketService.deleteLogic(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 审核 操作票一览
+	 */
+	@PostMapping("/auditing")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "更新", notes = "传入ids")
+	public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return this.approve("2",ids);
+	}
+
+	/**
+	 * 驳回 操作票一览
+	 */
+	@PostMapping("/reject")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "更新", notes = "传入ids")
+	public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids)
+	{
+		return this.approve("3",ids);
+	}
+
+	/**
+	 * 驳回OR审核 操作票一览
+	 */
+	public R approve(String status, String ids) {
+		List<OperationTicket> list = new ArrayList<>();
+		for (String id : ids.split(",")) {
+			OperationTicket operationTicket = new OperationTicket();
+			operationTicket.setId(Long.parseLong(id));
+			operationTicket.setReviewStatus(status);
+			list.add(operationTicket);
+		}
+		return R.status(operationTicketService.updateBatchById(list));
+	}
+	/**
+	 * 失效
+	 */
+	@PostMapping("/closeticket")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "失效", notes = "传入ids")
+	public R lapse(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "是否合格", required = true) @RequestParam Integer isQuakified,@RequestParam String riskControlEvaluation) {
+		return this.updateInspectionRoute(3, isQuakified, ids , riskControlEvaluation);
+	}
 
+	/**
+	 * 生效OR失效
+	 */
+	public R updateInspectionRoute(Integer status, Integer isQuakified, String ids , String riskControlEvaluation) {
+		List<OperationTicket> list = new ArrayList<>();
+		for (String id : ids.split(",")) {
+			OperationTicket operationTicket = new OperationTicket();
+			operationTicket.setId(Long.parseLong(id));
+			operationTicket.setIsQuakified(isQuakified);
+			operationTicket.setRiskControlEvaluation(riskControlEvaluation);
+			operationTicket.setSts(status);
+			list.add(operationTicket);
+		}
+		return R.status(operationTicketService.updateBatchById(list));
+	}
 }

src/main/java/org/energy/modules/smart/entity/OperationTicket.java

@@ -160,7 +160,7 @@ public class OperationTicket extends BaseEntity {
      * 状态
      */
     @ApiModelProperty(value = "状态")
-    private String sts;
+    private Integer sts;
     /**
      * 是否合格
      */

src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java

@@ -1,5 +1,9 @@
 package org.energy.modules.smart.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.leger.entity.EquipmentLedger;
+import org.energy.modules.leger.excel.EquipmentLedgerExcel;
 import org.energy.modules.smart.entity.OperationTicket;
 import org.energy.modules.smart.vo.OperationTicketVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -23,4 +27,7 @@ public interface OperationTicketMapper extends BaseMapper<OperationTicket> {
 	 */
 	List<OperationTicketVO> selectOperationTicketPage(IPage page, OperationTicketVO operationTicket);
 
+	List<OperationTicketVO> exportData(@Param("ew") Wrapper<OperationTicketVO> queryWrapper);
+
+	List<OperationTicketVO> selectOperationTicketPageExt(IPage page, @Param("ew") Wrapper<OperationTicketVO> queryWrapper);
 }

src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml

@@ -97,4 +97,25 @@
             , a.id
     </select>
 
+    <select id="selectOperationTicketPageExt" resultMap="operationTicketVOResultMap">
+        select
+            count(b.operation_ticket_no) AS operationItemsCount,
+            a.*
+        from
+            smt_operation_ticket a
+                left join smt_operation_item b
+                          on a.operation_ticket_no = b.operation_ticket_no
+                              and b.is_deleted = 0
+            <if test="ew.customSqlSegment!=null and ew.customSqlSegment!=''">
+                ${ew.customSqlSegment} and a.is_deleted = 0
+            </if>
+            <if test="ew.customSqlSegment==null or ew.customSqlSegment==''">
+                where a.is_deleted = 0
+            </if>
+
+        group by
+            b.operation_ticket_no
+               , a.id
+    </select>
+
 </mapper>

src/main/java/org/energy/modules/smart/service/IOperationTicketService.java

@@ -1,10 +1,15 @@
 package org.energy.modules.smart.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.energy.modules.inspection.entity.InspectionRoute;
+import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.smart.entity.OperationTicket;
 import org.energy.modules.smart.vo.OperationTicketVO;
 import com.dayu.daf.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 操作票一览 服务类
  *
@@ -22,4 +27,6 @@ public interface IOperationTicketService extends BaseService<OperationTicket> {
 	 */
 	IPage<OperationTicketVO> selectOperationTicketPage(IPage<OperationTicketVO> page, OperationTicketVO operationTicket);
 
+	IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page, Wrapper<OperationTicketVO> wrapper);
+
 }

src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java

@@ -1,5 +1,8 @@
 package org.energy.modules.smart.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.energy.modules.inspection.entity.InspectionRoute;
+import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.smart.entity.OperationTicket;
 import org.energy.modules.smart.vo.OperationTicketVO;
 import org.energy.modules.smart.mapper.OperationTicketMapper;
@@ -8,6 +11,8 @@ import com.dayu.daf.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 操作票一览 服务实现类
  *
@@ -22,4 +27,9 @@ public class OperationTicketServiceImpl extends BaseServiceImpl<OperationTicketM
 		return page.setRecords(baseMapper.selectOperationTicketPage(page, operationTicket));
 	}
 
+	@Override
+	public IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page, Wrapper<OperationTicketVO> wrapper) {
+		return page.setRecords(baseMapper.selectOperationTicketPageExt(page, wrapper));
+	}
+
 }