Merge remote-tracking branch 'origin/main'

src/main/java/org/energy/modules/leger/controller/EquipmentLedgerController.java

@@ -33,6 +33,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.InspectionObject;
 import org.energy.modules.leger.service.IInventoryDocumentService;
 import org.energy.modules.leger.service.ITechParametersService;
 import lombok.SneakyThrows;
@@ -234,4 +235,26 @@ public class EquipmentLedgerController extends DafController {
 		response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
 		EasyExcel.write(response.getOutputStream(), EquipmentLedgerExcel.class).sheet("静态台账").doWrite(list);
 	}
+
+	/**
+	 * 获取对象编号
+	 */
+	@GetMapping("/getKksList")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "获取kks编号", notes = "获取kks编号")
+	public R<List<EquipmentLedger>> getKksNoList() {
+		List<EquipmentLedger> kksList = equipmentLedgerService.getKksNoList();
+		return R.data(kksList);
+	}
+
+	/**
+	 * 获取对象编号
+	 */
+	@GetMapping("/getDetailList")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取kks信息", notes = "获取kks信息")
+	public R<EquipmentLedger> getDetailList(String KksNo) {
+		EquipmentLedger DetailList = equipmentLedgerService.getDetailList("'" + KksNo + "'");
+		return R.data(DetailList);
+	}
 }

src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.java

@@ -2,6 +2,7 @@ package org.energy.modules.leger.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.apache.ibatis.annotations.Param;
+import org.energy.modules.inspection.entity.InspectionObject;
 import org.energy.modules.leger.entity.EquipmentLedger;
 import org.energy.modules.leger.vo.EquipmentLedgerVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -29,4 +30,13 @@ public interface EquipmentLedgerMapper extends BaseMapper<EquipmentLedger> {
 
 	List<EquipmentLedgerExcel> exportData(@Param("ew") Wrapper<EquipmentLedger> queryWrapper);
 
+	/**
+	 * 获取kks编号
+	 */
+	List<EquipmentLedger> getKksNoList();
+	/**
+	 * 获取kks的信息
+	 */
+	EquipmentLedger getDetailList(String kksNo);
+
 }

src/main/java/org/energy/modules/leger/mapper/EquipmentLedgerMapper.xml

@@ -69,4 +69,11 @@
         FROM l_equipment_ledger ${ew.customSqlSegment}
     </select>
 
+    <select id="getKksNoList" resultMap="equipmentLedgerResultMap">
+        select kks_encoding from l_equipment_ledger where is_deleted = 0 and check_status = 2
+    </select>
+
+    <select id="getDetailList" resultMap="equipmentLedgerResultMap">
+        select kks_description, station from l_equipment_ledger where kks_encoding = ${kks_encoding}
+    </select>
 </mapper>

src/main/java/org/energy/modules/leger/service/IEquipmentLedgerService.java

@@ -1,6 +1,7 @@
 package org.energy.modules.leger.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.energy.modules.inspection.entity.InspectionObject;
 import org.energy.modules.leger.entity.EquipmentLedger;
 import org.energy.modules.leger.vo.EquipmentLedgerVO;
 import com.dayu.daf.core.mp.base.BaseService;
@@ -34,4 +35,13 @@ public interface IEquipmentLedgerService extends BaseService<EquipmentLedger> {
 	 */
 	List<EquipmentLedgerExcel> export(Wrapper<EquipmentLedger> queryWrapper);
 
+	/**
+	 * 获取路线编号
+	 */
+	List<EquipmentLedger> getKksNoList();
+	/**
+	 * 获取路线的信息
+	 */
+	EquipmentLedger getDetailList(String objectNo);
+
 }

src/main/java/org/energy/modules/leger/service/impl/EquipmentLedgerServiceImpl.java

@@ -1,6 +1,7 @@
 package org.energy.modules.leger.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.energy.modules.inspection.entity.InspectionObject;
 import org.energy.modules.leger.entity.EquipmentLedger;
 import org.energy.modules.leger.vo.EquipmentLedgerVO;
 import org.energy.modules.leger.mapper.EquipmentLedgerMapper;
@@ -32,4 +33,15 @@ public class EquipmentLedgerServiceImpl extends BaseServiceImpl<EquipmentLedgerM
 		return list;
 	}
 
+	@Override
+	public List<EquipmentLedger> getKksNoList() {
+		List<EquipmentLedger> list = baseMapper.getKksNoList();
+		return list;
+	}
+
+	@Override
+	public EquipmentLedger getDetailList(String KkstNo) {
+		EquipmentLedger DetailList = baseMapper.getDetailList(KkstNo);
+		return DetailList;
+	}
 }

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));
+	}
+
 }