Merge remote-tracking branch 'origin/main'

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

@@ -91,9 +91,6 @@ public class InspectionPlanController extends DafController {
 		if (StringUtil.isNotEmpty(inspectionPlan.getPlanName())) {
 			qw.lambda().like(InspectionPlan::getPlanName, inspectionPlan.getPlanName());
 		}
-		if (null != inspectionPlan.getStation()) {
-			qw.lambda().eq(InspectionPlan::getStation, inspectionPlan.getStation());
-		}
 		if (StringUtil.isNotEmpty(inspectionPlan.getPeriodType())) {
 			qw.lambda().like(InspectionPlan::getPeriodType, inspectionPlan.getPeriodType());
 		}
@@ -144,7 +141,7 @@ public class InspectionPlanController extends DafController {
 	public R submit(@Valid @RequestBody InspectionPlan inspectionPlan) {
 		inspectionPlan.setPlanStatus(1);
 		String date = LocalDate.now().toString().replace("-","");
-		String maxNo = inspectionPlanService.getMaxNo("'%" + date + "%'");
+		String maxNo = inspectionPlanService.getMaxNo(date);
 		int number;
 		if (StringUtil.isNotEmpty(maxNo)){
 			number = Integer.parseInt(maxNo.substring(9));
@@ -216,12 +213,6 @@ public class InspectionPlanController extends DafController {
 	@ApiLog
 	public void exportInspectionRoute(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
 		entity.remove("daf-auth");
-		entity.forEach((key, value) -> {
-			if (!"station".equals(key) && !"planStatus".equals(key))
-			{
-				entity.put(key, "%" + value + "%");
-			}
-		});
 		InspectionPlan vo = DataUtils.mapToEntity(entity, InspectionPlan::new);
 		List<InspectionPlanExcel> list = inspectionPlanService.export(vo);
 		response.setContentType("application/vnd.ms-excel");
@@ -249,7 +240,7 @@ public class InspectionPlanController extends DafController {
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "获取路线信息", notes = "获取路线信息")
 	public R<InspectionPlan> getDetail(String planNo) {
-		InspectionPlan detail = inspectionPlanService.getDetail("'" + planNo + "'");
+		InspectionPlan detail = inspectionPlanService.getDetail(planNo);
 		return R.data(detail);
 	}
 }

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

@@ -91,9 +91,6 @@ public class InspectionRouteController extends DafController {
 		if (StringUtil.isNotEmpty(inspectionRoute.getRouteName())) {
 			qw.lambda().like(InspectionRoute::getRouteName, inspectionRoute.getRouteName());
 		}
-		if (null != inspectionRoute.getStations()) {
-			qw.lambda().eq(InspectionRoute::getStations, inspectionRoute.getStations());
-		}
 		if (StringUtil.isNotEmpty(inspectionRoute.getType())) {
 			qw.lambda().like(InspectionRoute::getType, inspectionRoute.getType());
 		}
@@ -144,7 +141,7 @@ public class InspectionRouteController extends DafController {
 	public R submit(@Valid @RequestBody InspectionRoute inspectionRoute) {
 		inspectionRoute.setIstatus(1);
 		String date = LocalDate.now().toString().replace("-","");
-		String maxNo = inspectionRouteService.getMaxNo("'%" + date + "%'");
+		String maxNo = inspectionRouteService.getMaxNo(date);
 		int number;
 		if (StringUtil.isNotEmpty(maxNo)){
 			number = Integer.parseInt(maxNo.substring(9));
@@ -217,12 +214,6 @@ public class InspectionRouteController extends DafController {
 	@ApiLog
 	public void exportInspectionRoute(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
 		entity.remove("daf-auth");
-		entity.forEach((key, value) -> {
-			if (!"stations".equals(key) && !"istatus".equals(key))
-			{
-				entity.put(key, "%" + value + "%");
-			}
-		});
 		InspectionRoute vo = DataUtils.mapToEntity(entity, InspectionRoute::new);
 		List<InspectionRouteExcel> list = inspectionRouteService.export(vo);
 		response.setContentType("application/vnd.ms-excel");
@@ -250,7 +241,7 @@ public class InspectionRouteController extends DafController {
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "获取路线信息", notes = "获取路线信息")
 	public R<InspectionRoute> getDetailList(String routeNo) {
-		InspectionRoute DetailList = inspectionRouteService.getDetailList("'" + routeNo + "'");
+		InspectionRoute DetailList = inspectionRouteService.getDetailList(routeNo);
 		return R.data(DetailList);
 	}
 

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

@@ -162,7 +162,7 @@ public class InspectionTasksController extends DafController {
 	public R submit(@Valid @RequestBody InspectionTasks inspectionTasks) {
 		inspectionTasks.setTaskStatus(1L);
 		String date = LocalDate.now().toString().replace("-","");
-		String maxTaskNo = inspectionTasksService.getMaxTaskNo("'%" + date + "%'");
+		String maxTaskNo = inspectionTasksService.getMaxTaskNo(date);
 		int number;
 		if (StringUtil.isNotEmpty(maxTaskNo)){
 			number = Integer.parseInt(maxTaskNo.substring(9));
@@ -232,12 +232,6 @@ public class InspectionTasksController extends DafController {
 	@ApiLog
 	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
 		entity.remove("daf-auth");
-		entity.forEach((key, value) -> {
-			if (!"station".equals(key) && !"taskStatus".equals(key))
-			{
-				entity.put(key, "%" + value + "%");
-			}
-		});
 		InspectionTasks vo = DataUtils.mapToEntity(entity, InspectionTasks::new);
 		List<InspectionTasksExcel> list = inspectionTasksService.export(vo);
 		response.setContentType("application/vnd.ms-excel");
@@ -247,5 +241,13 @@ public class InspectionTasksController extends DafController {
 		EasyExcel.write(response.getOutputStream(), InspectionTasksExcel.class).sheet("巡检任务").doWrite(list);
 	}
 
+	@GetMapping("/getListByToolsCodeId")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "通过工器具编码获取巡检任务", notes = "通过工器具编码获取巡检任务")
+	public R<List<InspectionTasks>> getListByToolsCodeId(String toolsCodeId) {
+		List<InspectionTasks> pages = inspectionTasksService.getListByToolsCodeId(toolsCodeId);
+		return R.data(pages);
+	}
+
 
 }

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

@@ -40,7 +40,7 @@ public class InspectionObject extends BaseEntity {
      * 对象名称
      */
     @ApiModelProperty(value = "对象名称")
-    private Integer objectName;
+    private String objectName;
     /**
      * 场站
      */
@@ -61,11 +61,18 @@ public class InspectionObject extends BaseEntity {
      */
     @ApiModelProperty(value = "对象区域")
     private String objectArea;
+
+	/**
+	 * KKS编号
+	 */
+	@ApiModelProperty(value = "KKS编号")
+	private String kksNo;
+
     /**
      * KKS编号
      */
-    @ApiModelProperty(value = "KKS编号")
+    @ApiModelProperty(value = "工器具编号")
-    private String kksNo;
+    private String toolsCodeId;
     /**
      * 取消原因
      */

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

@@ -43,6 +43,10 @@ public class InspectionObjectExcel implements Serializable {
 	@ExcelProperty(value = "KKS编号")
 	private String kksNo;
 
+	@ColumnWidth(15)
+	@ExcelProperty(value = "工器具台账编码")
+	private String toolsCodeId;
+
 	@ColumnWidth(15)
 	@ExcelProperty(value = "取消原因")
 	private String cancelReason;

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

@@ -42,10 +42,6 @@ public class InspectionPlanExcel implements Serializable {
 	@ExcelProperty(value = "计划名称")
 	private String planName;
 
-	@ColumnWidth(15)
-	@ExcelProperty(value = "场站")
-	private String stationName;
-
 	@ColumnWidth(15)
 	@ExcelProperty(value = "计划类型")
 	private String planType;

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

@@ -42,10 +42,6 @@ public class InspectionRouteExcel implements Serializable {
 	@ExcelProperty(value = "路线名称")
 	private String routeName;
 
-	@ColumnWidth(15)
-	@ExcelProperty(value = "场站")
-	private String stationsName;
-
 	@ColumnWidth(15)
 	@ExcelProperty(value = "类型")
 	private String type;

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

@@ -18,6 +18,7 @@
         <result column="object_type" property="objectType"/>
         <result column="object_area" property="objectArea"/>
         <result column="kks_no" property="kksNo"/>
+        <result column="tools_code_id" property="tools_code_id"/>
         <result column="cancel_reason" property="cancelReason"/>
     </resultMap>
 
@@ -58,6 +59,7 @@
                        THEN '巡检对象02'
                    ELSE ''
             END AS object_name_ext
+            , tools_code_id
         FROM i_inspection_object ${ew.customSqlSegment}
     </select>
 
@@ -71,6 +73,6 @@
     </select>
 
     <select id="getDetailList" resultMap="inspectionObjectResultMap">
-        select object_name, object_type from i_inspection_object where object_no = ${object_no}
+        select object_name, object_type , station from i_inspection_object where object_no = ${object_no}
     </select>
 </mapper>

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

@@ -30,22 +30,18 @@
 
     <select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionPlanExcel">
         SELECT plan_no, plan_name, plan_type, period_type, period_value, start_time, end_time, cancel_reason
-            ,dic1.dict_value AS station_name, dic2.dict_value AS  plan_status_name
+            , dic2.dict_value AS  plan_status_name
         FROM i_inspection_plan  a
-        LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.station AND dic1.is_deleted = '0'
         LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.plan_status AND dic2.is_deleted = '0'
         WHERE a.is_deleted = 0
         <if test="entity.planNo != null and entity.planNo != ''">
-            AND a.plan_no LIKE #{entity.planNo}
+            AND a.plan_no LIKE CONCAT('%', #{entity.planNo}, '%')
         </if>
         <if test="entity.planName != null and entity.planName != ''">
-            AND a.plan_name LIKE #{entity.planName}
+            AND a.plan_name LIKE CONCAT('%', #{entity.planName}, '%')
-        </if>
-        <if test="entity.station != null and entity.station != ''">
-            AND a.station = #{entity.station}
         </if>
         <if test="entity.periodType != null and entity.periodType != ''">
-            AND a.period_type LIKE #{entity.periodType}
+            AND a.period_type LIKE CONCAT('%', #{entity.periodType}, '%')
         </if>
         <if test="entity.planStatus != null and entity.planStatus != ''">
             AND a.plan_status = #{entity.planStatus}
@@ -58,11 +54,11 @@
 
     <select id="getMaxNo" resultType="java.lang.String">
         SELECT max(plan_no)
-        FROM i_inspection_plan where plan_no like ${date}
+        FROM i_inspection_plan where plan_no like CONCAT('%', #{date}, '%')
     </select>
 
     <select id="getDetail" resultMap="inspectionPlanResultMap">
-        select plan_name, plan_type from i_inspection_plan where plan_no = ${plan_no}
+        select plan_name, plan_type from i_inspection_plan where plan_no = #{plan_no}
     </select>
 
 </mapper>

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

@@ -27,22 +27,18 @@
 
     <select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionRouteExcel">
         SELECT a.route_no, a.route_name, a.type, a.factory, a.cancel_reason
-            ,dic1.dict_value AS stations_name, dic2.dict_value AS istatus_name
+            , dic2.dict_value AS istatus_name
         FROM i_inspection_route a
-        LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.stations AND dic1.is_deleted = '0'
         LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.istatus AND dic2.is_deleted = '0'
         WHERE a.is_deleted = 0
         <if test="entity.routeNo != null and entity.routeNo != ''">
-            AND a.route_no LIKE #{entity.routeNo}
+            AND a.route_no LIKE CONCAT('%', #{entity.routeNo}, '%')
         </if>
         <if test="entity.routeName != null and entity.routeName != ''">
-            AND a.route_name LIKE #{entity.routeName}
+            AND a.route_name LIKE CONCAT('%', #{entity.routeName}, '%')
-        </if>
-        <if test="entity.stations != null and entity.stations != ''">
-            AND a.stations = #{entity.stations}
         </if>
         <if test="entity.type != null and entity.type != ''">
-            AND a.type LIKE #{entity.type}
+            AND a.type LIKE CONCAT('%', #{entity.type}, '%')
         </if>
         <if test="entity.istatus != null and entity.istatus != ''">
             AND a.istatus = #{entity.istatus}
@@ -55,11 +51,11 @@
 
     <select id="getMaxNo" resultType="java.lang.String">
         SELECT max(route_no)
-        FROM i_inspection_route where route_no like ${date}
+        FROM i_inspection_route where route_no like CONCAT('%', #{date}, '%')
     </select>
 
     <select id="getDetailList" resultMap="inspectionRouteResultMap">
-        select route_name, type from i_inspection_route where route_no = ${route_no}
+        select route_name, type from i_inspection_route where route_no = #{route_no}
     </select>
 
 </mapper>

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

@@ -39,4 +39,6 @@ public interface InspectionTasksMapper extends BaseMapper<InspectionTasks> {
 	 */
 	String getMaxTaskNO(String date);
 
+	List<InspectionTasks> getListByToolsCodeId(String toolsCodeId);
+
 }

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

@@ -44,22 +44,22 @@
         LEFT JOIN sys_dict dic2 ON dic2.code = 'task_status' AND dic2.dict_key = a.task_status AND dic2.is_deleted = '0'
         WHERE a.is_deleted = 0
         <if test="entity.taskNo != null and entity.taskNo != ''">
-            AND a.task_no LIKE #{entity.taskNo}
+            AND a.task_no LIKE CONCAT('%', #{entity.taskNo}, '%')
         </if>
         <if test="entity.taskName != null and entity.taskName != ''">
-            AND a.task_name LIKE #{entity.taskName}
+            AND a.task_name LIKE CONCAT('%', #{entity.taskName}, '%')
         </if>
         <if test="entity.station != null and entity.station != ''">
             AND a.station = #{entity.station}
         </if>
         <if test="entity.taskStartDate != null and entity.taskStartDate != ''">
-            AND a.task_start_date LIKE #{entity.taskStartDate}
+            AND a.task_start_date LIKE CONCAT('%', #{entity.taskStartDate}, '%')
         </if>
         <if test="entity.taskEndDate != null and entity.taskEndDate != ''">
-            AND a.task_end_date LIKE #{entity.taskEndDate}
+            AND a.task_end_date LIKE CONCAT('%', #{entity.taskEndDate}, '%')
         </if>
         <if test="entity.responsiblePerson != null and entity.responsiblePerson != ''">
-            AND a.responsible_person LIKE #{entity.responsiblePerson}
+            AND a.responsible_person LIKE CONCAT('%', #{entity.responsiblePerson}, '%')
         </if>
         <if test="entity.taskStatus != null and entity.taskStatus != ''">
             AND a.task_status = #{entity.taskStatus}
@@ -68,7 +68,21 @@
 
     <select id="getMaxTaskNO" resultType="java.lang.String">
         SELECT max(task_no)
-        FROM i_inspection_tasks where task_no like ${date}
+        FROM i_inspection_tasks where task_no like CONCAT('%', #{date}, '%')
+    </select>
+
+    <select id="getListByToolsCodeId" resultMap="inspectionTasksResultMap">
+        select
+            task.*
+        from
+            i_inspection_tasks task
+        inner join i_inspection_object obj
+            on obj.object_type = '工器具'
+            and obj.object_no = task.object_no
+            and obj.is_deleted = '0'
+        where
+            task.is_deleted = '0'
+            and obj.kks_no = #{toolsCodeId}
     </select>
 
 </mapper>

src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java

@@ -42,4 +42,6 @@ public interface IInspectionTasksService extends BaseService<InspectionTasks> {
 	 */
 	String getMaxTaskNo(String date);
 
+	List<InspectionTasks> getListByToolsCodeId(String toolsCodeId);
+
 }

src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java

@@ -45,4 +45,10 @@ public class InspectionTasksServiceImpl extends BaseServiceImpl<InspectionTasksM
 		return maxTakNo;
 	}
 
+	@Override
+	public List<InspectionTasks> getListByToolsCodeId(String toolsCodeId) {
+		List<InspectionTasks> list = baseMapper.getListByToolsCodeId(toolsCodeId);
+		return list;
+	}
+
 }

src/main/java/org/energy/modules/leger/controller/ToolInventoryRecordController.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.leger.entity.EquipmentLedger;
 import org.energy.modules.leger.entity.TechParameters;
 import org.energy.modules.leger.excel.ToolInventoryRecordExcel;
 import org.energy.modules.leger.service.*;
@@ -221,14 +222,26 @@ public class ToolInventoryRecordController extends DafController {
 		EasyExcel.write(response.getOutputStream(), ToolInventoryRecordExcel.class).sheet("工器具台账").doWrite(list);
 	}
 
-//	/**
+	/**
-//	 * 删除 检验标准一览
+	 * 获取对象编号
-//	 */
+	 */
-//	@GetMapping("/del")
+	@GetMapping("/getToolsCodeIdList")
-//	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 11)
-//	@ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId")
+	@ApiOperation(value = "获取工器具编码", notes = "获取工器具编码")
-//	public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer eqLedgerId) {
+	public R<List<ToolInventoryRecord>> getToolsCodeIdList() {
-//		return R.status(toolInventoryRecordService.delTechParameters(eqLedgerId));
+		List<ToolInventoryRecord> kksList = toolInventoryRecordService.getToolsCodeIdList();
-//	}
+		return R.data(kksList);
+	}
+
+	/**
+	 * 获取对象编号
+	 */
+	@GetMapping("/getDetailList")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取工器具信息", notes = "获取工器具信息")
+	public R<ToolInventoryRecord> getDetailList(String toolsCodeId) {
+		ToolInventoryRecord DetailList = toolInventoryRecordService.getDetailList("'" + toolsCodeId + "'");
+		return R.data(DetailList);
+	}
 
 }

src/main/java/org/energy/modules/leger/entity/ToolInventoryRecord.java

@@ -5,6 +5,7 @@ import com.dayu.daf.core.mp.base.BaseEntity;
 import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -99,6 +100,7 @@ public class ToolInventoryRecord extends BaseEntity {
     /**
      * 是否检验周期内
      */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
     @ApiModelProperty(value = "是否检验周期内")
     private Integer isInspectionPeriod;
     /**

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

@@ -30,4 +30,13 @@ public interface ToolInventoryRecordMapper extends BaseMapper<ToolInventoryRecor
 
 	List<ToolInventoryRecordExcel> exportData(@Param("ew") Wrapper<ToolInventoryRecord> queryWrapper);
 
+	/**
+	 * 获取kks编号
+	 */
+	List<ToolInventoryRecord> getToolsCodeIdList();
+	/**
+	 * 获取kks的信息
+	 */
+	ToolInventoryRecord getDetailList(String toolsCodeId);
+
 }

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

@@ -66,4 +66,12 @@
                    END AS check_status_ext
         FROM l_tool_inventory_record ${ew.customSqlSegment}
     </select>
+
+    <select id="getToolsCodeIdList" resultMap="toolInventoryRecordResultMap">
+        select tools_code_id from l_tool_inventory_record where is_deleted = 0 and check_status = 2
+    </select>
+
+    <select id="getDetailList" resultMap="toolInventoryRecordResultMap">
+        select ' ' as kks_encoding , stations from l_tool_inventory_record where tools_code_id = ${tools_code_id}
+    </select>
 </mapper>

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

@@ -36,4 +36,13 @@ public interface IToolInventoryRecordService extends BaseService<ToolInventoryRe
 	 */
 	List<ToolInventoryRecordExcel> export(Wrapper<ToolInventoryRecord> queryWrapper);
 
+	/**
+	 * 获取路线编号
+	 */
+	List<ToolInventoryRecord> getToolsCodeIdList();
+	/**
+	 * 获取路线的信息
+	 */
+	ToolInventoryRecord getDetailList(String toolsCodeId);
+
 }

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

@@ -26,4 +26,5 @@ public class TechParametersServiceImpl extends BaseServiceImpl<TechParametersMap
 	public boolean delTechParameters(Long eqLedgerId) {
 		return baseMapper.delTechParameters(eqLedgerId);
 	}
+
 }

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

@@ -34,4 +34,16 @@ public class ToolInventoryRecordServiceImpl extends BaseServiceImpl<ToolInventor
 		return list;
 	}
 
+	@Override
+	public List<ToolInventoryRecord> getToolsCodeIdList() {
+		List<ToolInventoryRecord> list = baseMapper.getToolsCodeIdList();
+		return list;
+	}
+
+	@Override
+	public ToolInventoryRecord getDetailList(String toolsCodeId) {
+		ToolInventoryRecord DetailList = baseMapper.getDetailList(toolsCodeId);
+		return DetailList;
+	}
+
 }

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

@@ -0,0 +1,142 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <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.smart.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+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.leger.entity.TechParameters;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.smart.entity.WorkPermitAttachment;
+import org.energy.modules.smart.vo.WorkPermitAttachmentVO;
+import org.energy.modules.smart.service.IWorkPermitAttachmentService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+import java.util.List;
+
+/**
+ * 工作票附票一览 控制器
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/smart/workpermitattachment")
+@Api(value = "工作票附票一览", tags = "工作票附票一览接口")
+public class WorkPermitAttachmentController extends DafController {
+
+	private IWorkPermitAttachmentService workPermitAttachmentService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入workPermitAttachment")
+	public R<WorkPermitAttachment> detail(WorkPermitAttachment workPermitAttachment) {
+		WorkPermitAttachment detail = workPermitAttachmentService.getOne(Condition.getQueryWrapper(workPermitAttachment));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 工作票附票一览
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入workPermitAttachment")
+	public R<IPage<WorkPermitAttachment>> list(WorkPermitAttachment workPermitAttachment, Query query) {
+		IPage<WorkPermitAttachment> pages = workPermitAttachmentService.page(Condition.getPage(query), Condition.getQueryWrapper(workPermitAttachment));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 工作票附票一览
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入workPermitAttachment")
+	public R<IPage<WorkPermitAttachmentVO>> page(WorkPermitAttachmentVO workPermitAttachment, Query query) {
+		IPage<WorkPermitAttachmentVO> pages = workPermitAttachmentService.selectWorkPermitAttachmentPage(Condition.getPage(query), workPermitAttachment);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 工作票附票一览
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入workPermitAttachment")
+	public R save(@Valid @RequestBody WorkPermitAttachment workPermitAttachment) {
+		return R.status(workPermitAttachmentService.save(workPermitAttachment));
+	}
+
+	/**
+	 * 修改 工作票附票一览
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入workPermitAttachment")
+	public R update(@Valid @RequestBody WorkPermitAttachment workPermitAttachment) {
+		return R.status(workPermitAttachmentService.updateById(workPermitAttachment));
+	}
+
+	/**
+	 * 新增或修改 工作票附票一览
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入workPermitAttachment")
+	public R submit(@Valid @RequestBody WorkPermitAttachment workPermitAttachment) {
+		String ticketNo =workPermitAttachment.getTicketCode();
+		Integer ticketType =workPermitAttachment.getTicketType();
+		Integer maxNo= workPermitAttachmentService.getCount(workPermitAttachment.getWorkTicketNo())+1;
+		String ticketIndex  =String.format("%02d", maxNo);
+		workPermitAttachment.setTicketCode(ticketNo + ticketType.toString() + ticketIndex);
+		return R.status(workPermitAttachmentService.saveOrUpdate(workPermitAttachment));
+	}
+
+	/**
+	 * 删除 工作票附票一览
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(workPermitAttachmentService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 列表 技术参数一览
+	 */
+	@GetMapping("/getList")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "列表", notes = "workPermitAttachment")
+	public R<List<WorkPermitAttachment>> getList(WorkPermitAttachment workPermitAttachment) {
+		List<WorkPermitAttachment> list = workPermitAttachmentService.list(Condition.getQueryWrapper(workPermitAttachment));
+		return R.data(list);
+	}
+}

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

@@ -0,0 +1,253 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <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.smart.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dayu.daf.core.log.annotation.ApiLog;
+import com.dayu.daf.core.tool.constant.DafConstant;
+import com.xkcoding.http.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+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 lombok.SneakyThrows;
+import org.apache.commons.codec.Charsets;
+import org.energy.modules.leger.entity.EquipmentLedger;
+import org.energy.modules.leger.excel.EquipmentLedgerExcel;
+import org.energy.modules.smart.excel.WorkOrderExcel;
+import org.energy.modules.smart.excel.WorkPermitExcel;
+import org.energy.modules.smart.service.IWorkPermitAttachmentService;
+import org.energy.modules.smart.vo.WorkOrderVO;
+import org.energy.modules.system.util.DataUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.smart.entity.WorkPermit;
+import org.energy.modules.smart.vo.WorkPermitVO;
+import org.energy.modules.smart.service.IWorkPermitService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工作票一览 控制器
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/smart/workpermit")
+@Api(value = "工作票一览", tags = "工作票一览接口")
+public class WorkPermitController extends DafController {
+
+	private IWorkPermitService workPermitService;
+	private IWorkPermitAttachmentService workPermitAttachmentService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入workPermit")
+	public R<WorkPermit> detail(WorkPermit workPermit) {
+		WorkPermit detail = workPermitService.getOne(Condition.getQueryWrapper(workPermit));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 工作票一览
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入workPermit")
+	public R<IPage<WorkPermit>> list(WorkPermit workPermit, Query query) {
+		QueryWrapper<WorkPermit> qw = new QueryWrapper<>();
+		qw.orderByAsc("eq_ledger_code");
+		//场站
+		if (null != workPermit.getStations()) {
+			qw.lambda().eq(WorkPermit::getStations, workPermit.getStations());
+		}
+		//工作票编号
+		if (StringUtil.isNotEmpty(workPermit.getWorkTicketNo())) {
+			qw.lambda().like(WorkPermit::getWorkTicketNo, workPermit.getWorkTicketNo());
+		}
+		//工作票类型
+		if (StringUtil.isNotEmpty(workPermit.getWorkTicketType())) {
+			qw.lambda().like(WorkPermit::getWorkTicketType, workPermit.getWorkTicketType());
+		}
+		//状态
+		if (null != workPermit.getWorkState()) {
+			qw.lambda().eq(WorkPermit::getWorkState, workPermit.getWorkState());
+		}
+		//许可人
+		if (StringUtil.isNotEmpty(workPermit.getLicensors())) {
+			qw.lambda().like(WorkPermit::getLicensors, workPermit.getLicensors());
+		}
+		//签发人
+		if (StringUtil.isNotEmpty(workPermit.getIssuer())) {
+			qw.lambda().like(WorkPermit::getIssuer, workPermit.getIssuer());
+		}
+	//计划开始时间
+		if (null != workPermit.getPlanStartDate()) {
+			qw.lambda().like(WorkPermit::getPlanStartDate, workPermit.getPlanStartDate());
+		}
+		//工作负责人
+		if (StringUtil.isNotEmpty(workPermit.getWorkChargePerson())) {
+			qw.lambda().like(WorkPermit::getWorkChargePerson, workPermit.getWorkChargePerson());
+		}
+		IPage<WorkPermit> pages = workPermitService.page(Condition.getPage(query), Condition.getQueryWrapper(workPermit));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 工作票一览
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入workPermit")
+	public R<IPage<WorkPermitVO>> page(WorkPermitVO workPermit, Query query) {
+		IPage<WorkPermitVO> pages = workPermitService.selectWorkPermitPage(Condition.getPage(query), workPermit);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 工作票一览
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入workPermit")
+	public R save(@Valid @RequestBody WorkPermit workPermit) {
+		return R.status(workPermitService.save(workPermit));
+	}
+
+	/**
+	 * 修改 工作票一览
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入workPermit")
+	public R update(@Valid @RequestBody WorkPermit workPermit) {
+		return R.status(workPermitService.updateById(workPermit));
+	}
+
+	/**
+	 * 新增或修改 工作票一览
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入workPermit")
+	public R submit(@Valid @RequestBody WorkPermit workPermit) {
+		return R.status(workPermitService.saveOrUpdate(workPermit));
+	}
+
+	/**
+	 * 删除 工作票一览
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		for (String id : ids.split(",")) {
+			workPermitAttachmentService.delWorkPermitAttachment(Long.parseLong(id));
+		}
+		return R.status(workPermitService.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(Integer status, String ids) {
+		List<WorkPermit> list = new ArrayList<>();
+		for (String id : ids.split(",")) {
+			WorkPermit workPermit = new WorkPermit();
+			workPermit.setId(Long.parseLong(id));
+			workPermit.setCheckStatus(status);
+			list.add(workPermit);
+		}
+		return R.status(workPermitService.updateBatchById(list));
+	}
+
+	/**
+	 * 导出
+	 */
+	@SneakyThrows
+	@GetMapping("export")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "导出", notes = "传入")
+	@ApiLog
+	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
+		WorkPermitVO vo = DataUtils.mapToEntity(entity, WorkPermitVO::new);
+		List<WorkPermitExcel> list = workPermitService.export(vo);
+		response.setContentType("application/vnd.ms-excel");
+		response.setCharacterEncoding(Charsets.UTF_8.name());
+		String fileName = URLEncoder.encode("工作票数据导出", Charsets.UTF_8.name());
+		response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+		EasyExcel.write(response.getOutputStream(), WorkPermitExcel.class).sheet("工作票").doWrite(list);
+	}
+
+	/**
+	 * 关票工作票一览
+	 */
+	@PostMapping("/closeTicket")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "更新", notes = "传入ids")
+	public R closeTicket(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		List<WorkPermit> list = new ArrayList<>();
+		for (String id : ids.split(",")) {
+			WorkPermit workPermit = new WorkPermit();
+			workPermit.setId(Long.parseLong(id));
+			workPermit.setWorkState(4);
+			list.add(workPermit);
+		}
+		return R.status(workPermitService.updateBatchById(list));
+	}
+}
+

src/main/java/org/energy/modules/smart/dto/WorkPermitAttachmentDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.smart.dto;
+
+import org.energy.modules.smart.entity.WorkPermitAttachment;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工作票附票一览数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkPermitAttachmentDTO extends WorkPermitAttachment {
+	private static final long serialVersionUID = 1L;
+
+}

src/main/java/org/energy/modules/smart/dto/WorkPermitDTO.java

@@ -0,0 +1,18 @@
+package org.energy.modules.smart.dto;
+
+import org.energy.modules.smart.entity.WorkPermit;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 工作票一览数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WorkPermitDTO extends WorkPermit {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,181 @@
+package org.energy.modules.smart.entity;
+
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 工作票一览实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@TableName("smt_work_permit")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WorkPermit对象", description = "工作票一览")
+public class WorkPermit extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+    /**
+     * KKS编码
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "KKS编码")
+    private String kksEncoding;
+    /**
+     * KKS描述
+     */
+    @ApiModelProperty(value = "KKS描述")
+    private String kksDescription;
+    /**
+     * 场站
+     */
+    @ApiModelProperty(value = "场站")
+    private Integer stations;
+    /**
+     * 工作票编号
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "工作票编号")
+    private String workTicketNo;
+    /**
+     * 工作票类型
+     */
+    @ApiModelProperty(value = "工作票类型")
+    private String workTicketType;
+    /**
+     * 工单
+     */
+    @ApiModelProperty(value = "工单")
+    private String tickets;
+    /**
+     * 班组
+     */
+    @ApiModelProperty(value = "班组")
+    private String team;
+    /**
+     * 工作负责人
+     */
+    @ApiModelProperty(value = "工作负责人")
+    private String workChargePerson;
+    /**
+     * 工作班成员
+     */
+    @ApiModelProperty(value = "工作班成员")
+    private String workClassMembers;
+    /**
+     * 许可人
+     */
+    @ApiModelProperty(value = "许可人")
+    private String licensors;
+    /**
+     * 签发人
+     */
+    @ApiModelProperty(value = "签发人")
+    private String issuer;
+    /**
+     * 功能位置
+     */
+    @ApiModelProperty(value = "功能位置")
+    private String functionalLocation;
+    /**
+     * 工作地点
+     */
+    @ApiModelProperty(value = "工作地点")
+    private String placeWork;
+    /**
+     * 工作内容
+     */
+    @ApiModelProperty(value = "工作内容")
+    private String jobDescription;
+    /**
+     * 计划开始时间
+     */
+    @ApiModelProperty(value = "计划开始时间")
+	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss")
+    private LocalDateTime planStartDate;
+    /**
+     * 计划结束时间
+     */
+    @ApiModelProperty(value = "计划结束时间")
+	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss")
+    private LocalDateTime planEndDate;
+    /**
+     * 工作条件
+     */
+    @ApiModelProperty(value = "工作条件")
+    private String workingConditions;
+    /**
+     * 实际结束时间
+     */
+    @ApiModelProperty(value = "实际结束时间")
+	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss")
+    private LocalDateTime actualEndDate;
+    /**
+     * 是否延期
+     */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "是否延期")
+    private Integer isExtended;
+    /**
+     * 计划延期时间
+     */
+    @ApiModelProperty(value = "计划延期时间")
+	@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy/MM/dd HH:mm:ss")
+    private LocalDateTime plannedExtensionDate;
+    /**
+     * 延期申请理由
+     */
+    @ApiModelProperty(value = "延期申请理由")
+    private String extRegReason;
+    /**
+     * 是否变更
+     */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "是否变更")
+    private Integer ischanged;
+    /**
+     * 变更申请理由
+     */
+    @ApiModelProperty(value = "变更申请理由")
+    private String changeReason;
+    /**
+     * 总结
+     */
+    @ApiModelProperty(value = "总结")
+    private String summary;
+    /**
+     * 工作状态
+     */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+    @ApiModelProperty(value = "工作状态")
+    private Integer workState;
+
+	/**
+	 * 审核状态
+	 */
+	@ApiModelProperty(value = "审核状态")
+	private Integer checkStatus;
+
+
+}

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

@@ -0,0 +1,74 @@
+package org.energy.modules.smart.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 工作票附票一览实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@TableName("smt_work_permit_attachment")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WorkPermitAttachment对象", description = "工作票附票一览")
+public class WorkPermitAttachment extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+	/**
+	 * 工作票主键
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@ApiModelProperty(value = "工作票主键")
+	private Long workTicketNo;
+    /**
+     * 附票编码
+     */
+	@JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "附票编码")
+    private String ticketCode;
+    /**
+     * 附票类型
+     */
+    @ApiModelProperty(value = "附票类型")
+    private Integer ticketType;
+    /**
+     * 专项作业名称
+     */
+    @ApiModelProperty(value = "专项作业名称")
+    private String specialJobName;
+    /**
+     * 工作内容
+     */
+    @ApiModelProperty(value = "工作内容")
+    private String jobDescription;
+    /**
+     * 工作状态
+     */
+    @ApiModelProperty(value = "工作状态")
+    private Integer workStatus;
+    /**
+     * 工作地点
+     */
+    @ApiModelProperty(value = "工作地点")
+    private String placeWork;
+
+
+}

src/main/java/org/energy/modules/smart/excel/WorkPermitExcel.java

@@ -0,0 +1,106 @@
+package org.energy.modules.smart.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * WorkPermit model export
+ * @author edwong
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(16)
+public class WorkPermitExcel  implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "KKS编码")
+	private String kksEncoding;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "KKS描述")
+	private String kksDescription;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "场站")
+	private String stations;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "工作票编号")
+	private String workTicketNo;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "工作票类型")
+	private String workTicketType;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "工单")
+	private String tickets;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "班组")
+	private String team;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "工作负责人")
+	private String workChargePerson;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "工作班成员")
+	private String workClassMembers;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "许可人")
+	private String licensors;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "签发人")
+	private String issuer;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "功能位置")
+	private String functionalLocation;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "工作地点")
+	private String placeWork;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "工作内容")
+	private String jobDescription;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "计划开始时间")
+	private String planStartDate;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "工作条件")
+	private String workingConditions;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "计划结束时间")
+	private String planEndDate;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "实际结束时间")
+	private String actualEndDate;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "是否延期")
+	private String isExtended;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "状态")
+	private String workState;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "审核状态")
+	private String checkStatus;
+
+}

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

@@ -0,0 +1,39 @@
+package org.energy.modules.smart.mapper;
+
+import org.energy.modules.smart.entity.WorkPermitAttachment;
+import org.energy.modules.smart.vo.WorkPermitAttachmentVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 工作票附票一览 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface WorkPermitAttachmentMapper extends BaseMapper<WorkPermitAttachment> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param workPermitAttachment
+	 * @return
+	 */
+	List<WorkPermitAttachmentVO> selectWorkPermitAttachmentPage(IPage page, WorkPermitAttachmentVO workPermitAttachment);
+
+	/**
+	 * 获取最大条数
+	 */
+	Integer getCount(Long workTicketNo);
+
+	/**
+	 * 删除
+	 *
+	 * @param workTicketNo
+	 * @return
+	 */
+	boolean delWorkPermitAttachment(Long workTicketNo);
+
+}

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

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.energy.modules.smart.mapper.WorkPermitAttachmentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="workPermitAttachmentResultMap" type="org.energy.modules.smart.entity.WorkPermitAttachment">
+        <id column="id" property="id"/>
+        <result column="status" property="status"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user" property="createUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="work_ticket_no" property="workTicketNo"/>
+        <result column="ticket_code" property="ticketCode"/>
+        <result column="ticket_type" property="ticketType"/>
+        <result column="special_job_name" property="specialJobName"/>
+        <result column="job_description" property="jobDescription"/>
+        <result column="work_status" property="workStatus"/>
+        <result column="place_work" property="placeWork"/>
+    </resultMap>
+
+
+    <select id="selectWorkPermitAttachmentPage" resultMap="workPermitAttachmentResultMap">
+        select * from smt_work_permit_attachment where is_deleted = 0
+    </select>
+
+    <select id="getCount" resultType="java.lang.Integer">
+        select count(*) from smt_work_permit_attachment where is_deleted = 0 and work_ticket_no = #{workTicketNo}
+    </select>
+
+    <update id="delWorkPermitAttachment" >
+        update smt_work_permit_attachment set is_deleted = 1 where work_ticket_no = #{workTicketNo}
+    </update>
+</mapper>

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

@@ -0,0 +1,32 @@
+package org.energy.modules.smart.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.energy.modules.smart.entity.WorkPermit;
+import org.energy.modules.smart.excel.WorkOrderExcel;
+import org.energy.modules.smart.excel.WorkPermitExcel;
+import org.energy.modules.smart.vo.WorkOrderVO;
+import org.energy.modules.smart.vo.WorkPermitVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 工作票一览 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface WorkPermitMapper extends BaseMapper<WorkPermit> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param workPermit
+	 * @return
+	 */
+	List<WorkPermitVO> selectWorkPermitPage(IPage page, WorkPermitVO workPermit);
+
+	List<WorkPermitExcel> exportData(@Param("vo") WorkPermitVO workPermit);
+
+}

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

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.energy.modules.smart.mapper.WorkPermitMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="workPermitResultMap" type="org.energy.modules.smart.entity.WorkPermit">
+        <id column="id" property="id"/>
+        <result column="status" property="status"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user" property="createUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="kks_encoding" property="kksEncoding"/>
+        <result column="kks_description" property="kksDescription"/>
+        <result column="stations" property="stations"/>
+        <result column="work_ticket_no" property="workTicketNo"/>
+        <result column="work_ticket_type" property="workTicketType"/>
+        <result column="tickets" property="tickets"/>
+        <result column="team" property="team"/>
+        <result column="work_charge_person" property="workChargePerson"/>
+        <result column="work_class_members" property="workClassMembers"/>
+        <result column="licensors" property="licensors"/>
+        <result column="issuer" property="issuer"/>
+        <result column="functional_location" property="functionalLocation"/>
+        <result column="place_work" property="placeWork"/>
+        <result column="job_description" property="jobDescription"/>
+        <result column="plan_start_date" property="planStartDate"/>
+        <result column="plan_end_date" property="planEndDate"/>
+        <result column="working_conditions" property="workingConditions"/>
+        <result column="actual_end_date" property="actualEndDate"/>
+        <result column="is_extended" property="isExtended"/>
+        <result column="planned_extension_date" property="plannedExtensionDate"/>
+        <result column="ext_reg_reason" property="extRegReason"/>
+        <result column="ischanged" property="ischanged"/>
+        <result column="change_reason" property="changeReason"/>
+        <result column="summary" property="summary"/>
+        <result column="work_state" property="workState"/>
+        <result column="check_status" property="check_status"/>
+    </resultMap>
+
+
+    <select id="selectWorkPermitPage" resultMap="workPermitResultMap">
+        select * from smt_work_permit where is_deleted = 0
+    </select>
+
+    <select id="exportData" resultType="org.energy.modules.smart.excel.WorkPermitExcel">
+        select
+            kks_encoding
+             , kks_description
+             , stations
+             , work_ticket_no
+             , work_ticket_type
+             , tickets
+             , team
+             , work_charge_person
+             , work_class_members
+             , licensors
+             , issuer
+             , functional_location
+             , place_work
+             , job_description
+             , plan_start_date
+             , working_conditions
+             , plan_end_date
+             , actual_end_date
+             , is_extended
+             , work_state
+             , check_status
+        from
+            smt_work_permit
+        where is_deleted = 0
+        <if test="vo.workTicketNo != null and vo.workTicketNo != ''">
+            and a.work_ticket_no = #{vo.workTicketNo}
+        </if>
+        <if test="vo.workTicketType != null and vo.workTicketType != ''">
+            and a.work_ticket_type = #{vo.workTicketType}
+        </if>
+        <if test="vo.workChargePerson != null and vo.workChargePerson != ''">
+            and a.work_charge_person = #{vo.workChargePerson}
+        </if>
+        <if test="vo.licensors != null and vo.licensors != ''">
+            and a.licensors = #{vo.licensors}
+        </if>
+        <if test="vo.issuer != null and vo.issuer != ''">
+            and a.issuer = #{vo.issuer}
+        </if>
+        <if test="vo.planStartDate != null and vo.planStartDate != ''">
+            and a.plan_start_date = #{vo.planStartDate}
+        </if>
+        <if test="vo.workState != null and vo.workState != ''">
+            and a.work_state = #{vo.workState}
+        </if>
+        <if test="vo.stations != null and vo.stations != ''">
+            and b.stations = ${vo.stations}
+        </if>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,43 @@
+package org.energy.modules.smart.service;
+
+import org.energy.modules.smart.entity.WorkPermitAttachment;
+import org.energy.modules.smart.vo.WorkPermitAttachmentVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.function.LongFunction;
+
+/**
+ * 工作票附票一览 服务类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface IWorkPermitAttachmentService extends BaseService<WorkPermitAttachment> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param workPermitAttachment
+	 * @return
+	 */
+	IPage<WorkPermitAttachmentVO> selectWorkPermitAttachmentPage(IPage<WorkPermitAttachmentVO> page, WorkPermitAttachmentVO workPermitAttachment);
+
+
+	/**
+	 * 获取最大条数
+	 *
+	 * @param workTicketNo
+	 */
+	Integer getCount(Long workTicketNo);
+
+	/**
+	 * 删除
+	 *
+	 * @param workTicketNo
+	 * @return
+	 */
+	boolean delWorkPermitAttachment(Long workTicketNo);
+
+}

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

@@ -0,0 +1,41 @@
+package org.energy.modules.smart.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.energy.modules.leger.entity.EquipmentLedger;
+import org.energy.modules.leger.excel.EquipmentLedgerExcel;
+import org.energy.modules.smart.entity.WorkPermit;
+import org.energy.modules.smart.excel.WorkOrderExcel;
+import org.energy.modules.smart.excel.WorkPermitExcel;
+import org.energy.modules.smart.vo.WorkOrderVO;
+import org.energy.modules.smart.vo.WorkPermitVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 工作票一览 服务类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface IWorkPermitService extends BaseService<WorkPermit> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param workPermit
+	 * @return
+	 */
+	IPage<WorkPermitVO> selectWorkPermitPage(IPage<WorkPermitVO> page, WorkPermitVO workPermit);
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param workPermit
+	 * @return
+	 */
+	List<WorkPermitExcel> export(WorkPermitVO workPermit);
+
+}

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

@@ -0,0 +1,34 @@
+package org.energy.modules.smart.service.impl;
+
+import org.energy.modules.smart.entity.WorkPermitAttachment;
+import org.energy.modules.smart.vo.WorkPermitAttachmentVO;
+import org.energy.modules.smart.mapper.WorkPermitAttachmentMapper;
+import org.energy.modules.smart.service.IWorkPermitAttachmentService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 工作票附票一览 服务实现类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Service
+public class WorkPermitAttachmentServiceImpl extends BaseServiceImpl<WorkPermitAttachmentMapper, WorkPermitAttachment> implements IWorkPermitAttachmentService {
+
+	@Override
+	public IPage<WorkPermitAttachmentVO> selectWorkPermitAttachmentPage(IPage<WorkPermitAttachmentVO> page, WorkPermitAttachmentVO workPermitAttachment) {
+		return page.setRecords(baseMapper.selectWorkPermitAttachmentPage(page, workPermitAttachment));
+	}
+	@Override
+	public Integer getCount(Long workTicketNo){
+		Integer maxCount = baseMapper.getCount(workTicketNo);
+		return maxCount;
+	}
+
+	@Override
+	public boolean delWorkPermitAttachment(Long workTicketNo) {
+		return baseMapper.delWorkPermitAttachment(workTicketNo);
+	}
+}

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

@@ -0,0 +1,53 @@
+package org.energy.modules.smart.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import io.micrometer.core.instrument.util.StringUtils;
+import org.energy.modules.leger.entity.EquipmentLedger;
+import org.energy.modules.leger.excel.EquipmentLedgerExcel;
+import org.energy.modules.smart.entity.WorkPermit;
+import org.energy.modules.smart.excel.WorkOrderExcel;
+import org.energy.modules.smart.excel.WorkPermitExcel;
+import org.energy.modules.smart.vo.WorkPermitVO;
+import org.energy.modules.smart.mapper.WorkPermitMapper;
+import org.energy.modules.smart.service.IWorkPermitService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.energy.modules.system.service.IDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+ * 工作票一览 服务实现类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Service
+public class WorkPermitServiceImpl extends BaseServiceImpl<WorkPermitMapper, WorkPermit> implements IWorkPermitService {
+
+	@Autowired
+	IDictService dictService;
+
+	@Override
+	public IPage<WorkPermitVO> selectWorkPermitPage(IPage<WorkPermitVO> page, WorkPermitVO workPermit) {
+		return page.setRecords(baseMapper.selectWorkPermitPage(page, workPermit));
+	}
+
+	@Override
+	public List<WorkPermitExcel> export(WorkPermitVO workPermit) {
+		List<WorkPermitExcel> list = baseMapper.exportData(workPermit);
+		list.forEach(item -> {
+			if (StringUtils.isNotEmpty(item.getIsExtended()))
+				item.setIsExtended(dictService.getValue("yes_no", Integer.parseInt(item.getIsExtended())));
+			if (StringUtils.isNotEmpty(item.getStations()))
+				item.setStations(dictService.getValue("station", Integer.parseInt(item.getStations())));
+			if (StringUtils.isNotEmpty(item.getWorkState()))
+				item.setWorkState(dictService.getValue("work_status", Integer.parseInt(item.getWorkState())));
+			if (StringUtils.isNotEmpty(item.getCheckStatus()))
+				item.setCheckStatus(dictService.getValue("check_status", Integer.parseInt(item.getCheckStatus())));
+		});
+		return list;
+	}
+}

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

@@ -0,0 +1,20 @@
+package org.energy.modules.smart.vo;
+
+import org.energy.modules.smart.entity.WorkPermitAttachment;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 工作票附票一览视图实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WorkPermitAttachmentVO对象", description = "工作票附票一览")
+public class WorkPermitAttachmentVO extends WorkPermitAttachment {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,20 @@
+package org.energy.modules.smart.vo;
+
+import org.energy.modules.smart.entity.WorkPermit;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 工作票一览视图实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WorkPermitVO对象", description = "工作票一览")
+public class WorkPermitVO extends WorkPermit {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -140,6 +140,26 @@ public class WarehouseController extends DafController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入warehouse")
 	public R submit(@Valid @RequestBody Warehouse warehouse) {
+		if (warehouse.getId() == null) {
+			QueryWrapper<Warehouse> qw = new QueryWrapper<>();
+			qw.lambda().select(Warehouse::getCode)
+				.eq(Warehouse::getType, warehouse.getType())
+				.eq(Warehouse::getIsDeleted, DafConstant.DB_NOT_DELETED)
+				.orderByDesc(Warehouse::getCode)
+				.last("LIMIT 1");
+			String code = "";
+			Warehouse warehouseSelect = warehouseService.getOne(qw);
+			if (warehouseSelect != null) {
+				String maxCode = warehouseSelect.getCode();
+				if ("9999".equals(maxCode)) {
+					return R.fail("操作失败，编号已越位");
+				}
+				code = "CK" + warehouse.getType() + DataUtils.incrementLast(maxCode, 4);
+			} else {
+				code = "CK" + warehouse.getType() + "0001";
+			}
+			warehouse.setCode(code);
+		}
 		return R.status(warehouseService.saveOrUpdate(warehouse));
 	}
 

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

@@ -65,12 +65,16 @@ public class ManufacturerInfo extends BaseEntity {
      */
     @ApiModelProperty(value = "经营范围")
     private String businessScope;
-    /**
+	/**
-     * 执行标准
+	 * 审核状态
-     */
+	 */
 	@JsonSerialize(nullsUsing = NullSerializer.class)
-    @ApiModelProperty(value = "执行标准")
+    @ApiModelProperty(value = "审核状态")
     private Integer approvalStatus;
-
+	/**
+	 * 执行标准
+	 */
+	@ApiModelProperty(value = "执行标准")
+	private String executiveStandards;
 
 }

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

@@ -66,10 +66,10 @@ public class SupplierInfo extends BaseEntity {
     @ApiModelProperty(value = "经营范围")
     private String businessScope;
     /**
-     * 执行标准
+     * 审核状态
      */
 	@JsonSerialize(nullsUsing = NullSerializer.class)
-    @ApiModelProperty(value = "执行标准")
+    @ApiModelProperty(value = "审核状态")
     private Integer approvalStatus;
     /**
      * 付款条约
@@ -81,6 +81,11 @@ public class SupplierInfo extends BaseEntity {
      */
     @ApiModelProperty(value = "价格条款")
     private String priceTerms;
+	/**
+	 * 执行标准
+	 */
+	@ApiModelProperty(value = "执行标准")
+	private String executiveStandards;
 
 
 }

src/main/java/org/energy/modules/spares/excel/ManufacturerInfoExcel.java

@@ -85,6 +85,14 @@ public class ManufacturerInfoExcel implements Serializable {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@ColumnWidth(20)
 	@ExcelProperty(value = "执行标准")
+	private String executiveStandards;
+
+	/**
+	 * 审核状态
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ColumnWidth(20)
+	@ExcelProperty(value = "审核状态")
 	private String approvalStatus;
 
 }

src/main/java/org/energy/modules/spares/excel/SupplierInfoExcel.java

@@ -82,7 +82,7 @@ public class SupplierInfoExcel implements Serializable {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@ColumnWidth(20)
 	@ExcelProperty(value = "执行标准")
-	private String approvalStatus;
+	private String executiveStandards;
 	/**
 	 * 付款条约
 	 */
@@ -96,4 +96,12 @@ public class SupplierInfoExcel implements Serializable {
 	@ExcelProperty(value = "价格条款")
 	private String priceTerms;
 
+	/**
+	 * 审核状态
+	 */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@ColumnWidth(20)
+	@ExcelProperty(value = "审核状态")
+	private String approvalStatus;
+
 }

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

@@ -16,6 +16,7 @@
         <result column="manufacturer_name" property="manufacturerName"/>
         <result column="registered_address" property="registeredAddress"/>
         <result column="production_address" property="productionAddress"/>
+        <result column="executive_standards" property="executiveStandards"/>
         <result column="contact_number" property="contactNumber"/>
         <result column="email" property="email"/>
         <result column="business_scope" property="businessScope"/>
@@ -36,7 +37,8 @@
         a.contact_number,
         a.email,
         a.business_scope,
-        a.approval_status
+        a.approval_status,
+        a.executive_standards
         from spt_manufacturer_info a
         where a.is_deleted = 0
         <if test="vo.creditCode != null and vo.creditCode != ''">

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

@@ -38,18 +38,16 @@
     </select>
 
     <select id="getDetailList" resultType="org.energy.modules.spares.vo.MaterialVO">
-        select material_name, model
+        SELECT
-             ,b.name as warehouse_name
+            a.material_name
-             ,inventory_count
+             , a.model
-        from s_material
+             , b.name AS warehouse_name
-        inner join (
+             , a.inventory_count
-            select code
+        FROM s_material a
-            ,name
+        LEFT JOIN spt_warehouse b ON b.code = a.warehouse
-            from spt_warehouse
+        WHERE
-            where code in (select warehouse from s_material where material_no = #{materialNo} and is_deleted = 0)
+            a.material_no = #{materialNo}
-        ) as b
+          AND a.is_deleted = 0
-        on b.code = s_material.warehouse
-        where material_no = #{materialNo} and is_deleted = 0
     </select>
 
     <select id="exportData" resultType="org.energy.modules.spares.excel.MaterialExcel">

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

@@ -19,6 +19,7 @@
         <result column="contact_number" property="contactNumber"/>
         <result column="email" property="email"/>
         <result column="business_scope" property="businessScope"/>
+        <result column="executive_standards" property="executiveStandards"/>
         <result column="approval_status" property="approvalStatus"/>
         <result column="payment_terms" property="paymentTerms"/>
         <result column="price_terms" property="priceTerms"/>
@@ -39,7 +40,8 @@
             a.business_scope,
             a.approval_status,
             a.payment_terms,
-            a.price_terms
+            a.price_terms,
+            a.executive_standards
         from spt_supplier_info a
         where a.is_deleted = 0
         <if test="vo.creditCode != null and vo.creditCode != ''">

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

@@ -54,7 +54,7 @@
     </select>
 
     <select id="getWarehouseList" resultMap="warehouseResultMap">
-        select id, code, name from spt_warehouse where is_deleted = 0
+        select id, code, name from spt_warehouse where is_deleted = 0 and approval_status = 2
     </select>
 
 </mapper>

src/main/java/org/energy/modules/system/util/DataUtils.java

@@ -68,4 +68,21 @@ public class DataUtils {
 		// Add more type conversions as needed
 		return value;
 	}
+
+	/**
+	 * 将字符串末尾的latterIndex位数字加一并格式化成latterIndex位数
+	 * @param str
+	 * @return
+	 */
+	public static String incrementLast(String str, int latterIndex) {
+		// 获取字符串末尾的latterIndex位字符
+		String lastFour = str.substring(Math.max(0, str.length() - latterIndex));
+		// 将末尾字符转换为整数
+		int number = Integer.parseInt(lastFour);
+		// 整数加一
+		number++;
+		// 格式化整数为latterIndex位数的字符串
+		String result = String.format("%0" + latterIndex + "d", number);
+		return result;
+	}
 }