【审核状态】追加

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

@@ -66,6 +66,7 @@ public class EquipmentLedgerController extends DafController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入equipmentLedger")
 	public R<IPage<EquipmentLedger>> list(EquipmentLedger equipmentLedger, Query query) {
+		query.setAscs("eq_ledger_code");
 		IPage<EquipmentLedger> pages = equipmentLedgerService.page(Condition.getPage(query), Condition.getQueryWrapper(equipmentLedger));
 		return R.data(pages);
 	}
@@ -111,7 +112,7 @@ public class EquipmentLedgerController extends DafController {
 		return R.status(equipmentLedgerService.saveOrUpdate(equipmentLedger));
 	}
 
-	
+
 	/**
 	 * 删除 设备台账编码一览
 	 */
@@ -122,5 +123,5 @@ public class EquipmentLedgerController extends DafController {
 		return R.status(equipmentLedgerService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

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

@@ -36,7 +36,7 @@ public class EquipmentLedger extends BaseEntity {
      * 用户状态
      */
     @ApiModelProperty(value = "用户状态")
-    private String userStatus;
+    private Integer userStatus;
     /**
      * KKS编码
      */
@@ -136,12 +136,12 @@ public class EquipmentLedger extends BaseEntity {
      * 场站
      */
     @ApiModelProperty(value = "场站")
-    private String station;
+    private Integer station;
     /**
      * 系统状态
      */
     @ApiModelProperty(value = "系统状态")
-    private String systemState;
+    private Integer systemState;
     /**
      * 工厂区域
      */
@@ -212,6 +212,11 @@ public class EquipmentLedger extends BaseEntity {
      */
     @ApiModelProperty(value = "成本中心")
     private String costCenter;
+	/**
+	 * 审核状态
+	 */
+	@ApiModelProperty(value = "审核状态")
+	private Integer checkStatus;
 
 
 }

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

@@ -6,6 +6,7 @@
     <resultMap id="equipmentLedgerResultMap" type="org.energy.modules.leger.entity.EquipmentLedger">
         <id column="id" property="id"/>
         <result column="status" property="status"/>
+        <result column="check_status" property="checkStatus"/>
         <result column="create_time" property="createTime"/>
         <result column="create_user" property="createUser"/>
         <result column="update_time" property="updateTime"/>