Merge remote-tracking branch 'origin/main'

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

@@ -203,7 +203,7 @@ public class EquipmentLedgerController extends DafController {
 		List<EquipmentLedger> list = new ArrayList<>();
 		for (String id : ids.split(",")) {
 			EquipmentLedger equipmentLedger = new EquipmentLedger();
-			equipmentLedger.setId(Integer.parseInt(id));
+			equipmentLedger.setId(Long.parseLong(id));
 			equipmentLedger.setCheckStatus(status);
 			list.add(equipmentLedger);
 		}
@@ -219,6 +219,12 @@ public class EquipmentLedgerController extends DafController {
 	@ApiOperation(value = "导出", notes = "传入")
 	@ApiLog
 	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
+		if (entity.containsKey("station_equal")) {
+			entity.put("station_equal", Integer.parseInt((String) entity.get("station_equal")));
+		}
+		if (entity.containsKey("userStatus_equal")) {
+			entity.put("userStatus_equal", Integer.parseInt((String) entity.get("userStatus_equal")));
+		}
 		QueryWrapper<EquipmentLedger> queryWrapper = Condition.getQueryWrapper(entity, EquipmentLedger.class);
 		queryWrapper.lambda().eq(EquipmentLedger::getIsDeleted, DafConstant.DB_NOT_DELETED);
 		List<EquipmentLedgerExcel> list = equipmentLedgerService.export(queryWrapper);

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.TechParameters;
 import org.energy.modules.leger.excel.ToolInventoryRecordExcel;
 import org.energy.modules.leger.service.*;
 import org.springframework.web.bind.annotation.*;
@@ -220,4 +221,14 @@ public class ToolInventoryRecordController extends DafController {
 		EasyExcel.write(response.getOutputStream(), ToolInventoryRecordExcel.class).sheet("工器具台账").doWrite(list);
 	}
 
+//	/**
+//	 * 删除 检验标准一览
+//	 */
+//	@GetMapping("/del")
+//	@ApiOperationSupport(order = 9)
+//	@ApiOperation(value = "逻辑删除", notes = "传入eqLedgerId")
+//	public R del(@ApiParam(value = "主键集合", required = true) @RequestParam Integer eqLedgerId) {
+//		return R.status(toolInventoryRecordService.delTechParameters(eqLedgerId));
+//	}
+
 }

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

@@ -3,6 +3,9 @@ package org.energy.modules.leger.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;
@@ -25,8 +28,9 @@ public class EquipmentLedger extends BaseEntity {
     /**
      * 主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键")
-    private Integer id;
+    private Long id;
     /**
      * 设备台账编码
      */

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

@@ -3,6 +3,9 @@ package org.energy.modules.leger.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;
@@ -25,11 +28,13 @@ public class InspectionStandards extends BaseEntity {
     /**
      * 主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键")
     private Long id;
     /**
      * 工器具编码
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "工器具编码")
     private Long toolsCodeId;
     /**

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

@@ -3,6 +3,9 @@ package org.energy.modules.leger.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;
@@ -25,18 +28,21 @@ public class InventoryDocument extends BaseEntity {
     /**
      * 主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键")
-    private Integer id;
+    private Long id;
     /**
      * 设备台账主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "设备台账主键")
-    private Integer eqLedgerId;
+    private Long eqLedgerId;
     /**
      * 工器具编码主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "工器具编码主键")
-    private Integer toolsCodeId;
+    private Long toolsCodeId;
     /**
      * 标题
      */

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

@@ -3,6 +3,9 @@ package org.energy.modules.leger.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;
@@ -25,18 +28,21 @@ public class TechParameters extends BaseEntity {
     /**
      * 主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键")
-    private Integer id;
+    private Long id;
     /**
      * 设备台账编码主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "设备台账编码主键")
-    private Integer eqLedgerId;
+    private Long eqLedgerId;
     /**
      * 工器具编码主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "工器具编码主键")
-    private Integer toolsCodeId;
+    private Long toolsCodeId;
     /**
      * 分类
      */

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

@@ -3,6 +3,9 @@ package org.energy.modules.leger.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;
@@ -25,6 +28,7 @@ public class ToolInventoryRecord extends BaseEntity {
     /**
      * 主键
      */
+	@JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键")
     private Long id;
     /**