Merge remote-tracking branch 'origin/main'

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

@@ -156,25 +156,6 @@ public class EquipmentLedgerController extends DafController {
 	public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return this.approve(2,ids);
 	}
-	/**
-	 * 导出
-	 */
-	@SneakyThrows
-	@GetMapping("export")
-	@ApiOperationSupport(order = 13)
-	@ApiOperation(value = "导出", notes = "传入")
-	@ApiLog
-	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
-		QueryWrapper<EquipmentLedger> queryWrapper = Condition.getQueryWrapper(entity, EquipmentLedger.class);
-		queryWrapper.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED);
-		List<EquipmentLedgerExcel> list = equipmentLedgerService.export(queryWrapper);
-		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(), EquipmentLedgerExcel.class).sheet("数据表").doWrite(list);
-	}
-
 
 	/**
 	 * 驳回 设备台账编码一览
@@ -199,4 +180,23 @@ public class EquipmentLedgerController extends DafController {
 		}
 		return R.status(equipmentLedgerService.updateBatchById(list));
 	}
+
+	/**
+	 * 导出
+	 */
+	@SneakyThrows
+	@GetMapping("export")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "导出", notes = "传入")
+	@ApiLog
+	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
+		QueryWrapper<EquipmentLedger> queryWrapper = Condition.getQueryWrapper(entity, EquipmentLedger.class);
+		queryWrapper.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		List<EquipmentLedgerExcel> list = equipmentLedgerService.export(queryWrapper);
+		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(), EquipmentLedgerExcel.class).sheet("静态台账").doWrite(list);
+	}
 }

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

@@ -42,7 +42,7 @@ import com.dayu.daf.core.boot.ctrl.DafController;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/toolinventoryrecord")
+@RequestMapping("/leger/toolinventoryrecord")
 @Api(value = "工器具编码一览", tags = "工器具编码一览接口")
 public class ToolInventoryRecordController extends DafController {
 

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

@@ -31,7 +31,7 @@ public class ToolInventoryRecord extends BaseEntity {
      * 工器具编码
      */
     @ApiModelProperty(value = "工器具编码")
-    private String toolCode;
+    private Long toolsCodeId;
     /**
      * 工器具名称
      */

src/main/java/org/energy/modules/leger/excel/EquipmentLedgerExcel.java

@@ -30,12 +30,64 @@ import java.io.Serializable;
 @Data
 @ColumnWidth(25)
 @HeadRowHeight(20)
-@ContentRowHeight(18)
+@ContentRowHeight(16)
 public class EquipmentLedgerExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	@ColumnWidth(15)
+	@ColumnWidth(20)
-	@ExcelProperty("eqLedgerCode")
+	@ExcelProperty(value = "设备台账编码")
 	private String eqLedgerCode;
 
+	@ColumnWidth(15)
+	@ExcelProperty(value = "设备描述")
+	private String deviceDescription;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "KKS编码")
+	private String kksEncoding;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "设备种类")
+	private String eqType;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "资产编码")
+	private String assetCode;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "制造商")
+	private String manufacturer;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "制造商国家")
+	private String manufacturerCountry;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "制造商零件号")
+	private String manufacturerPartNo;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "制造年月")
+	private String manufactureDate;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "制造序列号")
+	private String manufacturingSerialNo;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "型号")
+	private String model;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "大小尺寸")
+	private String sizeAndSize;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "对象重量")
+	private String objectWeight;
+
+	@ColumnWidth(15)
+	@ExcelProperty(value = "审核状态")
+	private String checkStatusExt;
+
 }

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

@@ -57,7 +57,15 @@
     </select>
 
     <select id="exportData" resultType="org.energy.modules.leger.excel.EquipmentLedgerExcel">
-        SELECT eq_ledger_code
+        SELECT eq_ledger_code,device_description,kks_encoding,eq_type,asset_code,manufacturer,
+            manufacturer_country,manufacturer_part_no,manufacture_date,manufacturing_serial_no,
+            model,size_and_size,object_weight,
+            CASE
+                WHEN check_status = '1' THEN '审核中'
+                WHEN check_status = '2' THEN '已审核'
+                WHEN check_status = '3' THEN '未通过'
+                ELSE ''
+            END AS check_status_ext
         FROM l_equipment_ledger ${ew.customSqlSegment}
     </select>
 

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

@@ -11,7 +11,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="update_user" property="updateUser"/>
         <result column="is_deleted" property="isDeleted"/>
-        <result column="tool_code" property="toolCode"/>
+        <result column="tools_code_id" property="toolsCodeId"/>
         <result column="tool_name" property="toolName"/>
         <result column="model_specification" property="modelSpecification"/>
         <result column="configuration_date" property="configurationDate"/>