Merge remote-tracking branch 'origin/main'

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

@@ -82,7 +82,7 @@
             and obj.is_deleted = '0'
         where
             task.is_deleted = '0'
-            and obj.kks_no = #{toolsCodeId}
+            and obj.tools_code_id = #{toolsCodeId}
     </select>
 
 </mapper>

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

@@ -94,40 +94,7 @@ public class OperationTicketController extends DafController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入operationTicket")
 	public R<IPage<OperationTicketVO>> page(OperationTicketVO operationTicket, Query query) {
-		QueryWrapper<OperationTicketVO> qw = new QueryWrapper<>();
+		IPage<OperationTicketVO> pages = operationTicketService.selectOperationTicketPageExt(Condition.getPage(query), operationTicket);
-		//场站
-		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);
 	}
 

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

@@ -130,7 +130,7 @@ public class WorkOrderController extends DafController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(workOrderService.deleteLogic(Func.toLongList(ids)));
+		return R.status(workOrderService.removeByIds(Func.toLongList(ids)));
 	}
 
 	/**

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

@@ -30,5 +30,5 @@ public interface OperationTicketMapper extends BaseMapper<OperationTicket> {
 
 	List<OperationTicketExcel> exportData(@Param("entity")OperationTicket operationTicket);
 
-	List<OperationTicketVO> selectOperationTicketPageExt(IPage page, @Param("ew") Wrapper<OperationTicketVO> queryWrapper);
+	List<OperationTicketVO> selectOperationTicketPageExt(IPage page, @Param("entity")OperationTicket operationTicket);
 }

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

@@ -99,20 +99,44 @@
 
     <select id="selectOperationTicketPageExt" resultMap="operationTicketVOResultMap">
         select
-            count(b.operation_ticket_no) AS operationItemsCount,
+            count(b.id) 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!=''">
+<!--            <if test="ew.customSqlSegment!=null and ew.customSqlSegment!=''">-->
-                ${ew.customSqlSegment} and a.is_deleted = 0
+<!--                ${ew.customSqlSegment} and a.is_deleted = 0-->
-            </if>
+<!--            </if>-->
-            <if test="ew.customSqlSegment==null or ew.customSqlSegment==''">
+<!--            <if test="ew.customSqlSegment==null or ew.customSqlSegment==''">-->
+<!--                where a.is_deleted = 0-->
+<!--            </if>-->
         where a.is_deleted = 0
+        <if test="entity.station != null and entity.station != ''">
+            AND a.station = #{entity.station}
+        </if>
+        <if test="entity.operationTicketNo != null and entity.operationTicketNo != ''">
+            AND a.operation_ticket_no LIKE CONCAT('%', #{entity.operationTicketNo}, '%')
+        </if>
+        <if test="entity.operationTicketType != null and entity.operationTicketType != ''">
+            AND a.operation_ticket_type LIKE CONCAT('%',#{entity.operationTicketType}, '%')
+        </if>
+        <if test="entity.workLeader != null and entity.workLeader != ''">
+            AND a.work_leader LIKE CONCAT('%',#{entity.workLeader}, '%')
+        </if>
+        <if test="entity.jobRiskLevel != null and entity.jobRiskLevel != ''">
+            AND a.job_risk_level LIKE CONCAT('%',#{entity.jobRiskLevel}, '%')
+        </if>
+        <if test="entity.controlLevel != null and entity.controlLevel != ''">
+            AND a.control_level LIKE CONCAT('%',#{entity.controlLevel}, '%')
+        </if>
+        <if test="entity.plannedStartTime != null and entity.plannedStartTime != ''">
+            AND a.planned_start_time LIKE CONCAT('%',#{entity.plannedStartTime}, '%')
+        </if>
+        <if test="entity.sts != null and entity.sts != ''">
+            AND a.sts = #{entity.sts}
         </if>
-
         group by
             b.operation_ticket_no
                , a.id
@@ -137,22 +161,22 @@
             AND a.station = #{entity.station}
         </if>
         <if test="entity.operationTicketNo != null and entity.operationTicketNo != ''">
-            AND a.operation_ticket_no LIKE #{entity.operation_ticket_no}
+            AND a.operation_ticket_no LIKE #{entity.operationTicketNo}
         </if>
         <if test="entity.operationTicketType != null and entity.operationTicketType != ''">
-            AND a.operation_ticket_type LIKE #{entity.operation_ticket_type}
+            AND a.operation_ticket_type LIKE #{entity.operationTicketType}
         </if>
         <if test="entity.workLeader != null and entity.workLeader != ''">
-            AND a.work_leader LIKE #{entity.work_leader}
+            AND a.work_leader LIKE #{entity.workLeader}
         </if>
         <if test="entity.jobRiskLevel != null and entity.jobRiskLevel != ''">
-            AND a.job_risk_level LIKE #{entity.job_risk_level}
+            AND a.job_risk_level LIKE #{entity.jobRiskLevel}
         </if>
         <if test="entity.controlLevel != null and entity.controlLevel != ''">
-            AND a.control_level LIKE #{entity.control_level}
+            AND a.control_level LIKE #{entity.controlLevel}
         </if>
         <if test="entity.plannedStartTime != null and entity.plannedStartTime != ''">
-            AND a.planned_start_time LIKE #{entity.planned_start_time}
+            AND a.planned_start_time LIKE #{entity.plannedStartTime}
         </if>
         <if test="entity.sts != null and entity.sts != ''">
             AND a.sts = #{entity.sts}

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

@@ -26,7 +26,7 @@ public interface IOperationTicketService extends BaseService<OperationTicket> {
 	 */
 	IPage<OperationTicketVO> selectOperationTicketPage(IPage<OperationTicketVO> page, OperationTicketVO operationTicket);
 
-	IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page, Wrapper<OperationTicketVO> wrapper);
+	IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page,OperationTicket operationTicket);
 
 	/**
 	 * 获取导出数据

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

@@ -27,8 +27,8 @@ public class OperationTicketServiceImpl extends BaseServiceImpl<OperationTicketM
 	}
 
 	@Override
-	public IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page, Wrapper<OperationTicketVO> wrapper) {
+	public IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page, OperationTicket operationTicket) {
-		return page.setRecords(baseMapper.selectOperationTicketPageExt(page, wrapper));
+		return page.setRecords(baseMapper.selectOperationTicketPageExt(page, operationTicket));
 	}
 
 	@Override

src/main/java/org/energy/modules/smart/vo/OperationTicketVO.java

@@ -19,4 +19,5 @@ public class OperationTicketVO extends OperationTicket {
 
 	//操作项目数
 	private int operationItemsCount;
+
 }

src/main/java/org/energy/modules/spares/controller/MaterialClassificationController.java

@@ -87,7 +87,7 @@ public class MaterialClassificationController extends DafController {
 			qw.lambda().like(MaterialClassification::getCode, materialClassification.getCode());
 		}
 		if (materialClassification.getType() != null) {
-			qw.lambda().eq(MaterialClassification::getType, materialClassification.getType());
+			qw.lambda().like(MaterialClassification::getType, materialClassification.getType());
 		}
 		qw.lambda().eq(MaterialClassification::getIsDeleted, DafConstant.DB_NOT_DELETED);
 		qw.lambda().orderByDesc(MaterialClassification::getUpdateTime);

src/main/java/org/energy/modules/spares/entity/MaterialClassification.java

@@ -31,16 +31,15 @@ public class MaterialClassification extends BaseEntity {
     @ApiModelProperty(value = "主键")
     private Long id;
     /**
-     * 物资分配码
+     * 物资分类码
      */
-    @ApiModelProperty(value = "物资分配码")
+    @ApiModelProperty(value = "物资分类码")
     private String code;
     /**
      * 物资类型
      */
-	@JsonSerialize(nullsUsing = NullSerializer.class)
     @ApiModelProperty(value = "物资类型")
-    private Integer type;
+    private String type;
 
 
 }

src/main/java/org/energy/modules/spares/mapper/MaterialClassificationMapper.xml

@@ -34,7 +34,7 @@
             and a.code LIKE CONCAT('%', #{vo.code}, '%')
         </if>
         <if test="vo.type != null and vo.type != ''">
-            and a.type = #{vo.type}
+            and a.type LIKE CONCAT('%', #{vo.type}, '%')
         </if>
         order by a.update_time desc
     </select>

src/main/java/org/energy/modules/system/controller/RoleController.java

@@ -29,8 +29,10 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.energy.modules.system.entity.Role;
+import org.energy.modules.system.service.IRoleDataService;
 import org.energy.modules.system.service.IRoleService;
 import org.energy.modules.system.vo.GrantVO;
+import org.energy.modules.system.vo.HomePageVO;
 import org.energy.modules.system.vo.RoleVO;
 import org.energy.modules.system.wrapper.RoleWrapper;
 import org.springframework.web.bind.annotation.*;
@@ -56,6 +58,8 @@ public class RoleController extends DafController {
 
 	private IRoleService roleService;
 
+	private IRoleDataService roleDataService;
+
 	/**
 	 * 详情
 	 */
@@ -153,4 +157,11 @@ public class RoleController extends DafController {
 		return R.status(temp);
 	}
 
+	@GetMapping("/honePageData")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "首页数据", notes = "传入")
+	public R<HomePageVO> honePageData() {
+		return R.data(roleDataService.findCurrHomePageInfo());
+	}
+
 }

src/main/java/org/energy/modules/system/service/IRoleDataService.java

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.system.service;
+
+import org.energy.modules.system.vo.HomePageVO;
+
+/**
+ * 服务类
+ *
+ * @author DafX
+ */
+public interface IRoleDataService {
+
+	HomePageVO findCurrHomePageInfo();
+
+}

src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java

@@ -0,0 +1,141 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dayu.daf.core.tool.constant.DafConstant;
+import org.energy.modules.inspection.entity.InspectionTasks;
+import org.energy.modules.inspection.service.IInspectionTasksService;
+import org.energy.modules.leger.entity.EquipmentLedger;
+import org.energy.modules.leger.entity.ToolInventoryRecord;
+import org.energy.modules.leger.service.IEquipmentLedgerService;
+import org.energy.modules.leger.service.IToolInventoryRecordService;
+import org.energy.modules.smart.entity.OperationTicket;
+import org.energy.modules.smart.entity.WorkOrder;
+import org.energy.modules.smart.entity.WorkPermit;
+import org.energy.modules.smart.service.IOperationTicketService;
+import org.energy.modules.smart.service.IWorkOrderService;
+import org.energy.modules.smart.service.IWorkPermitService;
+import org.energy.modules.spares.entity.ManufacturerInfo;
+import org.energy.modules.spares.entity.Material;
+import org.energy.modules.spares.entity.SupplierInfo;
+import org.energy.modules.spares.entity.Warehouse;
+import org.energy.modules.spares.service.IManufacturerInfoService;
+import org.energy.modules.spares.service.IMaterialService;
+import org.energy.modules.spares.service.ISupplierInfoService;
+import org.energy.modules.spares.service.IWarehouseService;
+import org.energy.modules.system.service.IRoleDataService;
+import org.energy.modules.system.vo.HomePageVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 服务实现类
+ *
+ * @author DafX
+ */
+@Service
+public class RoleDataServiceImpl  implements IRoleDataService {
+
+	@Autowired
+	private IEquipmentLedgerService equipmentLedgerService;
+	@Autowired
+	private IToolInventoryRecordService toolInventoryRecordService;
+	@Autowired
+	private IOperationTicketService operationTicketService;
+	@Autowired
+	private IWorkPermitService workPermitService;
+	@Autowired
+	private IWarehouseService warehouseService;
+	@Autowired
+	private IManufacturerInfoService manufacturerInfoService;
+	@Autowired
+	private ISupplierInfoService supplierInfoService;
+	@Autowired
+	private IMaterialService materialService;
+	@Autowired
+	private IWorkOrderService workOrderService;
+	@Autowired
+	private IInspectionTasksService inspectionTasksService;
+
+	@Override
+	public HomePageVO findCurrHomePageInfo() {
+		HomePageVO hp = new HomePageVO();
+
+		// Equipment Ledger Service
+		QueryWrapper<EquipmentLedger> qw1 = new QueryWrapper<>();
+		qw1.lambda().eq(EquipmentLedger::getCheckStatus, 1);
+		qw1.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setEquipmentLedgerAudit(equipmentLedgerService.list(qw1));
+
+		// Tool Inventory Record Service
+		QueryWrapper<ToolInventoryRecord> qw2 = new QueryWrapper<>();
+		qw2.lambda().eq(ToolInventoryRecord::getCheckStatus, 1);
+		qw2.lambda().eq(ToolInventoryRecord::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setToolInventoryRecordsAudit(toolInventoryRecordService.list(qw2));
+
+		// Operation Ticket Service
+		QueryWrapper<OperationTicket> qw3 = new QueryWrapper<>();
+		qw3.lambda().eq(OperationTicket::getReviewStatus, 1);
+		qw3.lambda().eq(OperationTicket::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setOperationTicketAudit(operationTicketService.list(qw3));
+
+		// Work Permit Service
+		QueryWrapper<WorkPermit> qw4 = new QueryWrapper<>();
+		qw4.lambda().eq(WorkPermit::getCheckStatus, 1);
+		qw4.lambda().eq(WorkPermit::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setWorkPermitAudit(workPermitService.list(qw4));
+
+		// Warehouse Service
+		QueryWrapper<Warehouse> qw5 = new QueryWrapper<>();
+		qw5.lambda().eq(Warehouse::getApprovalStatus, 1);
+		qw5.lambda().eq(Warehouse::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setWarehouseAudit(warehouseService.list(qw5));
+
+		// Manufacturer Info Service
+		QueryWrapper<ManufacturerInfo> qw6 = new QueryWrapper<>();
+		qw6.lambda().eq(ManufacturerInfo::getApprovalStatus, 1);
+		qw6.lambda().eq(ManufacturerInfo::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setManufacturerInfoAudit(manufacturerInfoService.list(qw6));
+
+		// Supplier Info Service
+		QueryWrapper<SupplierInfo> qw7 = new QueryWrapper<>();
+		qw7.lambda().eq(SupplierInfo::getApprovalStatus, 1);
+		qw7.lambda().eq(SupplierInfo::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setSupplierInfoAudit(supplierInfoService.list(qw7));
+
+		// Material Service
+		QueryWrapper<Material> qw8 = new QueryWrapper<>();
+		qw8.lambda().eq(Material::getIstatus, 1L);
+		qw8.lambda().eq(Material::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setMaterialAudit(materialService.list(qw8));
+
+		// Work Order Service (already implemented)
+		QueryWrapper<WorkOrder> qw9 = new QueryWrapper<>();
+		qw9.lambda().eq(WorkOrder::getApprovalStatus, 1);
+		qw9.lambda().eq(WorkOrder::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setWorkOrderAudit(workOrderService.list(qw9));
+
+		// Inspection Tasks Service
+		QueryWrapper<InspectionTasks> qw10 = new QueryWrapper<>();
+		qw10.lambda().eq(InspectionTasks::getTaskStatus, 1);
+		qw10.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		hp.setInspectionTasksAudit(inspectionTasksService.list(qw10));
+
+		return hp;
+	}
+
+}

src/main/java/org/energy/modules/system/vo/HomePageVO.java

@@ -0,0 +1,36 @@
+package org.energy.modules.system.vo;
+
+import lombok.Data;
+import org.energy.modules.inspection.entity.InspectionTasks;
+import org.energy.modules.leger.entity.EquipmentLedger;
+import org.energy.modules.leger.entity.ToolInventoryRecord;
+import org.energy.modules.smart.entity.OperationTicket;
+import org.energy.modules.smart.entity.WorkOrder;
+import org.energy.modules.smart.entity.WorkPermit;
+import org.energy.modules.spares.entity.ManufacturerInfo;
+import org.energy.modules.spares.entity.Material;
+import org.energy.modules.spares.entity.SupplierInfo;
+import org.energy.modules.spares.entity.Warehouse;
+
+import java.util.List;
+
+@Data
+public class HomePageVO {
+
+	// 巡检任务
+	private List<InspectionTasks> inspectionTasksAudit;
+
+	// 设备台账
+	private List<EquipmentLedger> equipmentLedgerAudit;
+	private List<ToolInventoryRecord> toolInventoryRecordsAudit;
+	// 智能两票
+	private List<OperationTicket> operationTicketAudit;
+	private List<WorkPermit> workPermitAudit;
+	// 备件管理
+	private List<Warehouse> warehouseAudit;
+	private List<ManufacturerInfo> manufacturerInfoAudit;
+	private List<SupplierInfo> supplierInfoAudit;
+	private List<Material> materialAudit;
+	// 工单
+	private List<WorkOrder> workOrderAudit;
+}