工器具台账 巡检对象 bug对应

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

@@ -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/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>
 

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/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/entity/WorkPermit.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;
@@ -126,6 +127,7 @@ public class WorkPermit extends BaseEntity {
     /**
      * 是否延期
      */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
     @ApiModelProperty(value = "是否延期")
     private Integer isExtended;
     /**
@@ -141,6 +143,7 @@ public class WorkPermit extends BaseEntity {
     /**
      * 是否变更
      */
+	@JsonSerialize(nullsUsing = NullSerializer.class)
     @ApiModelProperty(value = "是否变更")
     private Integer ischanged;
     /**