diff --git a/aucma-common/src/main/java/com/aucma/common/utils/uuid/Seq.java b/aucma-common/src/main/java/com/aucma/common/utils/uuid/Seq.java
index 86f1a5c..90b0ec9 100644
--- a/aucma-common/src/main/java/com/aucma/common/utils/uuid/Seq.java
+++ b/aucma-common/src/main/java/com/aucma/common/utils/uuid/Seq.java
@@ -1,9 +1,10 @@
 package com.aucma.common.utils.uuid;
 
-import java.util.concurrent.atomic.AtomicInteger;
 import com.aucma.common.utils.DateUtils;
 import com.aucma.common.utils.StringUtils;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * @author ruoyi 序列生成类
  */
@@ -83,4 +84,545 @@ public class Seq
         // 转字符串，用0左补齐
         return StringUtils.padl(value, length);
     }
+
+
+
+
+
+    // 成品出库记录序列类型
+    public static final String productOutstockSeqType = "PRODUCTOUTSTOCK";
+
+    // 成品出库记录接口序列数
+    private static AtomicInteger productOutstockSeq = new AtomicInteger(1);
+
+    // 成品出库记录标识
+    public static final String productOutstockCode = "PO";
+    // 成品入库记录序列类型
+
+    public static final String productInstockSeqType = "PRODUCTINSTOCK";
+
+    // 成品入库记录接口序列数
+    private static AtomicInteger productInstockSeq = new AtomicInteger(1);
+
+    // 成品入库记录标识
+    public static final String productInstockCode = "PI";
+
+
+
+    // 原材料出库记录序列类型
+    public static final String rawOutstockSeqType = "RAWOUTSTOCK";
+
+    // 原材料出库记录接口序列数
+    private static AtomicInteger rawOutstockSeq = new AtomicInteger(1);
+
+    // 原材料出库记录标识
+    public static final String rawOutstockSeqCode = "RO";
+
+
+    // 原材料退库记录序列类型
+    public static final String rawReturnSeqType = "RAWRETURN";
+
+    // 原材料退库记录接口序列数
+    private static AtomicInteger rawReturnSeq = new AtomicInteger(1);
+
+    // 原材料退库记录标识
+    public static final String rawReturnCode = "RR";
+
+    // 工单编号序列类型
+    public static final String orderCodeSeqType = "ORDER_CODE";
+
+    // 工单编号序列数
+    private static AtomicInteger orderCodeSeq = new AtomicInteger(1);
+
+    // 工单编号记录标识
+    public static final String orderCodeCode = "OC";
+
+    // 派工编号序列类型
+    public static final String dispatchCodeSeqType = "DISPATCH_CODE";
+
+    // 派工编号序列数
+    private static AtomicInteger dispatchCodeSeq = new AtomicInteger(1);
+
+    // 派工编号记录标识
+    public static final String dispatchCodeCode = "PG";
+
+    // 派工计划编号序列类型
+    public static final String planCodeSeqType = "PLAN_CODE";
+
+    // 派工计划编号序列数
+    private static AtomicInteger planCodeSeq = new AtomicInteger(1);
+
+    // 派工计划编号记录标识
+    public static final String planCodeCode = "JL";
+
+    // 生产计划明细编号记录标识
+    public static final String mesProductPlanDetailSeqType = "PRODUCTPLANDETAIL";
+
+    // 生产计划明细接口序列数
+    private static AtomicInteger mesProductPlanDetailSeq = new AtomicInteger(1);
+
+    // 生产计划明细标识
+    public static final String mesProductPlanDetailCode = "PD";
+
+    // 生产批次代码记录标识
+    public static final String mesBatchCodeSeqType = "BATCH_CODE";
+
+    // 生产批次代码序列数
+    private static AtomicInteger mesBatchCodeSeq = new AtomicInteger(1);
+
+    // 生产批次代码标识
+    public static final String mesBatchCodeCode = "RP";
+
+    // 条码内容记录标识
+    public static final String mesBarcodeSeqType = "BAR_CODE";
+
+    // 条码内容序列数
+    private static AtomicInteger mesBarcodeSeq = new AtomicInteger(1);
+
+    // 条码内容标识
+    public static final String mesBarcodeCode = "RB";
+
+
+    // 四楼到五楼内部生产条码内容记录标识
+    public static final String mesInternalBarcodeSeqType = "INTERNAL_BAR_CODE";
+
+    // 四楼到五楼内部生产条码内容序列数
+    private static AtomicInteger mesInternalBarcodeSeq = new AtomicInteger(1);
+
+    // 四楼到五楼内部生产条码内容标识
+    public static final String mesInternalBarcodeCode = "RN";
+
+
+
+    // 成品条码内容记录标识
+    public static final String mesCompBarcodeSeqType = "COMP_BAR_CODE";
+
+    // 成品条码内容序列数
+    private static AtomicInteger mesCompBarcodeSeq = new AtomicInteger(1);
+
+    // 成品条码内容标识
+    public static final String mesCompBarcodeCode = "CP";
+
+
+    // 配对条码内容记录标识
+    public static final String mesBindBarcodeSeqType = "BIND_BAR_CODE";
+
+    // 配对条码内容序列数
+    private static AtomicInteger mesBindBarcodeSeq = new AtomicInteger(1);
+
+    // 配对条码内容标识
+    public static final String mesBindBarcodeCode = "BD";
+
+
+    // 设备报修工单编号记录标识
+    public static final String dmsBillsFaultInstanceSeqType = "DMSBILLSFAULTINSTANCE";
+
+    // 设备报修工单接口序列数
+    private static AtomicInteger dmsBillsFaultInstanceSeq = new AtomicInteger(1);
+
+    // 设备报修工单标识
+    public static final String dmsBillsFaultInstanceSeqCode = "BF";
+
+
+
+    // 物料转库记录序列类型
+    public static final String wmsTransferSeqType = "WMSTRANSFER";
+
+    // 物料转库记录接口序列数
+    private static AtomicInteger wmsTransferSeq = new AtomicInteger(1);
+
+    // 物料转库记录标识
+    public static final String wmsTransferSeqCode = "TF";
+
+
+
+
+    //检修计划序列类型
+    public static final  String planRepairSeqType = "PLANREPAIR";
+    //检修计划接口序列数
+    private static AtomicInteger planRepairSeq = new AtomicInteger(1);
+    //检修记录标识
+    public static final String planRepairCode = "PR";
+    //检修工单序列类型
+    public static final String repairInstanceSeqTupe = "REPAIRINSTANCE";
+    //检修工单接口序列数
+    private static AtomicInteger repairInstanceSeq = new AtomicInteger(1);
+    //检修工单标识
+    public static final String repairInstanceCode = "RI";
+
+    //检修计划序列类型
+    public static final  String planInspectSeqType = "PLANINSPECT";
+    //检修计划接口序列数
+    private static AtomicInteger planInspectSeq = new AtomicInteger(1);
+    //检修记录标识
+    public static final String planInspectCode = "PIC";
+    //检修工单序列类型
+    public static final String InspectInstanceSeqTupe = "INSPECTINSTANCE";
+    //检修工单接口序列数
+    private static AtomicInteger INSPECTInstanceSeq = new AtomicInteger(1);
+    //检修工单标识
+    public static final String InspectInstanceCode = "IIC";
+
+
+    // 保养计划序列类型
+    public static final String planMaintSeqType = "PLANMAINT";
+
+    // 保养计划接口序列数
+    private static AtomicInteger planMaintSeq = new AtomicInteger(1);
+
+    // 保养记录标识
+    public static final String planMaintCode = "PM";
+
+
+    // 保养工单序列类型
+    public static final String maintInstanceSeqType = "MAINTINSTANCE";
+
+    // 保养工单接口序列数
+    private static AtomicInteger maintInstanceSeq = new AtomicInteger(1);
+
+    // 保养工单标识
+    public static final String maintInstanceCode = "MI";
+
+
+
+
+    // 润滑计划序列类型
+    public static final String planLubeSeqType = "PLANLUBE";
+
+    // 润滑计划接口序列数
+    private static AtomicInteger planLubeSeq = new AtomicInteger(1);
+
+    // 润滑记录标识
+    public static final String planLubeCode = "PL";
+
+
+    // 润滑工单序列类型
+    public static final String lubeInstanceSeqType = "LUBEINSTANCE";
+
+    // 润滑工单接口序列数
+    private static AtomicInteger lubeInstanceSeq = new AtomicInteger(1);
+
+    // 润滑工单标识
+    public static final String lubeInstanceCode = "LI";
+
+
+
+    // 物料移库记录序列类型
+    public static final String wmsMoveSeqType = "WMSMOVE";
+
+    // 物料移库记录接口序列数
+    private static AtomicInteger wmsMoveSeq = new AtomicInteger(1);
+
+    // 物料移库记录标识
+    public static final String wmsMoveSeqCode = "MO";
+
+
+    // 物料合库记录序列类型
+    public static final String wmsMergeSeqType = "WMSMERGE";
+
+    // 物料合库记录接口序列数
+    private static AtomicInteger wmsMergeSeq = new AtomicInteger(1);
+
+    // 物料合库记录标识
+    public static final String wmsMergeSeqCode = "ME";
+
+
+
+    // 原材料入库记录序列类型
+    public static final String rawInstockSeqType = "RAWINSTOCK";
+
+    // 原材料入库记录接口序列数
+    private static AtomicInteger rawInstockSeq = new AtomicInteger(1);
+
+    // 原材料入库记录标识
+    public static final String rawInstockSeqCode = "RI";
+
+
+    // 仓储盘点记录序列类型
+    public static final String wmsInventoryCheckSeqType = "inventorycheck";
+
+    // 仓储盘点记录接口序列数
+    private static AtomicInteger wmsInventoryCheckSeq = new AtomicInteger(1);
+
+    // 仓储盘点记录标识
+    public static final String wmsInventoryCheckSeqCode = "IC";
+
+
+    // 停用物料信息的物料编码
+    public static final String stopUsingSeqType = "";
+
+    // 停用物料信息的接口序列数
+    private static AtomicInteger stopUsingSeq = new AtomicInteger(1);
+
+    // 停用物料信息的记录标识
+    public static final String stopUsingCode = "DEL";
+
+
+    // 虚拟销售订单编码
+    public static final String mesVirtualSaleOrderSeqType = "virtualsaleorder";
+
+    // 虚拟销售订单信息的接口序列数
+    private static AtomicInteger mesVirtualSaleOrderSeq = new AtomicInteger(1);
+
+    // 虚拟销售订单信息的记录标识
+    public static final String mesVirtualSaleOrderCode = "VS";
+
+
+    // 虚拟采购订单编码
+    public static final String mesVirtualPurchaseOrderSeqType = "virtualpurchaseorder";
+
+    // 虚拟采购订单信息的接口序列数
+    private static AtomicInteger mesVirtualPurchasaeOrderSeq = new AtomicInteger(1);
+
+    // 虚拟采购订单信息的记录标识
+    public static final String mesVirtualPurchaseOrderCode = "VP";
+
+    // 采购申请提资单任务编号
+    public static final String mesPurchaseApplyProcessSeqType = "purchaseApplyProcess";
+
+    // 采购申请提资单任务编号序列数
+    private static AtomicInteger mesPurchaseApplyProcessSeq = new AtomicInteger(1);
+
+    // 采购申请提资单任务编号的记录标识
+    public static final String mesPurchaseApplyProcessCode = "CG";
+
+
+
+    // 采购合并虚拟原材料条码内容记录标识
+    public static final String mesPurchaseVirtualBarcodeSeqType = "VIRTUAL_BAR_CODE";
+
+    // 采购合并虚拟原材料条码内容序列数
+    private static AtomicInteger mesPurchaseVirtualBarcodeSeq = new AtomicInteger(1);
+
+    // 采购合并虚拟原材料条码内容标识
+    public static final String mesPurchaseVirtualBarcodeCode = "VR";
+
+
+    // 内部生产合并虚拟原材料条码内容记录标识
+    public static final String mesInternalVirtualBarcodeSeqType = "INTERNAL_VIRTUAL_BAR_CODE";
+
+    // 内部生产合并虚拟原材料条码内容序列数
+    private static AtomicInteger mesInternalVirtualBarcodeSeq = new AtomicInteger(1);
+
+    // 内部生产合并虚拟原材料条码内容标识
+    public static final String mesInternalVirtualBarcodeCode = "VI";
+
+
+
+    // 采购合并虚拟成品条码内容记录标识
+    public static final String mesPurchaseVirtualProductBarcodeSeqType = "VIRTUAL_PRODUCT_BAR_CODE";
+
+    // 采购合并虚拟成品条码内容序列数
+    private static AtomicInteger mesPurchaseVirtualProductBarcodeSeq = new AtomicInteger(1);
+
+    // 采购合并虚拟成品条码内容标识
+    public static final String mesPurchaseVirtualProductBarcodeCode = "VC";
+
+
+
+    // 内部生产合并虚拟成品条码内容记录标识
+    public static final String mesInternalVirtualProductBarcodeSeqType = "INTERNAL_VIRTUAL_PRODUCT_BAR_CODE";
+
+    // 内部生产虚拟成品条码内容序列数
+    private static AtomicInteger mesInternalVirtualProductBarcodeSeq = new AtomicInteger(1);
+
+    // 内部生产虚拟成品条码内容标识
+    public static final String mesInternalVirtualProductBarcodeCode = "VT";
+
+
+
+    // 采购申请单任务编号
+    public static final String mesPurchaseApplySeqType = "purchaseApply";
+
+    // 采购申请单任务编号序列数
+    private static AtomicInteger mesPurchaseApplySeq = new AtomicInteger(1);
+
+    // 采购申请单任务编号的记录标识
+    public static final String mesPurchaseApplyCode = "PA";
+
+
+
+
+
+    // 销售订单记录序列类型
+    public static final String mesSaleOrderSeqType = "MESSALEORDER";
+
+    // 销售订单记录接口序列数
+    private static AtomicInteger mesSaleOrderSeq = new AtomicInteger(1);
+
+    // 销售订单记录标识
+    public static final String mesSaleOrderSeqCode = "XSDD";
+
+    /**
+     * 获取通用序列号
+     *
+     * @return 序列值
+     */
+/*    public static String getId() {
+        return getId(commSeqType);
+    }*/
+
+    /**
+     * 默认16位序列号 yyMMddHHmmss + 一位机器标识 + 3长度循环递增字符串
+     *
+     * @return 序列值
+     */
+/*    public static String getId(String type) {
+        AtomicInteger atomicInt = commSeq;
+        if (uploadSeqType.equals(type)) {
+            atomicInt = uploadSeq;
+        }
+        return getId(atomicInt, 3);
+    }*/
+
+    /**
+     * 通用接口序列号 yyMMddHHmmss + 一位机器标识 + length长度循环递增字符串
+     *
+     * @param atomicInt 序列数
+     * @param length    数值长度
+     * @return 序列值
+     */
+/*    public static String getId(AtomicInteger atomicInt, int length) {
+        String result = DateUtils.dateTimeNow();
+        result += machineCode;
+        result += getSeq(atomicInt, length);
+        return result;
+    }*/
+
+    /**
+     * 序列循环递增字符串[1, 10 的 (length)幂次方), 用0左补齐length位数
+     *
+     * @return 序列值
+     */
+//    private synchronized static String getSeq(AtomicInteger atomicInt, int length) {
+//        // 先取值再+1
+//        int value = atomicInt.getAndIncrement();
+//
+//        // 如果更新后值>=10 的 (length)幂次方则重置为1
+//        int maxSeq = (int) Math.pow(10, length);
+//        if (atomicInt.get() >= maxSeq) {
+//            atomicInt.set(1);
+//        }
+//        // 转字符串，用0左补齐
+//        return StringUtils.padl(value, length);
+//    }
+
+
+    /**
+     * 默认16位序列号 yyMMddHHmmss + 一位机器标识 + 3长度循环递增字符串
+     *
+     * @return 序列值
+     */
+    public static String getId(String type,String code) {
+        AtomicInteger atomicInt = commSeq;
+        if (productOutstockSeqType.equals(type)) {
+            atomicInt = productOutstockSeq;
+        }else if (rawReturnSeqType.equals(type)) {
+            atomicInt = rawReturnSeq;
+        }else if (orderCodeSeqType.equals(type)) {
+            atomicInt = orderCodeSeq;
+        } else if (mesProductPlanDetailSeqType.equals(type)) {
+            atomicInt = mesProductPlanDetailSeq;
+        }else if (dispatchCodeSeqType.equals(type)) {
+            atomicInt = dispatchCodeSeq;
+        }else if (planCodeSeqType.equals(type)) {
+            atomicInt = planCodeSeq;
+        }else if (mesBatchCodeSeqType.equals(type)) {
+            atomicInt = mesBatchCodeSeq;
+        }else if (mesBarcodeSeqType.equals(type)) {
+            atomicInt = mesBarcodeSeq;
+        }else if (dmsBillsFaultInstanceSeqType.equals(type)) {
+            atomicInt = dmsBillsFaultInstanceSeq;
+        }else if (rawOutstockSeqType.equals(type)) {
+            atomicInt = rawOutstockSeq;
+        }else if (wmsTransferSeqType.equals(type)) {
+            atomicInt = wmsTransferSeq;
+        }else if (planMaintSeqType.equals(type)) {
+            atomicInt = planMaintSeq;
+        }else if(maintInstanceSeqType.equals(type)) {
+            atomicInt = maintInstanceSeq;
+        }else if (planLubeSeqType.equals(type)) {
+            atomicInt = planLubeSeq;
+        }else if(lubeInstanceSeqType.equals(type)) {
+            atomicInt = lubeInstanceSeq;
+        }else if(mesCompBarcodeSeqType.equals(type)) {
+            atomicInt = mesCompBarcodeSeq;
+        }else if(productInstockSeqType.equals(type)) {
+            atomicInt = productInstockSeq;
+        }else if(wmsMoveSeqType.equals(type)) {
+            atomicInt = wmsMoveSeq;
+        }else if(wmsMergeSeqType.equals(type)) {
+            atomicInt = wmsMergeSeq;
+        }else if(rawInstockSeqType.equals(type)) {
+            atomicInt = rawInstockSeq;
+        }else if(wmsInventoryCheckSeqType.equals(type)) {
+            atomicInt = wmsInventoryCheckSeq;
+        }else if (mesBindBarcodeSeqType.equals(type)) {
+            atomicInt = mesBindBarcodeSeq;
+        }else if (stopUsingSeqType.equals(type)) {
+            atomicInt = stopUsingSeq;
+        }else if (mesVirtualSaleOrderSeqType.equals(type)) {
+            atomicInt = mesVirtualSaleOrderSeq;
+        }else if (mesVirtualPurchaseOrderSeqType.equals(type)) {
+            atomicInt = mesVirtualPurchasaeOrderSeq;
+        }else if (mesPurchaseApplyProcessSeqType.equals(type)) {
+            atomicInt = mesPurchaseApplyProcessSeq;
+        }else if (mesPurchaseVirtualBarcodeSeqType.equals(type)) {
+            atomicInt = mesPurchaseVirtualBarcodeSeq;
+        }else if (mesPurchaseVirtualProductBarcodeSeqType.equals(type)) {
+            atomicInt = mesPurchaseVirtualProductBarcodeSeq;
+        }else if (mesInternalVirtualBarcodeSeqType.equals(type)) {
+            atomicInt = mesInternalVirtualBarcodeSeq;
+        }else if (mesInternalVirtualProductBarcodeSeqType.equals(type)) {
+            atomicInt = mesInternalVirtualProductBarcodeSeq;
+        }else if (mesInternalBarcodeSeqType.equals(type)) {
+            atomicInt = mesInternalBarcodeSeq;
+        }else if (mesPurchaseApplySeqType.equals(type)) {
+            atomicInt = mesPurchaseApplySeq;
+        }
+        return getId(atomicInt, 3, code);
+    }
+
+
+    /**
+     * 通用接口序列号 yyMMddHHmmss + 一位机器标识 + length长度循环递增字符串
+     *
+     * @param atomicInt 序列数
+     * @param length    数值长度
+     * @return 序列值
+     */
+    public static String getId(AtomicInteger atomicInt, int length, String code) {
+        String result = DateUtils.dateTimeNow();
+        result += code;
+        result += getSeq(atomicInt, length);
+        return result;
+    }
+
+    /**
+     * 默认16位序列号 yyMMddHHmmss + 一位机器标识 + 3长度循环递增字符串
+     *
+     * @return 序列值
+     */
+    public static String getNewId(String type,String code) {
+        AtomicInteger atomicInt = commSeq;
+        if (productOutstockSeqType.equals(type)) {
+            atomicInt = productOutstockSeq;
+        }
+        return getNewId(atomicInt, 4, code);
+    }
+
+    /**
+     * 通用接口序列号 前缀+yyMMdd + length长度循环递增字符串
+     *
+     * @param atomicInt 序列数
+     * @param length    数值长度
+     * @return 序列值
+     */
+    public static String getNewId(AtomicInteger atomicInt, int length, String code) {
+        String result = code;
+        result += DateUtils.dateTime();
+        result += getSeq(atomicInt, length);
+        return result;
+    }
+
 }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectProjectController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectProjectController.java
index c59033e..5b064a5 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectProjectController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectProjectController.java
@@ -55,7 +55,7 @@ public class DmsBaseInspectProjectController extends BaseController
      * 导出巡检项目信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectProject:export')" )
-    //@Log(title = "巡检项目信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "巡检项目信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseInspectProject dmsBaseInspectProject)
     {
@@ -78,7 +78,7 @@ public class DmsBaseInspectProjectController extends BaseController
      * 新增巡检项目信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectProject:add')" )
-    //@Log(title = "巡检项目信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "巡检项目信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseInspectProject dmsBaseInspectProject)
     {
@@ -89,7 +89,7 @@ public class DmsBaseInspectProjectController extends BaseController
      * 修改巡检项目信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectProject:edit')" )
-    //@Log(title = "巡检项目信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "巡检项目信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseInspectProject dmsBaseInspectProject)
     {
@@ -100,7 +100,7 @@ public class DmsBaseInspectProjectController extends BaseController
      * 删除巡检项目信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectProject:remove')" )
-    //@Log(title = "巡检项目信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "巡检项目信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{inspectProjectIds}")
     public AjaxResult remove(@PathVariable Long[] inspectProjectIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectRouteController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectRouteController.java
index ec7e725..dadd3d5 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectRouteController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectRouteController.java
@@ -56,7 +56,7 @@ public class DmsBaseInspectRouteController extends BaseController
      * 导出巡检线路信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectRoute:export')" )
-    //@Log(title = "巡检线路信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "巡检线路信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseInspectRoute dmsBaseInspectRoute)
     {
@@ -79,7 +79,7 @@ public class DmsBaseInspectRouteController extends BaseController
      * 新增巡检线路信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectRoute:add')" )
-    //@Log(title = "巡检线路信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "巡检线路信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseInspectRoute dmsBaseInspectRoute)
     {
@@ -90,7 +90,7 @@ public class DmsBaseInspectRouteController extends BaseController
      * 修改巡检线路信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectRoute:edit')" )
-    //@Log(title = "巡检线路信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "巡检线路信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseInspectRoute dmsBaseInspectRoute)
     {
@@ -101,7 +101,7 @@ public class DmsBaseInspectRouteController extends BaseController
      * 删除巡检线路信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectRoute:remove')" )
-    //@Log(title = "巡检线路信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "巡检线路信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{inspectRouteIds}")
     public AjaxResult remove(@PathVariable Long[] inspectRouteIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectStandardController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectStandardController.java
index 0aa7aa6..fec9041 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectStandardController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseInspectStandardController.java
@@ -45,7 +45,7 @@ public class DmsBaseInspectStandardController extends BaseController
      * 导出巡检标准信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectStandard:export')" )
-    //@Log(title = "巡检标准信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "巡检标准信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseInspectStandard dmsBaseInspectStandard)
     {
@@ -68,7 +68,7 @@ public class DmsBaseInspectStandardController extends BaseController
      * 新增巡检标准信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectStandard:add')" )
-    //@Log(title = "巡检标准信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "巡检标准信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseInspectStandard dmsBaseInspectStandard)
     {
@@ -79,7 +79,7 @@ public class DmsBaseInspectStandardController extends BaseController
      * 修改巡检标准信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectStandard:edit')" )
-    //@Log(title = "巡检标准信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "巡检标准信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseInspectStandard dmsBaseInspectStandard)
     {
@@ -90,7 +90,7 @@ public class DmsBaseInspectStandardController extends BaseController
      * 删除巡检标准信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseInspectStandard:remove')" )
-    //@Log(title = "巡检标准信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "巡检标准信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{inspectStandardIds}")
     public AjaxResult remove(@PathVariable Long[] inspectStandardIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseLubeStandardController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseLubeStandardController.java
index a73f3aa..58da268 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseLubeStandardController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseLubeStandardController.java
@@ -43,7 +43,7 @@ public class DmsBaseLubeStandardController extends BaseController
      * 导出润滑标准信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:lubeStandard:export')" )
-    //@Log(title = "润滑标准信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "润滑标准信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseLubeStandard dmsBaseLubeStandard)
     {
@@ -77,7 +77,7 @@ public class DmsBaseLubeStandardController extends BaseController
      * 新增润滑标准信息
      */
     @PreAuthorize("@ss.hasPermi('dms:lubeStandard:add')" )
-    //@Log(title = "润滑标准信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "润滑标准信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseLubeStandard dmsBaseLubeStandard)
     {
@@ -88,7 +88,7 @@ public class DmsBaseLubeStandardController extends BaseController
      * 修改润滑标准信息
      */
     @PreAuthorize("@ss.hasPermi('dms:lubeStandard:edit')" )
-    //@Log(title = "润滑标准信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "润滑标准信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseLubeStandard dmsBaseLubeStandard)
     {
@@ -99,7 +99,7 @@ public class DmsBaseLubeStandardController extends BaseController
      * 删除润滑标准信息
      */
     @PreAuthorize("@ss.hasPermi('dms:lubeStandard:remove')" )
-    //@Log(title = "润滑标准信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "润滑标准信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{lubeStandardIds}")
     public AjaxResult remove(@PathVariable Long[] lubeStandardIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseLubeStationController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseLubeStationController.java
index 3a7a1cf..c54b0fb 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseLubeStationController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseLubeStationController.java
@@ -45,7 +45,7 @@ public class DmsBaseLubeStationController extends BaseController
      * 导出润滑部位信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:lubeStation:export')" )
-    //@Log(title = "润滑部位信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "润滑部位信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseLubeStation dmsBaseLubeStation)
     {
@@ -68,7 +68,7 @@ public class DmsBaseLubeStationController extends BaseController
      * 新增润滑部位信息
      */
     @PreAuthorize("@ss.hasPermi('dms:lubeStation:add')" )
-    //@Log(title = "润滑部位信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "润滑部位信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseLubeStation dmsBaseLubeStation)
     {
@@ -79,7 +79,7 @@ public class DmsBaseLubeStationController extends BaseController
      * 修改润滑部位信息
      */
     @PreAuthorize("@ss.hasPermi('dms:lubeStation:edit')" )
-    //@Log(title = "润滑部位信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "润滑部位信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseLubeStation dmsBaseLubeStation)
     {
@@ -90,7 +90,7 @@ public class DmsBaseLubeStationController extends BaseController
      * 删除润滑部位信息
      */
     @PreAuthorize("@ss.hasPermi('dms:lubeStation:remove')" )
-    //@Log(title = "润滑部位信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "润滑部位信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{lubeStationIds}")
     public AjaxResult remove(@PathVariable Long[] lubeStationIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintProjectController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintProjectController.java
index 75bdc4e..8b7c52a 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintProjectController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintProjectController.java
@@ -45,7 +45,7 @@ public class DmsBaseMaintProjectController extends BaseController
      * 导出保养项目信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseMaintProject:export')" )
-    //@Log(title = "保养项目信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "保养项目信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseMaintProject dmsBaseMaintProject)
     {
@@ -68,7 +68,7 @@ public class DmsBaseMaintProjectController extends BaseController
      * 新增保养项目信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseMaintProject:add')" )
-    //@Log(title = "保养项目信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "保养项目信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseMaintProject dmsBaseMaintProject)
     {
@@ -79,7 +79,7 @@ public class DmsBaseMaintProjectController extends BaseController
      * 修改保养项目信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseMaintProject:edit')" )
-    //@Log(title = "保养项目信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "保养项目信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseMaintProject dmsBaseMaintProject)
     {
@@ -90,7 +90,7 @@ public class DmsBaseMaintProjectController extends BaseController
      * 删除保养项目信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBaseMaintProject:remove')" )
-    //@Log(title = "保养项目信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "保养项目信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{maintProjectIds}")
     public AjaxResult remove(@PathVariable Long[] maintProjectIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintStandardController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintStandardController.java
index 0ea655b..7528902 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintStandardController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintStandardController.java
@@ -45,7 +45,7 @@ public class DmsBaseMaintStandardController extends BaseController
      * 导出保养标准信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:standard:export')" )
-    //@Log(title = "保养标准信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "保养标准信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseMaintStandard dmsBaseMaintStandard)
     {
@@ -80,7 +80,7 @@ public class DmsBaseMaintStandardController extends BaseController
      * 新增保养标准信息
      */
     @PreAuthorize("@ss.hasPermi('dms:standard:add')" )
-    //@Log(title = "保养标准信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "保养标准信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseMaintStandard dmsBaseMaintStandard)
     {
@@ -91,7 +91,7 @@ public class DmsBaseMaintStandardController extends BaseController
      * 修改保养标准信息
      */
     @PreAuthorize("@ss.hasPermi('dms:standard:edit')" )
-    //@Log(title = "保养标准信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "保养标准信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseMaintStandard dmsBaseMaintStandard)
     {
@@ -102,7 +102,7 @@ public class DmsBaseMaintStandardController extends BaseController
      * 删除保养标准信息
      */
     @PreAuthorize("@ss.hasPermi('dms:standard:remove')" )
-    //@Log(title = "保养标准信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "保养标准信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{maintStandardIds}")
     public AjaxResult remove(@PathVariable Long[] maintStandardIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintStationController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintStationController.java
index 5fb08ee..509b145 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintStationController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseMaintStationController.java
@@ -45,7 +45,7 @@ public class DmsBaseMaintStationController extends BaseController
      * 导出保养部位信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:station:export')" )
-    //@Log(title = "保养部位信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "保养部位信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseMaintStation dmsBaseMaintStation)
     {
@@ -68,7 +68,7 @@ public class DmsBaseMaintStationController extends BaseController
      * 新增保养部位信息
      */
     @PreAuthorize("@ss.hasPermi('dms:station:add')" )
-    //@Log(title = "保养部位信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "保养部位信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseMaintStation dmsBaseMaintStation)
     {
@@ -79,7 +79,7 @@ public class DmsBaseMaintStationController extends BaseController
      * 修改保养部位信息
      */
     @PreAuthorize("@ss.hasPermi('dms:station:edit')" )
-    //@Log(title = "保养部位信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "保养部位信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseMaintStation dmsBaseMaintStation)
     {
@@ -90,7 +90,7 @@ public class DmsBaseMaintStationController extends BaseController
      * 删除保养部位信息
      */
     @PreAuthorize("@ss.hasPermi('dms:station:remove')" )
-    //@Log(title = "保养部位信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "保养部位信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{maintStationIds}")
     public AjaxResult remove(@PathVariable Long[] maintStationIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java
index e1524f3..2cc41f6 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutReasonController.java
@@ -45,7 +45,7 @@ public class DmsBaseShutReasonController extends BaseController
      * 导出停机原因信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:shutReason:export')" )
-    //@Log(title = "停机原因信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "停机原因信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseShutReason dmsBaseShutReason)
     {
@@ -68,7 +68,7 @@ public class DmsBaseShutReasonController extends BaseController
      * 新增停机原因信息
      */
     @PreAuthorize("@ss.hasPermi('dms:shutReason:add')" )
-    //@Log(title = "停机原因信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "停机原因信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseShutReason dmsBaseShutReason)
     {
@@ -79,7 +79,7 @@ public class DmsBaseShutReasonController extends BaseController
      * 修改停机原因信息
      */
     @PreAuthorize("@ss.hasPermi('dms:shutReason:edit')" )
-    //@Log(title = "停机原因信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "停机原因信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseShutReason dmsBaseShutReason)
     {
@@ -90,7 +90,7 @@ public class DmsBaseShutReasonController extends BaseController
      * 删除停机原因信息
      */
     @PreAuthorize("@ss.hasPermi('dms:shutReason:remove')" )
-    //@Log(title = "停机原因信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "停机原因信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{shutReasonIds}")
     public AjaxResult remove(@PathVariable Long[] shutReasonIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutTypeController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutTypeController.java
index b181d68..a1e03d5 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutTypeController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseShutTypeController.java
@@ -45,7 +45,7 @@ public class DmsBaseShutTypeController extends BaseController
      * 导出停机类型信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:shutType:export')" )
-    //@Log(title = "停机类型信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "停机类型信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseShutType dmsBaseShutType)
     {
@@ -68,7 +68,7 @@ public class DmsBaseShutTypeController extends BaseController
      * 新增停机类型信息
      */
     @PreAuthorize("@ss.hasPermi('dms:shutType:add')" )
-    //@Log(title = "停机类型信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "停机类型信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseShutType dmsBaseShutType)
     {
@@ -79,7 +79,7 @@ public class DmsBaseShutTypeController extends BaseController
      * 修改停机类型信息
      */
     @PreAuthorize("@ss.hasPermi('dms:shutType:edit')" )
-    //@Log(title = "停机类型信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "停机类型信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseShutType dmsBaseShutType)
     {
@@ -90,7 +90,7 @@ public class DmsBaseShutTypeController extends BaseController
      * 删除停机类型信息
      */
     @PreAuthorize("@ss.hasPermi('dms:shutType:remove')" )
-    //@Log(title = "停机类型信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "停机类型信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{shutTypeIds}")
     public AjaxResult remove(@PathVariable Long[] shutTypeIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseStationProjectController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseStationProjectController.java
index 75677e8..fcd5da9 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseStationProjectController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBaseStationProjectController.java
@@ -42,7 +42,7 @@ public class DmsBaseStationProjectController extends BaseController
      * 导出保养部位关联项目信息列表
      */
 /*    @PreAuthorize("@ss.hasPermi('dms:baseStationProject:export')" )*/
-    //@Log(title = "保养部位关联项目信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "保养部位关联项目信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBaseStationProject dmsBaseStationProject)
     {
@@ -65,7 +65,7 @@ public class DmsBaseStationProjectController extends BaseController
      * 新增保养部位关联项目信息
      */
 /*    @PreAuthorize("@ss.hasPermi('dms:baseStationProject:add')" )*/
-    //@Log(title = "保养部位关联项目信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "保养部位关联项目信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBaseStationProject dmsBaseStationProject)
     {
@@ -76,7 +76,7 @@ public class DmsBaseStationProjectController extends BaseController
      * 修改保养部位关联项目信息
      */
 /*    @PreAuthorize("@ss.hasPermi('dms:baseStationProject:edit')" )*/
-    //@Log(title = "保养部位关联项目信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "保养部位关联项目信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBaseStationProject dmsBaseStationProject)
     {
@@ -87,7 +87,7 @@ public class DmsBaseStationProjectController extends BaseController
      * 删除保养部位关联项目信息
      */
 /*    @PreAuthorize("@ss.hasPermi('dms:baseStationProject:remove')" )*/
-    //@Log(title = "保养部位关联项目信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "保养部位关联项目信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{maintStationIds}")
     public AjaxResult remove(@PathVariable Long[] maintStationIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsFaultInstanceController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsFaultInstanceController.java
index 32bce6d..06e636b 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsFaultInstanceController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsFaultInstanceController.java
@@ -66,7 +66,7 @@ public class DmsBillsFaultInstanceController extends BaseController
      * 导出检修工单列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsFaultInstance:export')" )
-    //@Log(title = "检修工单", businessType = BusinessType.EXPORT)
+    ////@Log(title = "检修工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBillsFaultInstance dmsBillsFaultInstance)
     {
@@ -89,7 +89,7 @@ public class DmsBillsFaultInstanceController extends BaseController
      * 新增检修工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsFaultInstance:add')" )
-    //@Log(title = "检修工单", businessType = BusinessType.INSERT)
+    ////@Log(title = "检修工单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBillsFaultInstance dmsBillsFaultInstance)
     {
@@ -100,7 +100,7 @@ public class DmsBillsFaultInstanceController extends BaseController
      * 修改检修工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsFaultInstance:edit')" )
-    //@Log(title = "检修工单", businessType = BusinessType.UPDATE)
+    ////@Log(title = "检修工单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBillsFaultInstance dmsBillsFaultInstance)
     {
@@ -111,7 +111,7 @@ public class DmsBillsFaultInstanceController extends BaseController
      * 删除检修工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsFaultInstance:remove')" )
-    //@Log(title = "检修工单", businessType = BusinessType.DELETE)
+    ////@Log(title = "检修工单", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{repairInstanceIds}")
     public AjaxResult remove(@PathVariable Long[] repairInstanceIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsInspectInstanceActivityController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsInspectInstanceActivityController.java
index f72328a..2ec16fb 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsInspectInstanceActivityController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsInspectInstanceActivityController.java
@@ -45,7 +45,7 @@ public class DmsBillsInspectInstanceActivityController extends BaseController
      * 导出点巡检工单实例节点列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsInspectActivity:export')" )
-    //@Log(title = "点巡检工单实例节点", businessType = BusinessType.EXPORT)
+    ////@Log(title = "点巡检工单实例节点", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity)
     {
@@ -68,7 +68,7 @@ public class DmsBillsInspectInstanceActivityController extends BaseController
      * 新增点巡检工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsInspectActivity:add')" )
-    //@Log(title = "点巡检工单实例节点", businessType = BusinessType.INSERT)
+    ////@Log(title = "点巡检工单实例节点", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity)
     {
@@ -79,7 +79,7 @@ public class DmsBillsInspectInstanceActivityController extends BaseController
      * 修改点巡检工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsInspectActivity:edit')" )
-    //@Log(title = "点巡检工单实例节点", businessType = BusinessType.UPDATE)
+    ////@Log(title = "点巡检工单实例节点", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity)
     {
@@ -90,7 +90,7 @@ public class DmsBillsInspectInstanceActivityController extends BaseController
      * 删除点巡检工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsInspectActivity:remove')" )
-    //@Log(title = "点巡检工单实例节点", businessType = BusinessType.DELETE)
+    ////@Log(title = "点巡检工单实例节点", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{instanceActivityIds}")
     public AjaxResult remove(@PathVariable Long[] instanceActivityIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsInspectInstanceController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsInspectInstanceController.java
index 3887126..f403c6a 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsInspectInstanceController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsInspectInstanceController.java
@@ -66,7 +66,7 @@ public class DmsBillsInspectInstanceController extends BaseController
      * 导出巡检工单列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsInstance:export')" )
-    //@Log(title = "巡检工单", businessType = BusinessType.EXPORT)
+    ////@Log(title = "巡检工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBillsInspectInstance dmsBillsInspectInstance)
     {
@@ -89,7 +89,7 @@ public class DmsBillsInspectInstanceController extends BaseController
      * 新增巡检工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsInstance:add')" )
-    //@Log(title = "巡检工单", businessType = BusinessType.INSERT)
+    ////@Log(title = "巡检工单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBillsInspectInstance dmsBillsInspectInstance)
     {
@@ -112,7 +112,8 @@ public class DmsBillsInspectInstanceController extends BaseController
         //        DmsRepairInstance dmsRepairInstance = dmsRepairInstanceService.selectDmsRepairInstanceByRepairInstanceId(2l);
 
         dmsBillsInspectInstance.setPlanInspectId(dmsPlanInspect.getPlanInspectId());
-        dmsBillsInspectInstance.setWfProcessId(105l);
+        // 已废弃审批流功能
+        // dmsBillsInspectInstance.setWfProcessId(105l);
         dmsBillsInspectInstance.setInspectType(dmsPlanInspect.getInspectType());
         dmsBillsInspectInstance.setPlanBeginTime(dmsPlanInspect.getPlanTime());
         dmsBillsInspectInstance.setPlanEndTime(new Date(dmsPlanInspect.getPlanTime().getTime()+dmsPlanInspect.getTimeLimit()*1000l));
@@ -128,7 +129,7 @@ public class DmsBillsInspectInstanceController extends BaseController
      * 修改巡检工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsInstance:edit')" )
-    //@Log(title = "巡检工单", businessType = BusinessType.UPDATE)
+    ////@Log(title = "巡检工单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBillsInspectInstance dmsBillsInspectInstance)
     {
@@ -139,7 +140,7 @@ public class DmsBillsInspectInstanceController extends BaseController
      * 删除巡检工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsInstance:remove')" )
-    //@Log(title = "巡检工单", businessType = BusinessType.DELETE)
+    ////@Log(title = "巡检工单", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{inspectInstanceIds}")
     public AjaxResult remove(@PathVariable Long[] inspectInstanceIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsLubeInstanceActivityController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsLubeInstanceActivityController.java
index 4c1c601..d9c6646 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsLubeInstanceActivityController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsLubeInstanceActivityController.java
@@ -45,7 +45,7 @@ public class DmsBillsLubeInstanceActivityController extends BaseController
      * 导出润滑工单实例节点列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsLubeInstanceActivity:export')" )
-    //@Log(title = "润滑工单实例节点", businessType = BusinessType.EXPORT)
+    ////@Log(title = "润滑工单实例节点", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBillsLubeInstanceActivity dmsBillsLubeInstanceActivity)
     {
@@ -68,7 +68,7 @@ public class DmsBillsLubeInstanceActivityController extends BaseController
      * 新增润滑工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsLubeInstanceActivity:add')" )
-    //@Log(title = "润滑工单实例节点", businessType = BusinessType.INSERT)
+    ////@Log(title = "润滑工单实例节点", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBillsLubeInstanceActivity dmsBillsLubeInstanceActivity)
     {
@@ -79,7 +79,7 @@ public class DmsBillsLubeInstanceActivityController extends BaseController
      * 修改润滑工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsLubeInstanceActivity:edit')" )
-    //@Log(title = "润滑工单实例节点", businessType = BusinessType.UPDATE)
+    ////@Log(title = "润滑工单实例节点", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBillsLubeInstanceActivity dmsBillsLubeInstanceActivity)
     {
@@ -90,7 +90,7 @@ public class DmsBillsLubeInstanceActivityController extends BaseController
      * 删除润滑工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsLubeInstanceActivity:remove')" )
-    //@Log(title = "润滑工单实例节点", businessType = BusinessType.DELETE)
+    ////@Log(title = "润滑工单实例节点", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{instanceActivityIds}")
     public AjaxResult remove(@PathVariable Long[] instanceActivityIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsLubeInstanceController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsLubeInstanceController.java
index 56c0b7f..9f3ab05 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsLubeInstanceController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsLubeInstanceController.java
@@ -48,7 +48,7 @@ public class DmsBillsLubeInstanceController extends BaseController
      * 导出润滑工单列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsLubeInstance:export')" )
-    //@Log(title = "润滑工单", businessType = BusinessType.EXPORT)
+    ////@Log(title = "润滑工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBillsLubeInstance dmsBillsLubeInstance)
     {
@@ -71,7 +71,7 @@ public class DmsBillsLubeInstanceController extends BaseController
      * 新增润滑工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsLubeInstance:add')" )
-    //@Log(title = "润滑工单", businessType = BusinessType.INSERT)
+    ////@Log(title = "润滑工单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBillsLubeInstance dmsBillsLubeInstance)
     {
@@ -91,7 +91,7 @@ public class DmsBillsLubeInstanceController extends BaseController
      * 修改润滑工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsLubeInstance:edit')" )
-    //@Log(title = "润滑工单", businessType = BusinessType.UPDATE)
+    ////@Log(title = "润滑工单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBillsLubeInstance dmsBillsLubeInstance)
     {
@@ -102,7 +102,7 @@ public class DmsBillsLubeInstanceController extends BaseController
      * 删除润滑工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsLubeInstance:remove')" )
-    //@Log(title = "润滑工单", businessType = BusinessType.DELETE)
+    ////@Log(title = "润滑工单", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{lubeInstanceIds}")
     public AjaxResult remove(@PathVariable Long[] lubeInstanceIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsMaintInstanceController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsMaintInstanceController.java
index 21a7aab..346b9a9 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsMaintInstanceController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsMaintInstanceController.java
@@ -48,7 +48,7 @@ public class DmsBillsMaintInstanceController extends BaseController
      * 导出保养工单列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsMaintInstance:export')" )
-    //@Log(title = "保养工单", businessType = BusinessType.EXPORT)
+    ////@Log(title = "保养工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsBillsMaintInstance dmsBillsMaintInstance)
     {
@@ -71,7 +71,7 @@ public class DmsBillsMaintInstanceController extends BaseController
      * 新增保养工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsMaintInstance:add')" )
-    //@Log(title = "保养工单", businessType = BusinessType.INSERT)
+    ////@Log(title = "保养工单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsBillsMaintInstance dmsBillsMaintInstance)
     {
@@ -90,7 +90,7 @@ public class DmsBillsMaintInstanceController extends BaseController
      * 修改保养工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsMaintInstance:edit')" )
-    //@Log(title = "保养工单", businessType = BusinessType.UPDATE)
+    ////@Log(title = "保养工单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsBillsMaintInstance dmsBillsMaintInstance)
     {
@@ -101,7 +101,7 @@ public class DmsBillsMaintInstanceController extends BaseController
      * 删除保养工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsBillsMaintInstance:remove')" )
-    //@Log(title = "保养工单", businessType = BusinessType.DELETE)
+    ////@Log(title = "保养工单", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{maintInstanceIds}")
     public AjaxResult remove(@PathVariable Long[] maintInstanceIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFaultInstanceActivityController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFaultInstanceActivityController.java
index 4e4238c..dc9c315 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFaultInstanceActivityController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsFaultInstanceActivityController.java
@@ -46,7 +46,7 @@ public class DmsFaultInstanceActivityController extends BaseController
      * 导出故障报修工单实例节点列表
      */
     @PreAuthorize("@ss.hasPermi('dms:activity:export')" )
-    //@Log(title = "故障报修工单实例节点", businessType = BusinessType.EXPORT)
+    ////@Log(title = "故障报修工单实例节点", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsFaultInstanceActivity dmsFaultInstanceActivity)
     {
@@ -69,7 +69,7 @@ public class DmsFaultInstanceActivityController extends BaseController
      * 新增故障报修工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:activity:add')" )
-    //@Log(title = "故障报修工单实例节点", businessType = BusinessType.INSERT)
+    ////@Log(title = "故障报修工单实例节点", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsFaultInstanceActivity dmsFaultInstanceActivity)
     {
@@ -80,7 +80,7 @@ public class DmsFaultInstanceActivityController extends BaseController
      * 修改故障报修工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:activity:edit')" )
-    //@Log(title = "故障报修工单实例节点", businessType = BusinessType.UPDATE)
+    ////@Log(title = "故障报修工单实例节点", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsFaultInstanceActivity dmsFaultInstanceActivity)
     {
@@ -91,7 +91,7 @@ public class DmsFaultInstanceActivityController extends BaseController
      * 删除故障报修工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:activity:remove')" )
-    //@Log(title = "故障报修工单实例节点", businessType = BusinessType.DELETE)
+    ////@Log(title = "故障报修工单实例节点", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{instanceActivityIds}")
     public AjaxResult remove(@PathVariable Long[] instanceActivityIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsInspectInstanceDetailProjectController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsInspectInstanceDetailProjectController.java
index d130808..6baf7cd 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsInspectInstanceDetailProjectController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsInspectInstanceDetailProjectController.java
@@ -51,7 +51,7 @@ public class DmsInspectInstanceDetailProjectController extends BaseController
      * 导出点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表
      */
     @PreAuthorize("@ss.hasPermi('dms:inspectinstancedetailproject:export')" )
-    //@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.EXPORT)
+    ////@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
     {
@@ -74,7 +74,7 @@ public class DmsInspectInstanceDetailProjectController extends BaseController
      * 新增点巡检工单明细项目信息;质检检查每个项目的质检结果详情
      */
     @PreAuthorize("@ss.hasPermi('dms:inspectinstancedetailproject:add')" )
-    //@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.INSERT)
+    ////@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
     {
@@ -85,7 +85,7 @@ public class DmsInspectInstanceDetailProjectController extends BaseController
      * 修改点巡检工单明细项目信息;质检检查每个项目的质检结果详情
      */
     @PreAuthorize("@ss.hasPermi('dms:inspectinstancedetailproject:edit')" )
-    //@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.UPDATE)
+    ////@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject)
     {
@@ -96,7 +96,7 @@ public class DmsInspectInstanceDetailProjectController extends BaseController
      * 删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情
      */
     @PreAuthorize("@ss.hasPermi('dms:inspectinstancedetailproject:remove')" )
-    //@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.DELETE)
+    ////@Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{instanceDetailProjectIds}")
     public AjaxResult remove(@PathVariable Long[] instanceDetailProjectIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsInspectRouteDetailController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsInspectRouteDetailController.java
index af741af..ba74dec 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsInspectRouteDetailController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsInspectRouteDetailController.java
@@ -52,7 +52,7 @@ public class DmsInspectRouteDetailController extends BaseController
      * 导出巡检线路明细列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsInspectRouteDetail:export')" )
-    //@Log(title = "巡检线路明细", businessType = BusinessType.EXPORT)
+    ////@Log(title = "巡检线路明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsInspectRouteDetail dmsInspectRouteDetail)
     {
@@ -75,7 +75,7 @@ public class DmsInspectRouteDetailController extends BaseController
      * 新增巡检线路明细
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsInspectRouteDetail:add')" )
-    //@Log(title = "巡检线路明细", businessType = BusinessType.INSERT)
+    ////@Log(title = "巡检线路明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsInspectRouteDetail dmsInspectRouteDetail)
     {
@@ -86,7 +86,7 @@ public class DmsInspectRouteDetailController extends BaseController
      * 修改巡检线路明细
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsInspectRouteDetail:edit')" )
-    //@Log(title = "巡检线路明细", businessType = BusinessType.UPDATE)
+    ////@Log(title = "巡检线路明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsInspectRouteDetail dmsInspectRouteDetail)
     {
@@ -97,7 +97,7 @@ public class DmsInspectRouteDetailController extends BaseController
      * 删除巡检线路明细
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsInspectRouteDetail:remove')" )
-    //@Log(title = "巡检线路明细", businessType = BusinessType.DELETE)
+    ////@Log(title = "巡检线路明细", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{routeDetailIds}")
     public AjaxResult remove(@PathVariable Long[] routeDetailIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsMaintInstanceActivityController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsMaintInstanceActivityController.java
index ecd6a70..a043c2d 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsMaintInstanceActivityController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsMaintInstanceActivityController.java
@@ -51,7 +51,7 @@ public class DmsMaintInstanceActivityController extends BaseController
      * 导出保养工单实例节点列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsMaintInstanceActivity:export')" )
-    //@Log(title = "保养工单实例节点", businessType = BusinessType.EXPORT)
+    ////@Log(title = "保养工单实例节点", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsMaintInstanceActivity dmsMaintInstanceActivity)
     {
@@ -74,7 +74,7 @@ public class DmsMaintInstanceActivityController extends BaseController
      * 新增保养工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsMaintInstanceActivity:add')" )
-    //@Log(title = "保养工单实例节点", businessType = BusinessType.INSERT)
+    ////@Log(title = "保养工单实例节点", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsMaintInstanceActivity dmsMaintInstanceActivity)
     {
@@ -85,7 +85,7 @@ public class DmsMaintInstanceActivityController extends BaseController
      * 修改保养工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsMaintInstanceActivity:edit')" )
-    //@Log(title = "保养工单实例节点", businessType = BusinessType.UPDATE)
+    ////@Log(title = "保养工单实例节点", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsMaintInstanceActivity dmsMaintInstanceActivity)
     {
@@ -96,7 +96,7 @@ public class DmsMaintInstanceActivityController extends BaseController
      * 删除保养工单实例节点
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsMaintInstanceActivity:remove')" )
-    //@Log(title = "保养工单实例节点", businessType = BusinessType.DELETE)
+    ////@Log(title = "保养工单实例节点", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{instanceActivityIds}")
     public AjaxResult remove(@PathVariable Long[] instanceActivityIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsMobileController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsMobileController.java
index b5bf4d4..500f3df 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsMobileController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsMobileController.java
@@ -107,7 +107,7 @@ public class DmsMobileController extends BaseController {
      * 图片            files
      */
 //    @PreAuthorize("@ss.hasPermi('qms:checkresultdetail:add')" )
-    //@Log(title = "故障报修工单", businessType = BusinessType.INSERT)
+    ////@Log(title = "故障报修工单", businessType = BusinessType.INSERT)
     @PostMapping("/insertFaultInstsanceActivity")
     public AjaxResult insertFaultInstsanceActivity(DmsBillsFaultInstance dmsBillsFaultInstance,
                                                    List<MultipartFile> files) {
@@ -154,7 +154,7 @@ public class DmsMobileController extends BaseController {
      * 修改工单提交
      */
 //    @PreAuthorize("@ss.hasPermi('qms:checkresultdetail:add')" )
-    //@Log(title = "故障报修工单", businessType = BusinessType.UPDATE)
+    ////@Log(title = "故障报修工单", businessType = BusinessType.UPDATE)
     @PostMapping("/updateFaultInstanceActivity")
     public AjaxResult updateFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity,
                                                   @RequestParam(value = "files") List<MultipartFile> files) {
@@ -200,7 +200,7 @@ public class DmsMobileController extends BaseController {
      * 开始维修
      */
 //    @PreAuthorize("@ss.hasPermi('qms:checkresultdetail:add')" )
-    //@Log(title = "故障报修工单", businessType = BusinessType.START)
+    ////@Log(title = "故障报修工单", businessType = BusinessType.START)
     @PostMapping("/startRepair")
     public AjaxResult startRepair(@RequestBody DmsFaultInstanceActivity dmsFaultInstanceActivity) {
         return success(dmsBillsFaultInstanceService.startRepair(dmsFaultInstanceActivity));
@@ -210,7 +210,7 @@ public class DmsMobileController extends BaseController {
      * 完成维修
      */
 //    @PreAuthorize("@ss.hasPermi('qms:checkresultdetail:add')" )
-    //@Log(title = "故障报修工单", businessType = BusinessType.COMPLETE)
+    ////@Log(title = "故障报修工单", businessType = BusinessType.COMPLETE)
     @PostMapping("/completeRepair")
     public AjaxResult completeRepair(DmsFaultInstanceActivity dmsFaultInstanceActivity,@RequestParam(value = "files") List<MultipartFile> files) throws JsonProcessingException {
         dmsFaultInstanceActivity.setRepairConfirm(2);
@@ -256,7 +256,7 @@ public class DmsMobileController extends BaseController {
      * 点巡检工单
      */
 //    @PreAuthorize("@ss.hasPermi('qms:checkresultdetail:add')" )
-    //@Log(title = "点巡检工单明细", businessType = BusinessType.INSERT)
+    ////@Log(title = "点巡检工单明细", businessType = BusinessType.INSERT)
     @PostMapping("/saveInspectInstanceDetail")
     public AjaxResult saveInspectInstanceDetail(@RequestBody DmsInspectInstanceDetail dmsInspectInstanceDetail) {
          return success(dmsBillsInspectInstanceService.updateDmsInspectInstanceDetail(dmsInspectInstanceDetail));
@@ -283,7 +283,7 @@ public class DmsMobileController extends BaseController {
      * 开始保养
      */
 //    @PreAuthorize("@ss.hasPermi('qms:checkresultdetail:add')" )
-    //@Log(title = "保养工单", businessType = BusinessType.START)
+    ////@Log(title = "保养工单", businessType = BusinessType.START)
     @PostMapping("/startMaint")
     public AjaxResult startMaint(@RequestBody DmsBillsMaintDetail dmsBillsMaintDetail) {
         return success(dmsBillsMaintInstanceService.startMaint(dmsBillsMaintDetail));
@@ -293,7 +293,7 @@ public class DmsMobileController extends BaseController {
      * 完成保养
      */
 //    @PreAuthorize("@ss.hasPermi('qms:checkresultdetail:add')" )
-    //@Log(title = "保养工单", businessType = BusinessType.COMPLETE)
+    ////@Log(title = "保养工单", businessType = BusinessType.COMPLETE)
     @PostMapping("/completeMaint")
     public AjaxResult completeMaint(@RequestBody DmsBillsMaintDetail dmsBillsMaintDetail) {
         return success(dmsBillsMaintInstanceService.completeMaint(dmsBillsMaintDetail));
@@ -316,7 +316,7 @@ public class DmsMobileController extends BaseController {
      * 开始润滑
      */
 //    @PreAuthorize("@ss.hasPermi('qms:checkresultdetail:add')" )
-    //@Log(title = "润滑工单", businessType = BusinessType.START)
+    ////@Log(title = "润滑工单", businessType = BusinessType.START)
     @PostMapping("/startLube")
     public AjaxResult startLube(@RequestBody DmsBillsLubeDetail dmsBillsLubeDetail) {
 
@@ -327,7 +327,7 @@ public class DmsMobileController extends BaseController {
      * 完成润滑
      */
 //    @PreAuthorize("@ss.hasPermi('qms:checkresultdetail:add')" )
-    //@Log(title = "润滑工单", businessType = BusinessType.COMPLETE)
+    ////@Log(title = "润滑工单", businessType = BusinessType.COMPLETE)
     @PostMapping("/completeLube")
     public AjaxResult completeLube(@RequestBody DmsBillsLubeDetail dmsBillsLubeDetail) {
         return success(dmsBillsLubeInstanceService.completeLube(dmsBillsLubeDetail));
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanInspectController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanInspectController.java
index 3a89530..5e6768a 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanInspectController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanInspectController.java
@@ -46,7 +46,7 @@ public class DmsPlanInspectController extends BaseController
      * 导出巡检计划信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsPlanInspect:export')" )
-    //@Log(title = "巡检计划信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "巡检计划信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsPlanInspect dmsPlanInspect)
     {
@@ -69,7 +69,7 @@ public class DmsPlanInspectController extends BaseController
      * 新增巡检计划信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsPlanInspect:add')" )
-    //@Log(title = "巡检计划信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "巡检计划信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsPlanInspect dmsPlanInspect)
     {
@@ -80,7 +80,7 @@ public class DmsPlanInspectController extends BaseController
      * 修改巡检计划信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsPlanInspect:edit')" )
-    //@Log(title = "巡检计划信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "巡检计划信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsPlanInspect dmsPlanInspect)
     {
@@ -91,7 +91,7 @@ public class DmsPlanInspectController extends BaseController
      * 删除巡检计划信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsPlanInspect:remove')" )
-    //@Log(title = "巡检计划信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "巡检计划信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{planInspectIds}")
     public AjaxResult remove(@PathVariable Long[] planInspectIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanLubeController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanLubeController.java
index 6196ca0..93569b3 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanLubeController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanLubeController.java
@@ -46,7 +46,7 @@ public class DmsPlanLubeController extends BaseController
      * 导出润滑计划列表
      */
     @PreAuthorize("@ss.hasPermi('dms:lube:export')" )
-    //@Log(title = "润滑计划", businessType = BusinessType.EXPORT)
+    ////@Log(title = "润滑计划", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsPlanLube dmsPlanLube)
     {
@@ -69,7 +69,7 @@ public class DmsPlanLubeController extends BaseController
      * 新增润滑计划
      */
     @PreAuthorize("@ss.hasPermi('dms:lube:add')" )
-    //@Log(title = "润滑计划", businessType = BusinessType.INSERT)
+    ////@Log(title = "润滑计划", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsPlanLube dmsPlanLube)
     {
@@ -81,7 +81,7 @@ public class DmsPlanLubeController extends BaseController
      * 修改润滑计划
      */
     @PreAuthorize("@ss.hasPermi('dms:lube:edit')" )
-    //@Log(title = "润滑计划", businessType = BusinessType.UPDATE)
+    ////@Log(title = "润滑计划", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsPlanLube dmsPlanLube)
     {
@@ -92,7 +92,7 @@ public class DmsPlanLubeController extends BaseController
      * 删除润滑计划
      */
     @PreAuthorize("@ss.hasPermi('dms:lube:remove')" )
-    //@Log(title = "润滑计划", businessType = BusinessType.DELETE)
+    ////@Log(title = "润滑计划", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{planLubeIds}")
     public AjaxResult remove(@PathVariable Long[] planLubeIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanLubeDetailController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanLubeDetailController.java
index f9eeea7..abb20a7 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanLubeDetailController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanLubeDetailController.java
@@ -57,7 +57,7 @@ public class DmsPlanLubeDetailController extends BaseController
      * 导出润滑计划明细列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsPlanLubeDetail:export')" )
-    //@Log(title = "润滑计划明细", businessType = BusinessType.EXPORT)
+    ////@Log(title = "润滑计划明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsPlanLubeDetail dmsPlanLubeDetail)
     {
@@ -89,7 +89,7 @@ public class DmsPlanLubeDetailController extends BaseController
      * 新增润滑计划明细
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsPlanLubeDetail:add')" )
-    //@Log(title = "润滑计划明细", businessType = BusinessType.INSERT)
+    ////@Log(title = "润滑计划明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsPlanLubeDetail dmsPlanLubeDetail)
     {
@@ -100,7 +100,7 @@ public class DmsPlanLubeDetailController extends BaseController
      * 修改润滑计划明细
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsPlanLubeDetail:edit')" )
-    //@Log(title = "润滑计划明细", businessType = BusinessType.UPDATE)
+    ////@Log(title = "润滑计划明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsPlanLubeDetail dmsPlanLubeDetail)
     {
@@ -111,7 +111,7 @@ public class DmsPlanLubeDetailController extends BaseController
      * 删除润滑计划明细
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsPlanLubeDetail:remove')" )
-    //@Log(title = "润滑计划明细", businessType = BusinessType.DELETE)
+    ////@Log(title = "润滑计划明细", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{planLubeDetailIds}")
     public AjaxResult remove(@PathVariable Long[] planLubeDetailIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanMaintController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanMaintController.java
index 26edbd4..5a0fc58 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanMaintController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanMaintController.java
@@ -47,7 +47,7 @@ public class DmsPlanMaintController extends BaseController
      * 导出保养计划信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:maint:export')" )
-    //@Log(title = "保养计划信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "保养计划信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsPlanMaint dmsPlanMaint)
     {
@@ -70,7 +70,7 @@ public class DmsPlanMaintController extends BaseController
      * 新增保养计划信息
      */
     @PreAuthorize("@ss.hasPermi('dms:maint:add')" )
-    //@Log(title = "保养计划信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "保养计划信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsPlanMaint dmsPlanMaint)
     {
@@ -82,7 +82,7 @@ public class DmsPlanMaintController extends BaseController
      * 修改保养计划信息
      */
     @PreAuthorize("@ss.hasPermi('dms:maint:edit')" )
-    //@Log(title = "保养计划信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "保养计划信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsPlanMaint dmsPlanMaint)
     {
@@ -93,7 +93,7 @@ public class DmsPlanMaintController extends BaseController
      * 删除保养计划信息
      */
     @PreAuthorize("@ss.hasPermi('dms:maint:remove')" )
-    //@Log(title = "保养计划信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "保养计划信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{planMaintIds}")
     public AjaxResult remove(@PathVariable Long[] planMaintIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanMaintDetailController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanMaintDetailController.java
index 3a30292..058bea7 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanMaintDetailController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanMaintDetailController.java
@@ -46,7 +46,7 @@ public class DmsPlanMaintDetailController extends BaseController
      * 导出保养计划明细列表
      */
     @PreAuthorize("@ss.hasPermi('dms:maintDetail:export')" )
-    //@Log(title = "保养计划明细", businessType = BusinessType.EXPORT)
+    ////@Log(title = "保养计划明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsPlanMaintDetail dmsPlanMaintDetail)
     {
@@ -77,7 +77,7 @@ public class DmsPlanMaintDetailController extends BaseController
      * 新增保养计划明细
      */
     @PreAuthorize("@ss.hasPermi('dms:maintDetail:add')" )
-    //@Log(title = "保养计划明细", businessType = BusinessType.INSERT)
+    ////@Log(title = "保养计划明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsPlanMaintDetail dmsPlanMaintDetail)
     {
@@ -88,7 +88,7 @@ public class DmsPlanMaintDetailController extends BaseController
      * 修改保养计划明细
      */
     @PreAuthorize("@ss.hasPermi('dms:maintDetail:edit')" )
-    //@Log(title = "保养计划明细", businessType = BusinessType.UPDATE)
+    ////@Log(title = "保养计划明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsPlanMaintDetail dmsPlanMaintDetail)
     {
@@ -99,7 +99,7 @@ public class DmsPlanMaintDetailController extends BaseController
      * 删除保养计划明细
      */
     @PreAuthorize("@ss.hasPermi('dms:maintDetail:remove')" )
-    //@Log(title = "保养计划明细", businessType = BusinessType.DELETE)
+    ////@Log(title = "保养计划明细", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{planMaintDetailIds}")
     public AjaxResult remove(@PathVariable Long[] planMaintDetailIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanRepairController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanRepairController.java
index 55a9207..8430b93 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanRepairController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanRepairController.java
@@ -50,7 +50,7 @@ public class DmsPlanRepairController extends BaseController
      * 导出检修计划信息列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepair:export')" )
-    //@Log(title = "检修计划信息", businessType = BusinessType.EXPORT)
+    ////@Log(title = "检修计划信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsPlanRepair dmsPlanRepair)
     {
@@ -73,7 +73,7 @@ public class DmsPlanRepairController extends BaseController
      * 新增检修计划信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepair:add')" )
-    //@Log(title = "检修计划信息", businessType = BusinessType.INSERT)
+    ////@Log(title = "检修计划信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsPlanRepair dmsPlanRepair)
     {
@@ -103,7 +103,7 @@ public class DmsPlanRepairController extends BaseController
      * 修改检修计划信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepair:edit')" )
-    //@Log(title = "检修计划信息", businessType = BusinessType.UPDATE)
+    ////@Log(title = "检修计划信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsPlanRepair dmsPlanRepair)
     {
@@ -114,7 +114,7 @@ public class DmsPlanRepairController extends BaseController
      * 删除检修计划信息
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepair:remove')" )
-    //@Log(title = "检修计划信息", businessType = BusinessType.DELETE)
+    ////@Log(title = "检修计划信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{planRepairIds}")
     public AjaxResult remove(@PathVariable Long[] planRepairIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanRepairDetailController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanRepairDetailController.java
index da057ec..29c2ed5 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanRepairDetailController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsPlanRepairDetailController.java
@@ -54,7 +54,7 @@ public class DmsPlanRepairDetailController extends BaseController
      * 导出检修计划明细列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepairDetail:export')" )
-    //@Log(title = "检修计划明细", businessType = BusinessType.EXPORT)
+    ////@Log(title = "检修计划明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsPlanRepairDetail dmsPlanRepairDetail)
     {
@@ -77,7 +77,7 @@ public class DmsPlanRepairDetailController extends BaseController
      * 新增检修计划明细
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepairDetail:add')" )
-    //@Log(title = "检修计划明细", businessType = BusinessType.INSERT)
+    ////@Log(title = "检修计划明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsPlanRepairDetail dmsPlanRepairDetail)
     {
@@ -88,7 +88,7 @@ public class DmsPlanRepairDetailController extends BaseController
      * 修改检修计划明细
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepairDetail:edit')" )
-    //@Log(title = "检修计划明细", businessType = BusinessType.UPDATE)
+    ////@Log(title = "检修计划明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsPlanRepairDetail dmsPlanRepairDetail)
     {
@@ -99,7 +99,7 @@ public class DmsPlanRepairDetailController extends BaseController
      * 删除检修计划明细
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepairDetail:remove')" )
-    //@Log(title = "检修计划明细", businessType = BusinessType.DELETE)
+    ////@Log(title = "检修计划明细", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{planRepairDetailIds}")
     public AjaxResult remove(@PathVariable Long[] planRepairDetailIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRealtimeStatusController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRealtimeStatusController.java
index 59fb537..23731c5 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRealtimeStatusController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRealtimeStatusController.java
@@ -51,7 +51,7 @@ public class DmsRealtimeStatusController extends BaseController {
      * 导出设备实时状态列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRealtimeStatus:export')" )
-    //@Log(title = "设备实时状态", businessType = BusinessType.EXPORT)
+    ////@Log(title = "设备实时状态", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsRealtimeStatus dmsRealtimeStatus) {
         List<DmsRealtimeStatus> list = dmsRealtimeStatusService.selectDmsRealtimeStatusList(dmsRealtimeStatus);
@@ -72,7 +72,7 @@ public class DmsRealtimeStatusController extends BaseController {
      * 新增设备实时状态
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRealtimeStatus:add')" )
-    //@Log(title = "设备实时状态", businessType = BusinessType.INSERT)
+    ////@Log(title = "设备实时状态", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsRealtimeStatus dmsRealtimeStatus) {
         return toAjax(dmsRealtimeStatusService.insertDmsRealtimeStatus(dmsRealtimeStatus));
@@ -82,7 +82,7 @@ public class DmsRealtimeStatusController extends BaseController {
      * 修改设备实时状态
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRealtimeStatus:edit')" )
-    //@Log(title = "设备实时状态", businessType = BusinessType.UPDATE)
+    ////@Log(title = "设备实时状态", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsRealtimeStatus dmsRealtimeStatus) {
         return toAjax(dmsRealtimeStatusService.updateDmsRealtimeStatus(dmsRealtimeStatus));
@@ -92,7 +92,7 @@ public class DmsRealtimeStatusController extends BaseController {
      * 删除设备实时状态
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRealtimeStatus:remove')" )
-    //@Log(title = "设备实时状态", businessType = BusinessType.DELETE)
+    ////@Log(title = "设备实时状态", businessType = BusinessType.DELETE)
     @DeleteMapping("/{statusIds}")
     public AjaxResult remove(@PathVariable Long[] statusIds) {
         return toAjax(dmsRealtimeStatusService.deleteDmsRealtimeStatusByStatusIds(statusIds));
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordAlarmInfoController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordAlarmInfoController.java
index ee19de9..1c3c84d 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordAlarmInfoController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordAlarmInfoController.java
@@ -44,7 +44,7 @@ public class DmsRecordAlarmInfoController extends BaseController {
      * 导出设备报警记录列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordAlarmInfo:export')" )
-    //@Log(title = "设备报警记录", businessType = BusinessType.EXPORT)
+    ////@Log(title = "设备报警记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsRecordAlarmInfo dmsRecordAlarmInfo) {
         List<DmsRecordAlarmInfo> list = dmsRecordAlarmInfoService.selectDmsRecordAlarmInfoList(dmsRecordAlarmInfo);
@@ -65,7 +65,7 @@ public class DmsRecordAlarmInfoController extends BaseController {
      * 新增设备报警记录
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordAlarmInfo:add')" )
-    //@Log(title = "设备报警记录", businessType = BusinessType.INSERT)
+    ////@Log(title = "设备报警记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsRecordAlarmInfo dmsRecordAlarmInfo) {
         return toAjax(dmsRecordAlarmInfoService.insertDmsRecordAlarmInfo(dmsRecordAlarmInfo));
@@ -75,7 +75,7 @@ public class DmsRecordAlarmInfoController extends BaseController {
      * 修改设备报警记录
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordAlarmInfo:edit')" )
-    //@Log(title = "设备报警记录", businessType = BusinessType.UPDATE)
+    ////@Log(title = "设备报警记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsRecordAlarmInfo dmsRecordAlarmInfo) {
         return toAjax(dmsRecordAlarmInfoService.updateDmsRecordAlarmInfo(dmsRecordAlarmInfo));
@@ -85,7 +85,7 @@ public class DmsRecordAlarmInfoController extends BaseController {
      * 删除设备报警记录
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordAlarmInfo:remove')" )
-    //@Log(title = "设备报警记录", businessType = BusinessType.DELETE)
+    ////@Log(title = "设备报警记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{alarmIds}")
     public AjaxResult remove(@PathVariable Long[] alarmIds) {
         return toAjax(dmsRecordAlarmInfoService.deleteDmsRecordAlarmInfoByAlarmIds(alarmIds));
@@ -95,7 +95,7 @@ public class DmsRecordAlarmInfoController extends BaseController {
      * 设备报警人工处理
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordAlarmInfo:edit')" )
-    //@Log(title = "设备报警记录", businessType = BusinessType.UPDATE)
+    ////@Log(title = "设备报警记录", businessType = BusinessType.UPDATE)
     @PostMapping("/handleDmsRecordAlarmInfo")
     public AjaxResult handleDmsRecordAlarmInfo(@RequestBody DmsRecordAlarmInfo dmsRecordAlarmInfo) {
         return toAjax(dmsRecordAlarmInfoService.handleDmsRecordAlarmInfo(dmsRecordAlarmInfo));
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordInspectController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordInspectController.java
index 75fc193..7898acd 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordInspectController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordInspectController.java
@@ -46,7 +46,7 @@ public class DmsRecordInspectController extends BaseController
      * 导出巡检记录列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordInspect:export')" )
-    //@Log(title = "巡检记录", businessType = BusinessType.EXPORT)
+    ////@Log(title = "巡检记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsRecordInspect dmsRecordInspect)
     {
@@ -69,7 +69,7 @@ public class DmsRecordInspectController extends BaseController
      * 新增巡检记录
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordInspect:add')" )
-    //@Log(title = "巡检记录", businessType = BusinessType.INSERT)
+    ////@Log(title = "巡检记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsRecordInspect dmsRecordInspect)
     {
@@ -80,7 +80,7 @@ public class DmsRecordInspectController extends BaseController
      * 修改巡检记录
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordInspect:edit')" )
-    //@Log(title = "巡检记录", businessType = BusinessType.UPDATE)
+    ////@Log(title = "巡检记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsRecordInspect dmsRecordInspect)
     {
@@ -91,7 +91,7 @@ public class DmsRecordInspectController extends BaseController
      * 删除巡检记录
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordInspect:remove')" )
-    //@Log(title = "巡检记录", businessType = BusinessType.DELETE)
+    ////@Log(title = "巡检记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{recordInspectIds}")
     public AjaxResult remove(@PathVariable Long[] recordInspectIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordLubeController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordLubeController.java
index 5b22b7e..49efd8b 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordLubeController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordLubeController.java
@@ -46,7 +46,7 @@ public class DmsRecordLubeController extends BaseController
      * 导出润滑记录列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordLube:export')" )
-    //@Log(title = "润滑记录", businessType = BusinessType.EXPORT)
+    ////@Log(title = "润滑记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsRecordLube dmsRecordLube)
     {
@@ -69,7 +69,7 @@ public class DmsRecordLubeController extends BaseController
      * 新增润滑记录
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordLube:add')" )
-    //@Log(title = "润滑记录", businessType = BusinessType.INSERT)
+    ////@Log(title = "润滑记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsRecordLube dmsRecordLube)
     {
@@ -80,7 +80,7 @@ public class DmsRecordLubeController extends BaseController
      * 修改润滑记录
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordLube:edit')" )
-    //@Log(title = "润滑记录", businessType = BusinessType.UPDATE)
+    ////@Log(title = "润滑记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsRecordLube dmsRecordLube)
     {
@@ -91,7 +91,7 @@ public class DmsRecordLubeController extends BaseController
      * 删除润滑记录
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRecordLube:remove')" )
-    //@Log(title = "润滑记录", businessType = BusinessType.DELETE)
+    ////@Log(title = "润滑记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{recordLubeIds}")
     public AjaxResult remove(@PathVariable Long[] recordLubeIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordShutDownController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordShutDownController.java
index 748c702..3d3f3d7 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordShutDownController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordShutDownController.java
@@ -44,7 +44,7 @@ public class DmsRecordShutDownController extends BaseController
      * 导出停机记录列表
      */
     @PreAuthorize("@ss.hasPermi('dms:shutDown:export')" )
-    //@Log(title = "停机记录", businessType = BusinessType.EXPORT)
+    ////@Log(title = "停机记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsRecordShutDown dmsRecordShutDown)
     {
@@ -67,7 +67,7 @@ public class DmsRecordShutDownController extends BaseController
      * 新增停机记录
      */
     @PreAuthorize("@ss.hasPermi('dms:shutDown:add')" )
-    //@Log(title = "停机记录", businessType = BusinessType.INSERT)
+    ////@Log(title = "停机记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsRecordShutDown dmsRecordShutDown)
     {
@@ -78,7 +78,7 @@ public class DmsRecordShutDownController extends BaseController
      * 修改停机记录
      */
     @PreAuthorize("@ss.hasPermi('dms:shutDown:edit')" )
-    //@Log(title = "停机记录", businessType = BusinessType.UPDATE)
+    ////@Log(title = "停机记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsRecordShutDown dmsRecordShutDown)
     {
@@ -89,7 +89,7 @@ public class DmsRecordShutDownController extends BaseController
      * 删除停机记录
      */
     @PreAuthorize("@ss.hasPermi('dms:shutDown:remove')" )
-    //@Log(title = "停机记录", businessType = BusinessType.DELETE)
+    ////@Log(title = "停机记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{recordShutDownIds}")
     public AjaxResult remove(@PathVariable Long[] recordShutDownIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairInstanceActivityController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairInstanceActivityController.java
index 8a31cee..85406fa 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairInstanceActivityController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairInstanceActivityController.java
@@ -46,7 +46,7 @@ public class DmsRepairInstanceActivityController extends BaseController
      * 导出检修工单实例节点;最后一步作为检修记录列表
      */
     @PreAuthorize("@ss.hasPermi('dms:repairInstanceActivity:export')" )
-    //@Log(title = "检修工单实例节点;最后一步作为检修记录", businessType = BusinessType.EXPORT)
+    ////@Log(title = "检修工单实例节点;最后一步作为检修记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsRepairInstanceActivity dmsRepairInstanceActivity)
     {
@@ -69,7 +69,7 @@ public class DmsRepairInstanceActivityController extends BaseController
      * 新增检修工单实例节点;最后一步作为检修记录
      */
     @PreAuthorize("@ss.hasPermi('dms:repairInstanceActivity:add')" )
-    //@Log(title = "检修工单实例节点;最后一步作为检修记录", businessType = BusinessType.INSERT)
+    ////@Log(title = "检修工单实例节点;最后一步作为检修记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsRepairInstanceActivity dmsRepairInstanceActivity)
     {
@@ -80,7 +80,7 @@ public class DmsRepairInstanceActivityController extends BaseController
      * 修改检修工单实例节点;最后一步作为检修记录
      */
     @PreAuthorize("@ss.hasPermi('dms:repairInstanceActivity:edit')" )
-    //@Log(title = "检修工单实例节点;最后一步作为检修记录", businessType = BusinessType.UPDATE)
+    ////@Log(title = "检修工单实例节点;最后一步作为检修记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsRepairInstanceActivity dmsRepairInstanceActivity)
     {
@@ -91,7 +91,7 @@ public class DmsRepairInstanceActivityController extends BaseController
      * 删除检修工单实例节点;最后一步作为检修记录
      */
     @PreAuthorize("@ss.hasPermi('dms:repairInstanceActivity:remove')" )
-    //@Log(title = "检修工单实例节点;最后一步作为检修记录", businessType = BusinessType.DELETE)
+    ////@Log(title = "检修工单实例节点;最后一步作为检修记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{instanceActivityIds}")
     public AjaxResult remove(@PathVariable Long[] instanceActivityIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairInstanceController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairInstanceController.java
index 8b4be5d..97aa2de 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairInstanceController.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairInstanceController.java
@@ -49,7 +49,7 @@ public class DmsRepairInstanceController extends BaseController
      * 导出检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单列表
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepairInstance:export')" )
-    //@Log(title = "检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单", businessType = BusinessType.EXPORT)
+    ////@Log(title = "检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DmsRepairInstance dmsRepairInstance)
     {
@@ -72,7 +72,7 @@ public class DmsRepairInstanceController extends BaseController
      * 新增检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepairInstance:add')" )
-    //@Log(title = "检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单", businessType = BusinessType.INSERT)
+    ////@Log(title = "检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DmsRepairInstance dmsRepairInstance)
     {
@@ -91,7 +91,8 @@ public class DmsRepairInstanceController extends BaseController
         //        DmsRepairInstance dmsRepairInstance = dmsRepairInstanceService.selectDmsRepairInstanceByRepairInstanceId(2l);
         dmsPlanRepair.setCreateMethod("2");
         DmsRepairInstance dmsRepairInstance = new DmsRepairInstance();
-        dmsRepairInstance.setWfProcessId(101l);
+        // 已废弃审批流功能
+        // dmsRepairInstance.setWfProcessId(101l);
         dmsRepairInstance.setPlanRepairId(dmsPlanRepair.getPlanRepairId());
         dmsRepairInstance.setPlanBeginTime(dmsPlanRepair.getRepairTime());
         dmsRepairInstance.setInstanceType("2");
@@ -108,7 +109,7 @@ public class DmsRepairInstanceController extends BaseController
      * 修改检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepairInstance:edit')" )
-    //@Log(title = "检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单", businessType = BusinessType.UPDATE)
+    ////@Log(title = "检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DmsRepairInstance dmsRepairInstance)
     {
@@ -119,7 +120,7 @@ public class DmsRepairInstanceController extends BaseController
      * 删除检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单
      */
     @PreAuthorize("@ss.hasPermi('dms:dmsRepairInstance:remove')" )
-    //@Log(title = "检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单", businessType = BusinessType.DELETE)
+    ////@Log(title = "检修工单;一是根据检修计划自动创建的检修工单，二是手工创建故障报修工单", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{repairInstanceIds}")
     public AjaxResult remove(@PathVariable Long[] repairInstanceIds)
     {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseEntity.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseEntity.java
new file mode 100644
index 0000000..379eee5
--- /dev/null
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseEntity.java
@@ -0,0 +1,92 @@
+package com.aucma.dms.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.Date;
+import java.util.Map;
+
+public class DmsBaseEntity {
+
+    /** 搜索值 */
+    @JsonIgnore
+    private String searchValue;
+
+    /** 创建者 */
+    private Long createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private Long updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    private String remark;
+
+    /** 请求参数 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private Map<String, Object> params;
+
+    public Map<String, Object> getParams() {
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Long createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getSearchValue() {
+        return searchValue;
+    }
+
+    public void setSearchValue(String searchValue) {
+        this.searchValue = searchValue;
+    }
+}
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectProject.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectProject.java
index fab86df..ae8a8ef 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectProject.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectProject.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -15,7 +14,7 @@ import java.math.BigDecimal;
  * @author Open Platform
  * @date 2024-01-17
  */
-public class DmsBaseInspectProject extends BaseEntity
+public class DmsBaseInspectProject extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectRoute.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectRoute.java
index 5303b1b..cd6fbe3 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectRoute.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectRoute.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author Open Platform
  * @date 2024-01-16
  */
-public class DmsBaseInspectRoute extends BaseEntity
+public class DmsBaseInspectRoute extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectStandard.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectStandard.java
index 9322bd4..95cc259 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectStandard.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseInspectStandard.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author Open Platform
  * @date 2024-01-17
  */
-public class DmsBaseInspectStandard extends BaseEntity
+public class DmsBaseInspectStandard extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseLubeStandard.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseLubeStandard.java
index 542b252..d95c281 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseLubeStandard.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseLubeStandard.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author Open Platform
  * @date 2024-01-12
  */
-public class DmsBaseLubeStandard extends BaseEntity
+public class DmsBaseLubeStandard extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseLubeStation.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseLubeStation.java
index 18c1a25..839b27b 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseLubeStation.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseLubeStation.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author Open Platform
  * @date 2024-01-12
  */
-public class DmsBaseLubeStation extends BaseEntity
+public class DmsBaseLubeStation extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintProject.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintProject.java
index 04d304c..dd75e7e 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintProject.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintProject.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author zangch
  * @date 2024-09-23
  */
-public class DmsBaseMaintProject extends BaseEntity
+public class DmsBaseMaintProject extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -28,6 +27,10 @@ public class DmsBaseMaintProject extends BaseEntity
     @Excel(name = "项目描述")
     private String maintProjectDesc;
 
+    /** 生效标识：1-生效；0-失效 */
+    @Excel(name = "生效标识：1-生效；0-失效")
+    private String activeFlag;
+
     private Long maintStationId;
 
     public Long getMaintStationId() {
@@ -65,6 +68,15 @@ public class DmsBaseMaintProject extends BaseEntity
     {
         return maintProjectDesc;
     }
+    public void setActiveFlag(String activeFlag)
+    {
+        this.activeFlag = activeFlag;
+    }
+
+    public String getActiveFlag()
+    {
+        return activeFlag;
+    }
 
     @Override
     public String toString() {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintStandard.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintStandard.java
index 076c825..5abcb5d 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintStandard.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintStandard.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author xins
  * @date 2024-01-05
  */
-public class DmsBaseMaintStandard extends BaseEntity
+public class DmsBaseMaintStandard extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -40,6 +39,10 @@ public class DmsBaseMaintStandard extends BaseEntity
     @Excel(name = "是否标识：1-是；2-否")
     private Long isFlag;
 
+    /** 生效标识：1-生效；0-失效 */
+    @Excel(name = "生效标识：1-生效；0-失效")
+    private String activeFlag;
+
     private String TypeName;
 
     public String getTypeName() {
@@ -104,6 +107,15 @@ public class DmsBaseMaintStandard extends BaseEntity
     {
         return isFlag;
     }
+    public void setActiveFlag(String activeFlag)
+    {
+        this.activeFlag = activeFlag;
+    }
+
+    public String getActiveFlag()
+    {
+        return activeFlag;
+    }
 
     @Override
     public String toString() {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintStation.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintStation.java
index a9d6d4a..625630d 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintStation.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseMaintStation.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author xins
  * @date 2024-01-05
  */
-public class DmsBaseMaintStation extends BaseEntity
+public class DmsBaseMaintStation extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseShutReason.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseShutReason.java
index 8700048..b428bbc 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseShutReason.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseShutReason.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author Open Platform
  * @date 2024-01-12
  */
-public class DmsBaseShutReason extends BaseEntity
+public class DmsBaseShutReason extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseShutType.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseShutType.java
index 9664cee..741eff4 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseShutType.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseShutType.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author Open Platform
  * @date 2024-01-12
  */
-public class DmsBaseShutType extends BaseEntity
+public class DmsBaseShutType extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseStationProject.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseStationProject.java
index cbea3e7..943ffed 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseStationProject.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBaseStationProject.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author zangch
  * @date 2024-09-23
  */
-public class DmsBaseStationProject extends BaseEntity
+public class DmsBaseStationProject extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsFaultInstance.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsFaultInstance.java
index d0d3dda..e395727 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsFaultInstance.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsFaultInstance.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.aucma.framework.web.domain.server.SysFile;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -20,7 +19,7 @@ import java.util.List;
  * @date 2024-01-23
  */
 @Data
-public class DmsBillsFaultInstance extends BaseEntity
+public class DmsBillsFaultInstance extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -36,9 +35,9 @@ public class DmsBillsFaultInstance extends BaseEntity
     @Excel(name = "报修来源ID，根据报修来源类型关联来源主键")
     private Long faultSourceId;
 
-    /** 工单流程ID，关联wf_process的wf_process_id */
-    @Excel(name = "工单流程ID，关联wf_process的wf_process_id")
-    private Long wfProcessId;
+    /** 工单流程ID，关联wf_process的wf_process_id - 已废弃审批流功能 */
+    // @Excel(name = "工单流程ID，关联wf_process的wf_process_id")
+    // private Long wfProcessId;
 
     /** 工单编号 */
     @Excel(name = "工单编号")
@@ -232,15 +231,16 @@ public class DmsBillsFaultInstance extends BaseEntity
     {
         return faultSourceId;
     }
-    public void setWfProcessId(Long wfProcessId)
-    {
-        this.wfProcessId = wfProcessId;
-    }
+    // 已废弃审批流功能
+    // public void setWfProcessId(Long wfProcessId)
+    // {
+    //     this.wfProcessId = wfProcessId;
+    // }
 
-    public Long getWfProcessId()
-    {
-        return wfProcessId;
-    }
+    // public Long getWfProcessId()
+    // {
+    //     return wfProcessId;
+    // }
     public void setBillsFaultCode(String billsFaultCode)
     {
         this.billsFaultCode = billsFaultCode;
@@ -386,7 +386,7 @@ public class DmsBillsFaultInstance extends BaseEntity
             .append("repairInstanceId", getRepairInstanceId())
             .append("faultSourceType", getFaultSourceType())
             .append("faultSourceId", getFaultSourceId())
-            .append("wfProcessId", getWfProcessId())
+            // .append("wfProcessId", getWfProcessId()) // 已废弃审批流
             .append("billsFaultCode", getBillsFaultCode())
             .append("billsStatus", getBillsStatus())
             .append("applyUser", getApplyUser())
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsInspectInstance.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsInspectInstance.java
index dc947fa..46b3caf 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsInspectInstance.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsInspectInstance.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
@@ -15,7 +14,7 @@ import java.util.List;
  * @author Open Platform
  * @date 2024-01-23
  */
-public class DmsBillsInspectInstance extends BaseEntity
+public class DmsBillsInspectInstance extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -26,9 +25,9 @@ public class DmsBillsInspectInstance extends BaseEntity
     @Excel(name = "计划ID,关联dms_plan_inspect的plan_inspect_id")
     private Long planInspectId;
 
-    /** 工单流程ID，关联wf_process的wf_process_id */
-    @Excel(name = "工单流程ID，关联wf_process的wf_process_id")
-    private Long wfProcessId;
+    /** 工单流程ID，关联wf_process的wf_process_id - 已废弃审批流功能 */
+    // @Excel(name = "工单流程ID，关联wf_process的wf_process_id")
+    // private Long wfProcessId;
 
     /** 检查类型(1巡检,2点检) */
     @Excel(name = "检查类型(1巡检,2点检)")
@@ -119,15 +118,16 @@ public class DmsBillsInspectInstance extends BaseEntity
     {
         return planInspectId;
     }
-    public void setWfProcessId(Long wfProcessId)
-    {
-        this.wfProcessId = wfProcessId;
-    }
+    // 已废弃审批流功能
+    // public void setWfProcessId(Long wfProcessId)
+    // {
+    //     this.wfProcessId = wfProcessId;
+    // }
 
-    public Long getWfProcessId()
-    {
-        return wfProcessId;
-    }
+    // public Long getWfProcessId()
+    // {
+    //     return wfProcessId;
+    // }
     public void setInspectType(String inspectType)
     {
         this.inspectType = inspectType;
@@ -256,7 +256,7 @@ public class DmsBillsInspectInstance extends BaseEntity
         return "DmsBillsInspectInstance{" +
                 "inspectInstanceId=" + inspectInstanceId +
                 ", planInspectId=" + planInspectId +
-                ", wfProcessId=" + wfProcessId +
+                // ", wfProcessId=" + wfProcessId + // 已废弃审批流
                 ", inspectType='" + inspectType + '\'' +
                 ", billsInspectCode='" + billsInspectCode + '\'' +
                 ", inspectRouteId=" + inspectRouteId +
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsInspectInstanceActivity.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsInspectInstanceActivity.java
index 37e8f1f..5fe8d2b 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsInspectInstanceActivity.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsInspectInstanceActivity.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -16,7 +15,7 @@ import java.util.Date;
  * @author Open Platform
  * @date 2024-01-23
  */
-public class DmsBillsInspectInstanceActivity extends BaseEntity
+public class DmsBillsInspectInstanceActivity extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeDetail.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeDetail.java
index 5beb03f..30c6f1d 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeDetail.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeDetail.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import java.util.Date;
  * @author xins
  * @date 2024-03-20
  */
-public class DmsBillsLubeDetail extends BaseEntity
+public class DmsBillsLubeDetail extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeInstance.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeInstance.java
index bd6f77e..9d80f88 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeInstance.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeInstance.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -17,7 +16,7 @@ import java.util.List;
  * @author Open Platform
  * @date 2024-02-26
  */
-public class DmsBillsLubeInstance extends BaseEntity
+public class DmsBillsLubeInstance extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeInstanceActivity.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeInstanceActivity.java
index 3d1a7d3..a95694b 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeInstanceActivity.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsLubeInstanceActivity.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -16,7 +15,7 @@ import java.util.Date;
  * @author Open Platform
  * @date 2024-02-26
  */
-public class DmsBillsLubeInstanceActivity extends BaseEntity
+public class DmsBillsLubeInstanceActivity extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintDetail.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintDetail.java
index 31ee155..aa1d7b7 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintDetail.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintDetail.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,7 +13,7 @@ import java.util.List;
  * @author xins
  * @date 2024-03-20
  */
-public class DmsBillsMaintDetail extends BaseEntity
+public class DmsBillsMaintDetail extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintDetailProject.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintDetailProject.java
index c27b0c9..90d1db6 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintDetailProject.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintDetailProject.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author xins
  * @date 2024-09-18
  */
-public class DmsBillsMaintDetailProject extends BaseEntity
+public class DmsBillsMaintDetailProject extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java
index 6e0e677..f68093c 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -18,7 +17,7 @@ import java.util.List;
  * @author Open Platform
  * @date 2024-02-29
  */
-public class DmsBillsMaintInstance extends BaseEntity
+public class DmsBillsMaintInstance extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -29,9 +28,9 @@ public class DmsBillsMaintInstance extends BaseEntity
     @Excel(name = "保养计划ID,关联dms_plan_maint的plan_maint_id")
     private Long planMaintId;
 
-    /** 工单流程ID，关联wf_process的wf_process_id */
-    @Excel(name = "工单流程ID，关联wf_process的wf_process_id")
-    private Long wfProcessId;
+    /** 工单流程ID，关联wf_process的wf_process_id - 已废弃审批流功能 */
+    // @Excel(name = "工单流程ID，关联wf_process的wf_process_id")
+    // private Long wfProcessId;
 
     /** 保养单号 */
     @Excel(name = "保养单号")
@@ -134,15 +133,16 @@ public class DmsBillsMaintInstance extends BaseEntity
     {
         return planMaintId;
     }
-    public void setWfProcessId(Long wfProcessId)
-    {
-        this.wfProcessId = wfProcessId;
-    }
+    // 已废弃审批流功能
+    // public void setWfProcessId(Long wfProcessId)
+    // {
+    //     this.wfProcessId = wfProcessId;
+    // }
 
-    public Long getWfProcessId()
-    {
-        return wfProcessId;
-    }
+    // public Long getWfProcessId()
+    // {
+    //     return wfProcessId;
+    // }
     public void setBillsMaintCode(String billsMaintCode)
     {
         this.billsMaintCode = billsMaintCode;
@@ -237,7 +237,7 @@ public class DmsBillsMaintInstance extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("maintInstanceId", getMaintInstanceId())
             .append("planMaintId", getPlanMaintId())
-            .append("wfProcessId", getWfProcessId())
+            // .append("wfProcessId", getWfProcessId()) // 已废弃审批流
             .append("billsMaintCode", getBillsMaintCode())
             .append("planBeginTime", getPlanBeginTime())
             .append("realBeginTime", getRealBeginTime())
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsFaultInstanceActivity.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsFaultInstanceActivity.java
index 12cf3d3..f2b3c4c 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsFaultInstanceActivity.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsFaultInstanceActivity.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -19,7 +18,7 @@ import java.util.List;
  * @date 2024-02-27
  */
 @Data
-public class DmsFaultInstanceActivity extends BaseEntity
+public class DmsFaultInstanceActivity extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectInstanceDetail.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectInstanceDetail.java
index 9fa37ec..e5ce1d2 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectInstanceDetail.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectInstanceDetail.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -17,7 +16,7 @@ import java.util.List;
  * @author xins
  * @date 2024-03-19
  */
-public class DmsInspectInstanceDetail extends BaseEntity
+public class DmsInspectInstanceDetail extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectInstanceDetailProject.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectInstanceDetailProject.java
index 07acfab..3c39286 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectInstanceDetailProject.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectInstanceDetailProject.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -15,7 +14,7 @@ import java.math.BigDecimal;
  * @author xins
  * @date 2024-03-19
  */
-public class DmsInspectInstanceDetailProject extends BaseEntity
+public class DmsInspectInstanceDetailProject extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectProjectDevice.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectProjectDevice.java
index efbadf7..17f4ba2 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectProjectDevice.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectProjectDevice.java
@@ -1,6 +1,6 @@
 package com.aucma.dms.domain;
 
-import com.aucma.common.core.domain.BaseEntity;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -12,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author xins
  * @date 2024-09-12
  */
-public class DmsInspectProjectDevice extends BaseEntity
+public class DmsInspectProjectDevice extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectRouteDetail.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectRouteDetail.java
index d312b46..6c6569a 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectRouteDetail.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectRouteDetail.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author Open Platform
  * @date 2024-01-16
  */
-public class DmsInspectRouteDetail extends BaseEntity
+public class DmsInspectRouteDetail extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInstanceFile.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInstanceFile.java
index cb02582..230ddf5 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInstanceFile.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInstanceFile.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author xins
  * @date 2024-03-13
  */
-public class DmsInstanceFile extends BaseEntity
+public class DmsInstanceFile extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsMaintInstanceActivity.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsMaintInstanceActivity.java
index d00e9ae..d16ec4b 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsMaintInstanceActivity.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsMaintInstanceActivity.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -16,7 +15,7 @@ import java.util.Date;
  * @author Open Platform
  * @date 2024-02-29
  */
-public class DmsMaintInstanceActivity extends BaseEntity
+public class DmsMaintInstanceActivity extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanInspect.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanInspect.java
index b35be9f..09819b0 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanInspect.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanInspect.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
@@ -15,7 +14,7 @@ import java.util.Date;
  * @date 2024-01-17
  */
 
-public class DmsPlanInspect extends BaseEntity
+public class DmsPlanInspect extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanLube.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanLube.java
index af9cb6e..540d305 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanLube.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanLube.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -17,7 +16,7 @@ import java.util.List;
  * @author Open Platform
  * @date 2024-02-26
  */
-public class DmsPlanLube extends BaseEntity
+public class DmsPlanLube extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanLubeDetail.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanLubeDetail.java
index 9aa5577..5dd59e9 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanLubeDetail.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanLubeDetail.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author xins
  * @date 2024-03-21
  */
-public class DmsPlanLubeDetail extends BaseEntity
+public class DmsPlanLubeDetail extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanMaint.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanMaint.java
index c7b8dda..1c77c8e 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanMaint.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanMaint.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
@@ -15,7 +14,7 @@ import java.util.List;
  * @author xins
  * @date 2024-01-08
  */
-public class DmsPlanMaint extends BaseEntity
+public class DmsPlanMaint extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -69,7 +68,7 @@ public class DmsPlanMaint extends BaseEntity
 
     /** 是否标识：1-是；2-否 */
     @Excel(name = "是否标识：1-是；2-否")
-    private Long isFlag;
+    private Long isFlag;  // DMS_PLAN_MAINT.IS_FLAG is NUMBER(11,0)
 
     private String cronExpression;
     private Long timeLimitDays;
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanMaintDetail.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanMaintDetail.java
index 6730da9..edc6929 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanMaintDetail.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanMaintDetail.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author xins
  * @date 2024-01-08
  */
-public class DmsPlanMaintDetail extends BaseEntity
+public class DmsPlanMaintDetail extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanRepair.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanRepair.java
index 15a6a31..b8b1685 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanRepair.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanRepair.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -17,7 +16,7 @@ import java.util.List;
  * @author Open Platform
  * @date 2024-01-15
  */
-public class DmsPlanRepair extends BaseEntity
+public class DmsPlanRepair extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanRepairDetail.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanRepairDetail.java
index e62e0d6..e162954 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanRepairDetail.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsPlanRepairDetail.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -13,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author Open Platform
  * @date 2024-01-15
  */
-public class DmsPlanRepairDetail extends BaseEntity
+public class DmsPlanRepairDetail extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRealtimeStatus.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRealtimeStatus.java
index bfd47b7..451ad19 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRealtimeStatus.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRealtimeStatus.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -16,7 +15,7 @@ import java.util.Date;
  * @author Yinq
  * @date 2024-09-02
  */
-public class DmsRealtimeStatus extends BaseEntity {
+public class DmsRealtimeStatus extends DmsBaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRealtimeStatusHistory.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRealtimeStatusHistory.java
index 063fb9f..5b3e7c7 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRealtimeStatusHistory.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRealtimeStatusHistory.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -16,7 +15,7 @@ import java.util.Date;
  * @date 2024-09-02
  */
 @Data
-public class DmsRealtimeStatusHistory extends BaseEntity {
+public class DmsRealtimeStatusHistory extends DmsBaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordAlarmInfo.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordAlarmInfo.java
index 43c0a07..f56b934 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordAlarmInfo.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordAlarmInfo.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -16,7 +15,7 @@ import java.util.Date;
  * @author Yinq
  * @date 2024-08-13
  */
-public class DmsRecordAlarmInfo extends BaseEntity {
+public class DmsRecordAlarmInfo extends DmsBaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordInspect.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordInspect.java
index da682dc..da93be5 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordInspect.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordInspect.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.math.BigDecimal;
@@ -15,7 +14,7 @@ import java.util.Date;
  * @author Open Platform
  * @date 2024-01-16
  */
-public class DmsRecordInspect extends BaseEntity
+public class DmsRecordInspect extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordLube.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordLube.java
index 485fd21..48b7f25 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordLube.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordLube.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -16,7 +15,7 @@ import java.util.Date;
  * @author Open Platform
  * @date 2024-02-26
  */
-public class DmsRecordLube extends BaseEntity
+public class DmsRecordLube extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordShutDown.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordShutDown.java
index d8ce59b..c0fa944 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordShutDown.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordShutDown.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -17,7 +16,7 @@ import java.util.Date;
  * @author Open Platform
  * @date 2024-01-15
  */
-public class DmsRecordShutDown extends BaseEntity
+public class DmsRecordShutDown extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRepairInstance.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRepairInstance.java
index 11c3787..9969d89 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRepairInstance.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRepairInstance.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -17,7 +16,7 @@ import java.util.Date;
  * @author Open Platform
  * @date 2024-01-24
  */
-public class DmsRepairInstance extends BaseEntity
+public class DmsRepairInstance extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -28,9 +27,9 @@ public class DmsRepairInstance extends BaseEntity
     @Excel(name = "检修计划ID，关联dms_plan_repair的plan_repair_id")
     private Long planRepairId;
 
-    /** 工单流程ID，关联wf_process的wf_process_id;固定101 */
-    @Excel(name = "工单流程ID，关联wf_process的wf_process_id;固定101")
-    private Long wfProcessId;
+    /** 工单流程ID，关联wf_process的wf_process_id;固定101 - 已废弃审批流功能 */
+    // @Excel(name = "工单流程ID，关联wf_process的wf_process_id;固定101")
+    // private Long wfProcessId;
 
     /** 工单编号 */
     @Excel(name = "工单编号")
@@ -127,15 +126,16 @@ public class DmsRepairInstance extends BaseEntity
     {
         return planRepairId;
     }
-    public void setWfProcessId(Long wfProcessId)
-    {
-        this.wfProcessId = wfProcessId;
-    }
+    // 已废弃审批流功能
+    // public void setWfProcessId(Long wfProcessId)
+    // {
+    //     this.wfProcessId = wfProcessId;
+    // }
 
-    public Long getWfProcessId()
-    {
-        return wfProcessId;
-    }
+    // public Long getWfProcessId()
+    // {
+    //     return wfProcessId;
+    // }
     public void setBillsRepairCode(String billsRepairCode)
     {
         this.billsRepairCode = billsRepairCode;
@@ -241,7 +241,7 @@ public class DmsRepairInstance extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("repairInstanceId", getRepairInstanceId())
             .append("planRepairId", getPlanRepairId())
-            .append("wfProcessId", getWfProcessId())
+            // .append("wfProcessId", getWfProcessId()) // 已废弃审批流
             .append("billsRepairCode", getBillsRepairCode())
             .append("billsStatus", getBillsStatus())
             .append("planBeginTime", getPlanBeginTime())
diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRepairInstanceActivity.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRepairInstanceActivity.java
index 6143789..bd5bdc5 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRepairInstanceActivity.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRepairInstanceActivity.java
@@ -1,7 +1,6 @@
 package com.aucma.dms.domain;
 
 import com.aucma.common.annotation.Excel;
-import com.aucma.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -16,7 +15,7 @@ import java.util.Date;
  * @author Open Platform
  * @date 2024-01-23
  */
-public class DmsRepairInstanceActivity extends BaseEntity
+public class DmsRepairInstanceActivity extends DmsBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsFaultInstanceMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsFaultInstanceMapper.java
index c2094ba..38bc0dd 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsFaultInstanceMapper.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsBillsFaultInstanceMapper.java
@@ -63,7 +63,8 @@ public interface DmsBillsFaultInstanceMapper
      */
     public int deleteDmsBillsFaultInstanceByRepairInstanceIds(Long[] repairInstanceIds);
 
-    public Long selectProcessActivityId(Long wfProcessId);
+    // 已废弃审批流功能
+    // public Long selectProcessActivityId(Long wfProcessId);
 
 
     /**
diff --git a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsRepairInstanceMapper.java b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsRepairInstanceMapper.java
index 5f6ee42..f58ac85 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsRepairInstanceMapper.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/mapper/DmsRepairInstanceMapper.java
@@ -65,7 +65,7 @@ public interface DmsRepairInstanceMapper
      * @deprecated 审批流功能已废弃,不再使用
      * 原功能:通过工单流程id查询顺序为1的流程id
      */
-    @Deprecated
-    Long selectWfProcessActivityId(Long wfPorcessId);
+    // @Deprecated
+    // Long selectWfProcessActivityId(Long wfPorcessId);
     // ===== 审批流相关方法结束 =====
 }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectProjectServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectProjectServiceImpl.java
index 7e7c465..880e5b5 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectProjectServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectProjectServiceImpl.java
@@ -1,5 +1,12 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsBaseInspectProject;
+//import com.aucma.dms.mapper.DmsBaseInspectProjectMapper;
+//import com.aucma.dms.service.IDmsBaseInspectProjectService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.exception.ServiceException;
@@ -70,7 +77,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS
         }
         LoginUser user = SecurityUtils.getLoginUser();
         dmsBaseInspectProject.setIsFlag("1");
-        dmsBaseInspectProject.setCreateBy(user.getUsername());
+        dmsBaseInspectProject.setCreateBy(user.getUserId());
         dmsBaseInspectProject.setCreateTime(DateUtils.getNowDate());
         return dmsBaseInspectProjectMapper.insertDmsBaseInspectProject(dmsBaseInspectProject);
     }
@@ -93,7 +100,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS
             throw new ServiceException("巡检项目编号已存在");
         }
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseInspectProject.setUpdateBy(user.getUsername());
+        dmsBaseInspectProject.setUpdateBy(user.getUserId());
         dmsBaseInspectProject.setUpdateTime(DateUtils.getNowDate());
         return dmsBaseInspectProjectMapper.updateDmsBaseInspectProject(dmsBaseInspectProject);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectRouteServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectRouteServiceImpl.java
index a1017a1..7a103bf 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectRouteServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectRouteServiceImpl.java
@@ -1,5 +1,12 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsBaseInspectRoute;
+//import com.aucma.dms.mapper.DmsBaseInspectRouteMapper;
+//import com.aucma.dms.service.IDmsBaseInspectRouteService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.exception.ServiceException;
@@ -67,7 +74,7 @@ public class DmsBaseInspectRouteServiceImpl implements IDmsBaseInspectRouteServi
                 selectDmsBaseInspectRouteList(InspectRoute);
         if (InspectRoutelist.size()>0)throw new ServiceException("该路线已存在");
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseInspectRoute.setCreateBy(user.getUsername());
+        dmsBaseInspectRoute.setCreateBy(user.getUserId());
         dmsBaseInspectRoute.setIsFlag("1");
         dmsBaseInspectRoute.setCreateTime(DateUtils.getNowDate());
         return dmsBaseInspectRouteMapper.insertDmsBaseInspectRoute(dmsBaseInspectRoute);
@@ -91,7 +98,7 @@ public class DmsBaseInspectRouteServiceImpl implements IDmsBaseInspectRouteServi
             throw new ServiceException("该路线已存在");
         }
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseInspectRoute.setUpdateBy(user.getUsername());
+        dmsBaseInspectRoute.setUpdateBy(user.getUserId());
         dmsBaseInspectRoute.setUpdateTime(DateUtils.getNowDate());
         return dmsBaseInspectRouteMapper.updateDmsBaseInspectRoute(dmsBaseInspectRoute);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectStandardServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectStandardServiceImpl.java
index 373ea43..ad66e61 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectStandardServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectStandardServiceImpl.java
@@ -1,5 +1,12 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsBaseInspectStandard;
+//import com.aucma.dms.mapper.DmsBaseInspectStandardMapper;
+//import com.aucma.dms.service.IDmsBaseInspectStandardService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.exception.ServiceException;
@@ -65,7 +72,7 @@ public class DmsBaseInspectStandardServiceImpl implements IDmsBaseInspectStandar
         if (dmsBaseInspectStandardList.size() > 0){throw new ServiceException("巡检标准编号已存在");}
         dmsBaseInspectStandard.setIsFlag("1");
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseInspectStandard.setCreateBy(user.getUsername());
+        dmsBaseInspectStandard.setCreateBy(user.getUserId());
         dmsBaseInspectStandard.setCreateTime(DateUtils.getNowDate());
         return dmsBaseInspectStandardMapper.insertDmsBaseInspectStandard(dmsBaseInspectStandard);
     }
@@ -88,7 +95,7 @@ public class DmsBaseInspectStandardServiceImpl implements IDmsBaseInspectStandar
             throw new ServiceException("巡检标准编号已存在");
         }
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseInspectStandard.setUpdateBy(user.getUsername());
+        dmsBaseInspectStandard.setUpdateBy(user.getUserId());
         dmsBaseInspectStandard.setUpdateTime(DateUtils.getNowDate());
         return dmsBaseInspectStandardMapper.updateDmsBaseInspectStandard(dmsBaseInspectStandard);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseLubeStandardServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseLubeStandardServiceImpl.java
index 68d4799..d0f5524 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseLubeStandardServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseLubeStandardServiceImpl.java
@@ -1,5 +1,12 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsBaseLubeStandard;
+//import com.aucma.dms.mapper.DmsBaseLubeStandardMapper;
+//import com.aucma.dms.service.IDmsBaseLubeStandardService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.exception.ServiceException;
@@ -65,7 +72,7 @@ public class DmsBaseLubeStandardServiceImpl implements IDmsBaseLubeStandardServi
         if (dmsBaseLubeStandardList.size()>0){throw new ServiceException("润滑标准编码已存在");}
         LoginUser user = SecurityUtils.getLoginUser();
         dmsBaseLubeStandard.setIsFlag("1");
-        dmsBaseLubeStandard.setCreateBy(user.getUsername());
+        dmsBaseLubeStandard.setCreateBy(user.getUserId());
         dmsBaseLubeStandard.setCreateTime(DateUtils.getNowDate());
         return dmsBaseLubeStandardMapper.insertDmsBaseLubeStandard(dmsBaseLubeStandard);
     }
@@ -89,7 +96,7 @@ public class DmsBaseLubeStandardServiceImpl implements IDmsBaseLubeStandardServi
             throw new ServiceException("润滑标准编码已存在");
         }
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseLubeStandard.setUpdateBy(user.getUsername());
+        dmsBaseLubeStandard.setUpdateBy(user.getUserId());
         dmsBaseLubeStandard.setUpdateTime(DateUtils.getNowDate());
         return dmsBaseLubeStandardMapper.updateDmsBaseLubeStandard(dmsBaseLubeStandard);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseLubeStationServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseLubeStationServiceImpl.java
index a850293..81e9f1c 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseLubeStationServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseLubeStationServiceImpl.java
@@ -1,5 +1,12 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsBaseLubeStation;
+//import com.aucma.dms.mapper.DmsBaseLubeStationMapper;
+//import com.aucma.dms.service.IDmsBaseLubeStationService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.exception.ServiceException;
@@ -67,7 +74,7 @@ public class DmsBaseLubeStationServiceImpl implements IDmsBaseLubeStationService
             throw new ServiceException("润滑部位编码已存在");
         }
         dmsBaseLubeStation.setIsFlag("1");
-        dmsBaseLubeStation.setCreateBy(user.getUsername());
+        dmsBaseLubeStation.setCreateBy(user.getUserId());
         dmsBaseLubeStation.setCreateTime(DateUtils.getNowDate());
         return dmsBaseLubeStationMapper.insertDmsBaseLubeStation(dmsBaseLubeStation);
     }
@@ -90,7 +97,7 @@ public class DmsBaseLubeStationServiceImpl implements IDmsBaseLubeStationService
             throw new ServiceException("润滑部位编码已存在");
         }
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseLubeStation.setUpdateBy(user.getUsername());
+        dmsBaseLubeStation.setUpdateBy(user.getUserId());
         dmsBaseLubeStation.setUpdateTime(DateUtils.getNowDate());
         return dmsBaseLubeStationMapper.updateDmsBaseLubeStation(dmsBaseLubeStation);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintProjectServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintProjectServiceImpl.java
index 8c216c7..21c3cd3 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintProjectServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintProjectServiceImpl.java
@@ -1,5 +1,10 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.aucma.dms.domain.*;
+//import com.aucma.dms.mapper.*;
+//import com.aucma.dms.service.*;
 
 import com.aucma.common.exception.ServiceException;
 import com.aucma.common.utils.DateUtils;
@@ -19,7 +24,7 @@ import java.util.List;
  * @date 2024-09-23
  */
 @Service
-public class DmsBaseMaintProjectServiceImpl implements IDmsBaseMaintProjectService 
+public class DmsBaseMaintProjectServiceImpl implements IDmsBaseMaintProjectService
 {
     @Autowired
     private DmsBaseMaintProjectMapper dmsBaseMaintProjectMapper;
@@ -59,6 +64,10 @@ public class DmsBaseMaintProjectServiceImpl implements IDmsBaseMaintProjectServi
     @Override
     public int insertDmsBaseMaintProject(DmsBaseMaintProject dmsBaseMaintProject)
     {
+        // 设置默认值：ACTIVE_FLAG 为 null 时默认为 0
+        if (dmsBaseMaintProject.getActiveFlag() == null) {
+            dmsBaseMaintProject.setActiveFlag("0");
+        }
         dmsBaseMaintProject.setCreateTime(DateUtils.getNowDate());
         return dmsBaseMaintProjectMapper.insertDmsBaseMaintProject(dmsBaseMaintProject);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintStandardServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintStandardServiceImpl.java
index 2d6d0b7..ee5d812 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintStandardServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintStandardServiceImpl.java
@@ -66,13 +66,19 @@ public class DmsBaseMaintStandardServiceImpl implements IDmsBaseMaintStandardSer
             throw new ServiceException("保养标准编码已存在");
         }
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseMaintStandard.setIsFlag(1l);
+        // 设置默认值：IS_FLAG 和 ACTIVE_FLAG 为 null 时默认为 0
+        if (dmsBaseMaintStandard.getIsFlag() == null) {
+            dmsBaseMaintStandard.setIsFlag(0L);  // IS_FLAG 是 NUMBER 类型
+        }
+        if (dmsBaseMaintStandard.getActiveFlag() == null) {
+            dmsBaseMaintStandard.setActiveFlag("0");  // ACTIVE_FLAG 是 CHAR(1) 类型
+        }
         dmsBaseMaintStandard.setDeviceTypeId(0l);
-        dmsBaseMaintStandard.setCreateBy(user.getUsername());
+        // 写入 Long 类型用户ID
+        dmsBaseMaintStandard.setCreateBy(SecurityUtils.getUserId());
         dmsBaseMaintStandard.setCreateTime(DateUtils.getNowDate());
         return dmsBaseMaintStandardMapper.insertDmsBaseMaintStandard(dmsBaseMaintStandard);
     }
-
     /**
      * 修改保养标准信息
      *
@@ -91,7 +97,8 @@ public class DmsBaseMaintStandardServiceImpl implements IDmsBaseMaintStandardSer
             throw new ServiceException("保养标准编码已存在");
         }
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseMaintStandard.setUpdateBy(user.getUsername());
+        // 写入 Long 类型用户ID
+        dmsBaseMaintStandard.setUpdateBy(SecurityUtils.getUserId());
         dmsBaseMaintStandard.setUpdateTime(DateUtils.getNowDate());
         return dmsBaseMaintStandardMapper.updateDmsBaseMaintStandard(dmsBaseMaintStandard);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintStationServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintStationServiceImpl.java
index 8d3af3e..5de0495 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintStationServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseMaintStationServiceImpl.java
@@ -1,6 +1,7 @@
 package com.aucma.dms.service.impl;
 
 
+
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.exception.ServiceException;
 import com.aucma.common.utils.DateUtils;
@@ -75,7 +76,7 @@ public class DmsBaseMaintStationServiceImpl implements IDmsBaseMaintStationServi
         }
         LoginUser user = SecurityUtils.getLoginUser();
         dmsBaseMaintStation.setIsFlag(1l);
-        dmsBaseMaintStation.setCreateBy(user.getUsername());
+        dmsBaseMaintStation.setCreateBy(user.getUserId());
         dmsBaseMaintStation.setCreateTime(DateUtils.getNowDate());
 
 /*因为MaintStationId在前端不可见不可编辑，是数据库自增主键，
@@ -120,7 +121,7 @@ public class DmsBaseMaintStationServiceImpl implements IDmsBaseMaintStationServi
             throw new ServiceException("保养部位信息编码已存在");
         }
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseMaintStation.setUpdateBy(user.getUsername());
+        dmsBaseMaintStation.setUpdateBy(user.getUserId());
         dmsBaseMaintStation.setUpdateTime(DateUtils.getNowDate());
 
         //若Long[] ProductIds不为空
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseShutReasonServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseShutReasonServiceImpl.java
index edc5021..79231e0 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseShutReasonServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseShutReasonServiceImpl.java
@@ -1,5 +1,12 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsBaseShutReason;
+//import com.aucma.dms.mapper.DmsBaseShutReasonMapper;
+//import com.aucma.dms.service.IDmsBaseShutReasonService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.exception.ServiceException;
@@ -65,7 +72,7 @@ public class DmsBaseShutReasonServiceImpl implements IDmsBaseShutReasonService
        if (dmsBaseShutReasonList.size()>0){throw new ServiceException("停机原因编号已存在");}
         LoginUser user = SecurityUtils.getLoginUser();
         dmsBaseShutReason.setIsFlag("1");
-        dmsBaseShutReason.setCreateBy(user.getUsername());
+        dmsBaseShutReason.setCreateBy(user.getUserId());
         dmsBaseShutReason.setCreateTime(DateUtils.getNowDate());
         return dmsBaseShutReasonMapper.insertDmsBaseShutReason(dmsBaseShutReason);
     }
@@ -88,7 +95,7 @@ public class DmsBaseShutReasonServiceImpl implements IDmsBaseShutReasonService
             throw new ServiceException("停机原因编号已存在");
         }
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBaseShutReason.setUpdateBy(user.getUsername());
+        dmsBaseShutReason.setUpdateBy(user.getUserId());
         dmsBaseShutReason.setUpdateTime(DateUtils.getNowDate());
         return dmsBaseShutReasonMapper.updateDmsBaseShutReason(dmsBaseShutReason);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseShutTypeServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseShutTypeServiceImpl.java
index b481e40..563e145 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseShutTypeServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseShutTypeServiceImpl.java
@@ -1,5 +1,12 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsBaseShutType;
+//import com.aucma.dms.mapper.DmsBaseShutTypeMapper;
+//import com.aucma.dms.service.IDmsBaseShutTypeService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.exception.ServiceException;
@@ -65,7 +72,7 @@ public class DmsBaseShutTypeServiceImpl implements IDmsBaseShutTypeService
         if (DmsBaseShutTypeList.size() > 0){throw new ServiceException("停机类型编码已存在");}
         LoginUser user = SecurityUtils.getLoginUser();
         dmsBaseShutType.setIsFlag("1");
-        dmsBaseShutType.setCreateBy(user.getUsername());
+        dmsBaseShutType.setCreateBy(user.getUserId());
         dmsBaseShutType.setCreateTime(DateUtils.getNowDate());
         return dmsBaseShutTypeMapper.insertDmsBaseShutType(dmsBaseShutType);
     }
@@ -88,7 +95,7 @@ public class DmsBaseShutTypeServiceImpl implements IDmsBaseShutTypeService
                 .equals(DmsBaseShutTypeList.get(0).getShutTypeId())){
             throw new ServiceException("停机类型编码已存在");
         }
-        dmsBaseShutType.setUpdateBy(user.getUsername());
+        dmsBaseShutType.setUpdateBy(user.getUserId());
         dmsBaseShutType.setUpdateTime(DateUtils.getNowDate());
         return dmsBaseShutTypeMapper.updateDmsBaseShutType(dmsBaseShutType);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseStationProjectServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseStationProjectServiceImpl.java
index 171b0c5..77d2ca2 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseStationProjectServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseStationProjectServiceImpl.java
@@ -1,5 +1,9 @@
 package com.aucma.dms.service.impl;
 
+//import com.aucma.dms.domain.DmsBaseStationProject;
+//import com.aucma.dms.mapper.DmsBaseStationProjectMapper;
+//import com.aucma.dms.service.IDmsBaseStationProjectService;
+
 import com.aucma.dms.domain.DmsBaseStationProject;
 import com.aucma.dms.mapper.DmsBaseStationProjectMapper;
 import com.aucma.dms.service.IDmsBaseStationProjectService;
@@ -16,7 +20,7 @@ import java.util.List;
  * @date 2024-09-23
  */
 @Service
-public class DmsBaseStationProjectServiceImpl implements IDmsBaseStationProjectService 
+public class DmsBaseStationProjectServiceImpl implements IDmsBaseStationProjectService
 {
     @Autowired
     private DmsBaseStationProjectMapper dmsBaseStationProjectMapper;
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java
index 28d9618..4aa282d 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java
@@ -1,8 +1,22 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.constant.DmsConstants;
+//import com.hw.common.core.constant.WfConstants;
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.core.utils.uuid.Seq;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsBillsFaultInstance;
+//import com.aucma.dms.domain.DmsFaultCompentsParts;
+//import com.aucma.dms.domain.DmsFaultInstanceActivity;
+//import com.aucma.dms.domain.DmsInstanceFile;
+//import com.aucma.dms.domain.vo.DmsBillsFaultInstanceScanVo;
+//import com.aucma.dms.mapper.DmsBillsFaultInstanceMapper;
+//import com.aucma.dms.mapper.DmsFaultInstanceActivityMapper;
+//import com.aucma.dms.mapper.DmsInstanceFileMapper;
+//import com.aucma.dms.service.IDmsBillsFaultInstanceService;
 
 import com.aucma.common.constant.DmsConstants;
-import com.aucma.common.constant.WfConstants;
 import com.aucma.common.exception.ServiceException;
 import com.aucma.common.utils.DateUtils;
 import com.aucma.common.utils.SecurityUtils;
@@ -114,11 +128,11 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
     public int insertDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) {
         Date curretnDate = new Date();
         String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName() ;
-        dmsBillsFaultInstance.setWfProcessId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ID);
+//        dmsBillsFaultInstance.setWfProcessId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ID);
         dmsBillsFaultInstance.setApplyUser(userName);
         dmsBillsFaultInstance.setApplyTime(curretnDate);
         dmsBillsFaultInstance.setCreateTime(curretnDate);
-        dmsBillsFaultInstance.setCreateBy(userName);
+        dmsBillsFaultInstance.setCreateBy(SecurityUtils.getUserId());
         dmsBillsFaultInstance.setBillsFaultCode(Seq.getId(Seq.dmsBillsFaultInstanceSeqType, Seq.dmsBillsFaultInstanceSeqCode));
         dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR);
         dmsBillsFaultInstance.setInstanceType(DmsConstants.DMS_BILLS_FAULT_INSTANCE_TYPE_MAUAL);
@@ -127,7 +141,9 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
 
         DmsFaultInstanceActivity dmsFaultInstanceActivity = new DmsFaultInstanceActivity();
         dmsFaultInstanceActivity.setRepairInstanceId(dmsBillsFaultInstance.getRepairInstanceId());
-        dmsFaultInstanceActivity.setProcessActivityId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ACTIVITY_FIRST_ID);
+        // 已废弃审批流功能 - 设置固定值或注释
+        // dmsFaultInstanceActivity.setProcessActivityId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ACTIVITY_FIRST_ID);
+        //dmsFaultInstanceActivity.setProcessActivityId(1L);
         dmsFaultInstanceActivity.setFaultType(dmsBillsFaultInstance.getFaultType());
         dmsFaultInstanceActivity.setFaultDescription(dmsBillsFaultInstance.getFaultDescription());
         dmsFaultInstanceActivity.setDesignOperations(dmsBillsFaultInstance.getDesignOperations());
@@ -195,7 +211,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
      */
     public int insertDmsBillsFaultInstancePDA(DmsBillsFaultInstance dmsBillsFaultInstance) {
         //根据报修流程查询工单流程节点id
-        //Long aLong = dmsBillsFaultInstanceMapper.selectProcessActivityId(102l);
+//        Long aLong = dmsBillsFaultInstanceMapper.selectProcessActivityId(102l);
         int i = dmsBillsFaultInstanceMapper.insertDmsBillsFaultInstance(dmsBillsFaultInstance);
         DmsFaultInstanceActivity dmsFaultInstanceActivity = new DmsFaultInstanceActivity();
         //生成故障报修工单实例节点第一步
@@ -206,7 +222,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
         dmsFaultInstanceActivity.setDeviceId(dmsBillsFaultInstance.getDeviceId());
         dmsFaultInstanceActivity.setRepairType(dmsBillsFaultInstance.getRepairType());
         dmsFaultInstanceActivity.setOutsrcId(dmsBillsFaultInstance.getOutsrcId());
-        //dmsFaultInstanceActivity.setProcessActivityId(aLong);
+//        dmsFaultInstanceActivity.setProcessActivityId(aLong);
         dmsFaultInstanceActivity.setProcessStepOrder(1l);
         dmsFaultInstanceActivity.setCreateTime(DateUtils.getNowDate());
         dmsFaultInstanceActivityMapper.insertDmsFaultInstanceActivity(dmsFaultInstanceActivity);
@@ -384,17 +400,19 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
         }
 
         Date currentDate = new Date();
-        String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName() ;
+        String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName();
 
         if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR)) {//待维修
             dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_REPAIRING);
             dmsBillsFaultInstance.setRealBeginTime(currentDate);
             dmsBillsFaultInstance.setUpdateTime(currentDate);
-            dmsBillsFaultInstance.setUpdateBy(userName);
+            dmsBillsFaultInstance.setUpdateBy(SecurityUtils.getUserId());
             dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance);
 
             dmsFaultInstanceActivity.setRepairInstanceId(dmsBillsFaultInstance.getRepairInstanceId());
-            dmsFaultInstanceActivity.setProcessActivityId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ACTIVITY_SECOND_ID);
+            // 已废弃审批流功能 - 设置固定值或注释
+            // dmsFaultInstanceActivity.setProcessActivityId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ACTIVITY_SECOND_ID);
+            dmsFaultInstanceActivity.setProcessActivityId(2L); // 临时设置固定值
             dmsFaultInstanceActivity.setDeviceId(dmsBillsFaultInstance.getDeviceId());
             dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_EXECUTING);
             dmsFaultInstanceActivity.setProcessStepOrder(2L);
@@ -402,7 +420,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
             dmsFaultInstanceActivity.setHandleUserId(SecurityUtils.getUserId());
             dmsFaultInstanceActivity.setHandleBy(userName);
             dmsFaultInstanceActivity.setHandleTime(currentDate);
-            dmsFaultInstanceActivity.setCreateBy(userName);
+            dmsFaultInstanceActivity.setCreateBy(SecurityUtils.getUserId());
             dmsFaultInstanceActivity.setCreateTime(currentDate);
 
             dmsFaultInstanceActivityMapper.insertDmsFaultInstanceActivity(dmsFaultInstanceActivity);
@@ -473,11 +491,11 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
         }
 
         Date currentDate = new Date();
-        String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName() ;
+        String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName();
 
         dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH);
         dmsBillsFaultInstance.setRealEndTime(currentDate);
-        dmsBillsFaultInstance.setUpdateBy(userName);
+        dmsBillsFaultInstance.setUpdateBy(SecurityUtils.getUserId());
         dmsBillsFaultInstance.setUpdateTime(currentDate);
 
         dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance);
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsInspectInstanceActivityServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsInspectInstanceActivityServiceImpl.java
index b50d191..e94f7c8 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsInspectInstanceActivityServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsInspectInstanceActivityServiceImpl.java
@@ -1,5 +1,10 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.aucma.dms.domain.DmsBillsInspectInstanceActivity;
+//import com.aucma.dms.mapper.DmsBillsInspectInstanceActivityMapper;
+//import com.aucma.dms.service.IDmsBillsInspectInstanceActivityService;
+
 import com.aucma.common.utils.DateUtils;
 import com.aucma.dms.domain.DmsBillsInspectInstanceActivity;
 import com.aucma.dms.mapper.DmsBillsInspectInstanceActivityMapper;
@@ -95,20 +100,12 @@ public class DmsBillsInspectInstanceActivityServiceImpl implements IDmsBillsInsp
         return dmsBillsInspectInstanceActivityMapper.deleteDmsBillsInspectInstanceActivityByInstanceActivityId(instanceActivityId);
     }
 
-    // ===== 审批流相关方法 - 已废弃 =====
-    /**
-     * @deprecated 审批流功能已废弃,默认返回true
-     */
     @Override
-    @Deprecated
     public boolean selectUserIdByDmsBillsInspectInstanceActivityId(Long lubeInstanceId, Long userId) {
-        // 审批流功能已废弃,默认返回true
-        return true;
-        
-        // 原审批流逻辑已注释:
-        // Long[] integers = dmsBillsInspectInstanceActivityMapper.selectUserIdByDmsBillsInspectInstanceActivityId(lubeInstanceId);
-        // boolean contains = Arrays.asList(integers).contains(userId);
-        // return contains;
+        Long[] integers = dmsBillsInspectInstanceActivityMapper.selectUserIdByDmsBillsInspectInstanceActivityId(lubeInstanceId);
+        boolean contains = Arrays.asList(integers).contains(userId);
+
+        return contains;
+
     }
-    // ===== 审批流相关方法结束 =====
 }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java
index 1477a77..b4558e6 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java
@@ -1,5 +1,17 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.constant.DmsConstants;
+//import com.hw.common.core.constant.SecurityConstants;
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.core.utils.StringUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.*;
+//import com.aucma.dms.domain.vo.DmsBillsInspectInstanceScanVo;
+//import com.aucma.dms.mapper.*;
+//import com.aucma.dms.service.IDmsBillsInspectInstanceService;
+//import com.hw.system.api.RemoteSysCommonService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.constant.DmsConstants;
 import com.aucma.common.core.domain.model.LoginUser;
@@ -90,17 +102,17 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
     @Transactional(rollbackFor = Exception.class)
     public int insertDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) {
         LoginUser user = SecurityUtils.getLoginUser();
-        //写死105，也可根据传入对象的wfprocessid作为传参。
-        //Long aLong = dmsRepairInstanceMapper.selectWfProcessActivityId(105l);
-        if (dmsBillsInspectInstance.getInspectType().equals("1")) {
-            dmsBillsInspectInstance.setWfProcessId(105l);
-        } else if (dmsBillsInspectInstance.getInspectType().equals("2")) {
-            dmsBillsInspectInstance.setWfProcessId(104l);
-        }
+        // 已废弃审批流功能 - 以下代码已注释
+        // Long aLong = dmsRepairInstanceMapper.selectWfProcessActivityId(105l);
+        // if (dmsBillsInspectInstance.getInspectType().equals("1")) {
+        //     dmsBillsInspectInstance.setWfProcessId(105l);
+        // } else if (dmsBillsInspectInstance.getInspectType().equals("2")) {
+        //     dmsBillsInspectInstance.setWfProcessId(104l);
+        // }
         dmsBillsInspectInstance.setCreateTime(DateUtils.getNowDate());
         dmsBillsInspectInstance.setIsFlag("1");
         dmsBillsInspectInstance.setInspectStatus(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT);
-        dmsBillsInspectInstance.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsBillsInspectInstance.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         int i = dmsBillsInspectInstanceMapper.insertDmsBillsInspectInstance(dmsBillsInspectInstance);
 //        List<DmsBillsInspectInstance> dmsBillsInspectInstances = dmsBillsInspectInstanceMapper.selectDmsBillsInspectInstanceList(dmsBillsInspectInstance);
         //新建第一步工单实例节点
@@ -110,7 +122,8 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
         dmsBillsInspectInstanceActivity.setDeviceAmount(dmsBillsInspectInstance.getDeviceAmount());
         dmsBillsInspectInstanceActivity.setPerformer(dmsBillsInspectInstance.getPerformer());
         dmsBillsInspectInstanceActivity.setProcessStepOrder(1l);
-        //dmsBillsInspectInstanceActivity.setProcessActivityId(aLong);
+        // 已废弃审批流功能
+        // dmsBillsInspectInstanceActivity.setProcessActivityId(aLong);
         dmsBillsInspectInstanceActivityMapper.insertDmsBillsInspectInstanceActivity(dmsBillsInspectInstanceActivity);
 
         //新建点巡检工单明细
@@ -181,16 +194,16 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
 
     @Override
     public int insertDmsBillsInspectInstancePDA(DmsBillsInspectInstance dmsBillsInspectInstance) {
-        //Long aLong = null;
+        // 已废弃审批流功能 - 以下代码已注释
+        // Long along = null;
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH");
-/*        if (dmsBillsInspectInstance.getInspectType().equals("1")) {
-            dmsBillsInspectInstance.setWfProcessId(105l);
-            along = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 105l);
-        } else if (dmsBillsInspectInstance.getInspectType().equals("2")) {
-            dmsBillsInspectInstance.setWfProcessId(104l);
-            along = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 104l);
-
-        }*/
+        // if (dmsBillsInspectInstance.getInspectType().equals("1")) {
+        //     dmsBillsInspectInstance.setWfProcessId(105l);
+        //     along = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 105l);
+        // } else if (dmsBillsInspectInstance.getInspectType().equals("2")) {
+        //     dmsBillsInspectInstance.setWfProcessId(104l);
+        //     along = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 104l);
+        // }
         dmsBillsInspectInstance.setBillsInspectCode(sdf.format(DateUtils.getNowDate()));
         dmsBillsInspectInstance.setInspectStatus("1");
         dmsBillsInspectInstance.setIsFlag("1");
@@ -200,7 +213,8 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
         DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity = new DmsBillsInspectInstanceActivity();
         dmsBillsInspectInstanceActivity.setInspectInstanceId(dmsBillsInspectInstance.getInspectInstanceId());
         dmsBillsInspectInstanceActivity.setProcessStepOrder(1l);
-       // dmsBillsInspectInstanceActivity.setProcessActivityId(along);
+        // 已废弃审批流功能
+        // dmsBillsInspectInstanceActivity.setProcessActivityId(along);
         dmsBillsInspectInstanceActivity.setInspectRouteId(dmsBillsInspectInstance.getInspectRouteId());
         dmsBillsInspectInstanceActivity.setDeviceAmount(dmsBillsInspectInstance.getDeviceAmount());
         dmsBillsInspectInstanceActivity.setPerformer(dmsBillsInspectInstance.getPerformer());
@@ -294,10 +308,10 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta
         dmsBillsInspectInstance.setInspectInstanceId(dmsInspectInstanceDetail.getInspectInstanceId());
         dmsBillsInspectInstance.setRealEndTime(new Date());
         int i = dmsBillsInspectInstanceMapper.updateDmsBillsInspectInstance(dmsBillsInspectInstance);
-        String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName() ;
+        String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName();
         Date currentDate = new Date();
         dmsInspectInstanceDetail.setUpdateTime(currentDate);
-        dmsInspectInstanceDetail.setUpdateBy(userName);
+        dmsInspectInstanceDetail.setUpdateBy(SecurityUtils.getUserId());
 
         DmsInspectInstanceDetail returnInspectInstanceDetail = handleDmsInspectInstanceDetailProject(dmsInspectInstanceDetail);
         if (returnInspectInstanceDetail != null) {
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java
index 8a4f9f6..f228260 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java
@@ -1,5 +1,13 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.*;
+//import com.aucma.dms.mapper.DmsBillsLubeInstanceActivityMapper;
+//import com.aucma.dms.mapper.DmsBillsLubeInstanceMapper;
+//import com.aucma.dms.service.IDmsBillsLubeInstanceActivityService;
+//import com.aucma.dms.service.IDmsPlanLubeService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.utils.DateUtils;
@@ -67,7 +75,7 @@ public class DmsBillsLubeInstanceActivityServiceImpl implements IDmsBillsLubeIns
     public int insertDmsBillsLubeInstanceActivity(DmsBillsLubeInstanceActivity dmsBillsLubeInstanceActivity)
     {
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsBillsLubeInstanceActivity.setCreateBy(user.getUsername());
+        dmsBillsLubeInstanceActivity.setCreateBy(user.getUserId());
         dmsBillsLubeInstanceActivity.setStartTime(DateUtils.getNowDate());
         dmsBillsLubeInstanceActivity.setCreateTime(DateUtils.getNowDate());
         dmsBillsLubeInstanceActivity.setProcessHandleStatus("2");
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java
index be70003..097116b 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java
@@ -1,5 +1,19 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.constant.DmsConstants;
+//import com.hw.common.core.constant.SecurityConstants;
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.core.utils.StringUtils;
+//import com.hw.common.core.utils.uuid.Seq;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.*;
+//import com.aucma.dms.mapper.DmsBillsLubeDetailMapper;
+//import com.aucma.dms.mapper.DmsBillsLubeInstanceActivityMapper;
+//import com.aucma.dms.mapper.DmsBillsLubeInstanceMapper;
+//import com.aucma.dms.mapper.DmsPlanLubeMapper;
+//import com.aucma.dms.service.IDmsBillsLubeInstanceService;
+//import com.hw.system.api.RemoteSysCommonService;
 
 import com.aucma.common.constant.DmsConstants;
 import com.aucma.common.exception.ServiceException;
@@ -191,14 +205,16 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer
     @Override
     public int insertDmsBillsLubeInstancePDA(DmsBillsLubeInstance dmsBillsLubeInstance) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH");
-        //Long aLong = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 106l);
+        // 已废弃审批流功能 - 以下代码已注释
+        // Long aLong = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 106l);
         dmsBillsLubeInstance.setBillsLubeCode(sdf.format(DateUtils.getNowDate()));
         dmsBillsLubeInstance.setLubeStatus("1");
         dmsBillsLubeInstance.setIsFlag("1");
         //创建润滑工单实例节点
         DmsBillsLubeInstanceActivity dmsBillsLubeInstanceActivity = new DmsBillsLubeInstanceActivity();
         dmsBillsLubeInstanceActivity.setLubeInstanceId(dmsBillsLubeInstance.getLubeInstanceId());
-//        dmsBillsLubeInstanceActivity.setProcessActivityId(aLong);
+        // 已废弃审批流功能
+        // dmsBillsLubeInstanceActivity.setProcessActivityId(aLong);
         dmsBillsLubeInstanceActivity.setLubeGroup(dmsBillsLubeInstance.getLubeGroup());
         dmsBillsLubeInstanceActivity.setLubeLevel(dmsBillsLubeInstance.getLubeLevel());
         dmsBillsLubeInstanceActivity.setLubeSupervisor(dmsBillsLubeInstance.getLubeSupervisor());
@@ -247,24 +263,24 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer
         }
 
         Date currentDate = new Date();
-        String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName() ;
+        String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName();
 
         if (lubeStatus.equals(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_TO_LUBE)) {//待润滑
             dmsBillsLubeInstance.setLubeStatus(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING);
             dmsBillsLubeInstance.setRealBeginTime(currentDate);
             dmsBillsLubeInstance.setUpdateTime(currentDate);
-            dmsBillsLubeInstance.setUpdateBy(userName);
+            dmsBillsLubeInstance.setUpdateBy(SecurityUtils.getUserId());
             dmsBillsLubeInstanceMapper.updateDmsBillsLubeInstance(dmsBillsLubeInstance);
 
             dmsBillsLubeDetail.setBeginTime(currentDate);
-            dmsBillsLubeDetail.setUpdateBy(userName);
+            dmsBillsLubeDetail.setUpdateBy(SecurityUtils.getUserId());
             dmsBillsLubeDetail.setUpdateTime(currentDate);
             dmsBillsLubeDetail.setMaintStatus(Long.valueOf(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING));
 
             dmsBillsLubeDetailMapper.updateDmsBillsLubeDetail(dmsBillsLubeDetail);
 
         } else {//润滑中
-            dmsBillsLubeDetail.setUpdateBy(userName);
+            dmsBillsLubeDetail.setUpdateBy(SecurityUtils.getUserId());
             dmsBillsLubeDetail.setUpdateTime(currentDate);
             dmsBillsLubeDetailMapper.updateDmsBillsLubeDetail(dmsBillsLubeDetail);
         }
@@ -296,7 +312,7 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer
         }
 
         Date currentDate = new Date();
-        String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName() ;
+        String userName = SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName();
 
         DmsBillsLubeDetail queryLubeDetail = new DmsBillsLubeDetail();
         queryLubeDetail.setLubeInstanceId(lubeInstanceId);
@@ -314,12 +330,12 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer
             dmsBillsLubeInstance.setLubeStatus(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_COMPLETE);
             dmsBillsLubeInstance.setRealEndTime(currentDate);
             dmsBillsLubeInstance.setUpdateTime(currentDate);
-            dmsBillsLubeInstance.setUpdateBy(userName);
+            dmsBillsLubeInstance.setUpdateBy(SecurityUtils.getUserId());
             dmsBillsLubeInstanceMapper.updateDmsBillsLubeInstance(dmsBillsLubeInstance);
         }
 
         dmsBillsLubeDetail.setEndTime(currentDate);
-        dmsBillsLubeDetail.setUpdateBy(userName);
+        dmsBillsLubeDetail.setUpdateBy(SecurityUtils.getUserId());
         dmsBillsLubeDetail.setUpdateTime(currentDate);
         dmsBillsLubeDetail.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE);
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintDetailProjectServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintDetailProjectServiceImpl.java
index d7073c9..9a3a68e 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintDetailProjectServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintDetailProjectServiceImpl.java
@@ -1,5 +1,10 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.aucma.dms.domain.DmsBillsMaintDetailProject;
+//import com.aucma.dms.mapper.DmsBillsMaintDetailProjectMapper;
+//import com.aucma.dms.service.IDmsBillsMaintDetailProjectService;
+
 import com.aucma.common.utils.DateUtils;
 import com.aucma.dms.domain.DmsBillsMaintDetailProject;
 import com.aucma.dms.mapper.DmsBillsMaintDetailProjectMapper;
@@ -16,7 +21,7 @@ import java.util.List;
  * @date 2024-09-18
  */
 @Service
-public class DmsBillsMaintDetailProjectServiceImpl implements IDmsBillsMaintDetailProjectService 
+public class DmsBillsMaintDetailProjectServiceImpl implements IDmsBillsMaintDetailProjectService
 {
     @Autowired
     private DmsBillsMaintDetailProjectMapper dmsBillsMaintDetailProjectMapper;
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java
index 53813a3..e3ebc8c 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java
@@ -1,6 +1,5 @@
 package com.aucma.dms.service.impl;
 
-
 import com.aucma.common.constant.DmsConstants;
 import com.aucma.common.exception.ServiceException;
 import com.aucma.common.utils.DateUtils;
@@ -93,7 +92,8 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
         Date lubeTime = dmsPlanMaint.getMaintTime();
         Long timeLimit = dmsPlanMaint.getTimeLimit();
         dmsBillsMaintInstance.setIsFlag(1l);
-        dmsBillsMaintInstance.setWfProcessId(103l);
+        // 已废弃审批流功能
+        // dmsBillsMaintInstance.setWfProcessId(103l);
         dmsBillsMaintInstance.setPlanEndTime(new Date(lubeTime.getTime() + timeLimit * 1000l));
         int i = dmsBillsMaintInstanceMapper.insertDmsBillsMaintInstance(dmsBillsMaintInstance);
         DmsMaintInstanceActivity dmsMaintInstanceActivity = new DmsMaintInstanceActivity();
@@ -168,9 +168,10 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
 
     @Override
     public int insertDmsBillsMaintInstancePDA(DmsBillsMaintInstance dmsBillsMaintInstance) {
-        //Long aLong = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 103l);
+        // 已废弃审批流功能 - 以下代码已注释
+        // Long aLong = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 103l);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH");
-        dmsBillsMaintInstance.setWfProcessId(103l);
+        // dmsBillsMaintInstance.setWfProcessId(103l);
         dmsBillsMaintInstance.setBillsMaintCode(sdf.format(DateUtils.getNowDate()));
         dmsBillsMaintInstance.setMaintStatus(1l);
         dmsBillsMaintInstance.setIsFlag(1l);
@@ -178,7 +179,8 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
         //创建保养工单实例节点第一步
         DmsMaintInstanceActivity dmsMaintInstanceActivity = new DmsMaintInstanceActivity();
         dmsMaintInstanceActivity.setMaintInstanceId(dmsBillsMaintInstance.getMaintInstanceId());
-       // dmsMaintInstanceActivity.setProcessActivityId(aLong);
+        // 已废弃审批流功能
+        // dmsMaintInstanceActivity.setProcessActivityId(aLong);
         dmsMaintInstanceActivity.setMaintGroup(dmsBillsMaintInstance.getMaintGroup());
         dmsMaintInstanceActivity.setMaintLevel(dmsBillsMaintInstance.getMaintLevel());
         dmsMaintInstanceActivity.setMaintSupervisor(dmsBillsMaintInstance.getMaintSupervisor());
@@ -241,11 +243,11 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
             dmsBillsMaintInstance.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_MAINTING);
             dmsBillsMaintInstance.setRealBeginTime(currentDate);
             dmsBillsMaintInstance.setUpdateTime(currentDate);
-            dmsBillsMaintInstance.setUpdateBy(userName);
+            dmsBillsMaintInstance.setUpdateBy(SecurityUtils.getUserId());
             dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(dmsBillsMaintInstance);
 
             dmsBillsMaintDetail.setBeginTime(currentDate);
-            dmsBillsMaintDetail.setUpdateBy(userName);
+            dmsBillsMaintDetail.setUpdateBy(SecurityUtils.getUserId());
             dmsBillsMaintDetail.setUpdateTime(currentDate);
             dmsBillsMaintDetail.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_MAINTING);
 
@@ -253,7 +255,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
 
         }
 //        else {//保养中
-//            dmsBillsMaintDetail.setUpdateBy(userName);
+//            dmsBillsMaintDetail.setUpdateBy(SecurityUtils.getUserId());
 //            dmsBillsMaintDetail.setUpdateTime(currentDate);
 //            dmsBillsMaintDetailMapper.updateDmsBillsMaintDetail(dmsBillsMaintDetail);
 //        }
@@ -291,7 +293,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
 
         Date currentDate = new Date();
         String userName = SecurityUtils.getLoginUser() == null ?
-                SecurityUtils.getUsername() : SecurityUtils.getLoginUser().getUser().getNickName() ;
+                SecurityUtils.getUsername() : SecurityUtils.getLoginUser().getUser().getNickName();
 
         DmsBillsMaintDetail queryMaintDetail = new DmsBillsMaintDetail();
         queryMaintDetail.setMaintInstanceId(maintInstanceId);
@@ -309,7 +311,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
             dmsBillsMaintInstance.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE);
             dmsBillsMaintInstance.setRealEndTime(currentDate);
             dmsBillsMaintInstance.setUpdateTime(currentDate);
-            dmsBillsMaintInstance.setUpdateBy(userName);
+            dmsBillsMaintInstance.setUpdateBy(SecurityUtils.getUserId());
             dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(dmsBillsMaintInstance);
         }
 
@@ -317,12 +319,12 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
         for (DmsBillsMaintDetailProject dmsBillsMaintDetailProject : dmsBillsMaintDetailProjects) {
             dmsBillsMaintDetailProject.setMaintProjectStatus(DmsConstants.DMS_MAINT_PROJECT_STATUS_COMPLETE);
             dmsBillsMaintDetailProject.setCreateTime(currentDate);
-            dmsBillsMaintDetail.setCreateBy(userName);
+            dmsBillsMaintDetail.setCreateBy(SecurityUtils.getUserId());
             dmsBillsMaintDetailProjectMapper.updateDmsBillsMaintDetailProject(dmsBillsMaintDetailProject);
         }
 
         dmsBillsMaintDetail.setEndTime(currentDate);
-        dmsBillsMaintDetail.setUpdateBy(userName);
+        dmsBillsMaintDetail.setUpdateBy(SecurityUtils.getUserId());
         dmsBillsMaintDetail.setUpdateTime(currentDate);
         dmsBillsMaintDetail.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE);
 
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java
index f6d607a..5e5f54f 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java
@@ -1,5 +1,14 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.constant.DmsConstants;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.*;
+//import com.aucma.dms.mapper.DmsBillsFaultInstanceMapper;
+//import com.aucma.dms.mapper.DmsFaultInstanceActivityMapper;
+//import com.aucma.dms.mapper.DmsInstanceFileMapper;
+//import com.aucma.dms.service.IDmsFaultInstanceActivityService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.constant.DmsConstants;
 import com.aucma.common.core.domain.model.LoginUser;
@@ -95,7 +104,7 @@ public class DmsFaultInstanceActivityServiceImpl implements IDmsFaultInstanceAct
     public int insertDmsFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity)
     {
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsFaultInstanceActivity.setCreateBy(user.getUsername());
+        dmsFaultInstanceActivity.setCreateBy(user.getUserId());
         dmsFaultInstanceActivity.setStartTime(DateUtils.getNowDate());
         dmsFaultInstanceActivity.setCreateTime(DateUtils.getNowDate());
         dmsFaultInstanceActivity.setProcessHandleStatus("2");
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectInstanceDetailProjectServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectInstanceDetailProjectServiceImpl.java
index 42c957c..364c73c 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectInstanceDetailProjectServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectInstanceDetailProjectServiceImpl.java
@@ -1,5 +1,10 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.aucma.dms.domain.DmsInspectInstanceDetailProject;
+//import com.aucma.dms.mapper.DmsInspectInstanceDetailProjectMapper;
+//import com.aucma.dms.service.IDmsInspectInstanceDetailProjectService;
+
 import com.aucma.common.utils.DateUtils;
 import com.aucma.dms.domain.DmsInspectInstanceDetailProject;
 import com.aucma.dms.mapper.DmsInspectInstanceDetailProjectMapper;
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectRouteDetailServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectRouteDetailServiceImpl.java
index f6e5004..d94aa74 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectRouteDetailServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectRouteDetailServiceImpl.java
@@ -1,5 +1,9 @@
 package com.aucma.dms.service.impl;
 
+//import com.aucma.dms.domain.DmsInspectRouteDetail;
+//import com.aucma.dms.mapper.DmsInspectRouteDetailMapper;
+//import com.aucma.dms.service.IDmsInspectRouteDetailService;
+
 import com.aucma.dms.domain.DmsInspectRouteDetail;
 import com.aucma.dms.mapper.DmsInspectRouteDetailMapper;
 import com.aucma.dms.service.IDmsInspectRouteDetailService;
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java
index beeb792..1d4bc59 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java
@@ -1,5 +1,13 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsBillsMaintInstance;
+//import com.aucma.dms.domain.DmsMaintInstanceActivity;
+//import com.aucma.dms.mapper.DmsBillsMaintInstanceMapper;
+//import com.aucma.dms.mapper.DmsMaintInstanceActivityMapper;
+//import com.aucma.dms.service.IDmsMaintInstanceActivityService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.utils.DateUtils;
@@ -63,7 +71,7 @@ public class DmsMaintInstanceActivityServiceImpl implements IDmsMaintInstanceAct
     public int insertDmsMaintInstanceActivity(DmsMaintInstanceActivity dmsMaintInstanceActivity)
     {
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsMaintInstanceActivity.setCreateBy(user.getUsername());
+        dmsMaintInstanceActivity.setCreateBy(user.getUserId());
         dmsMaintInstanceActivity.setCreateTime(DateUtils.getNowDate());
         dmsMaintInstanceActivity.setStartTime(DateUtils.getNowDate());
         dmsMaintInstanceActivity.setProcessHandleStatus("2");
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanInspectServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanInspectServiceImpl.java
index 1f3424f..c81cc37 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanInspectServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanInspectServiceImpl.java
@@ -1,5 +1,18 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.constant.SecurityConstants;
+//import com.hw.common.core.domain.R;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.core.utils.uuid.Seq;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsPlanInspect;
+//import com.aucma.dms.mapper.DmsBaseInspectRouteMapper;
+//import com.aucma.dms.mapper.DmsPlanInspectMapper;
+//import com.aucma.dms.service.IDmsPlanInspectService;
+//import com.hw.job.api.RemoteJobService;
+//import com.hw.job.api.domain.SysJob;
+//import com.hw.job.api.util.CronUtils;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.utils.DateUtils;
@@ -152,7 +165,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService
         dmsPlanInspect.setTimeLimit((timeLimitDays * 24 * 60 * 60)
                 + (timeLimitHours * 60 * 60));
         dmsPlanInspect.setIsFlag("1");
-        dmsPlanInspect.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsPlanInspect.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsPlanInspect.setCreateTime(DateUtils.getNowDate());
         //获取设备总数
         //Long aLong = dmsBaseInspectRouteMapper.selectAmountByInspectRouteId(dmsPlanInspect.getInspectRouteId());
@@ -172,7 +185,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService
     public int updateDmsPlanInspect(DmsPlanInspect dmsPlanInspect)
     {
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsPlanInspect.setUpdateBy(user.getUsername());
+        dmsPlanInspect.setUpdateBy(user.getUserId());
         dmsPlanInspect.setUpdateTime(DateUtils.getNowDate());
         return dmsPlanInspectMapper.updateDmsPlanInspect(dmsPlanInspect);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanLubeDetailServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanLubeDetailServiceImpl.java
index 62598dd..b6aeef6 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanLubeDetailServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanLubeDetailServiceImpl.java
@@ -1,5 +1,10 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsPlanLubeDetail;
+//import com.aucma.dms.mapper.DmsPlanLubeDetailMapper;
+//import com.aucma.dms.service.IDmsPlanLubeDetailService;
 
 import com.aucma.common.utils.DateUtils;
 import com.aucma.common.utils.SecurityUtils;
@@ -56,7 +61,7 @@ public class DmsPlanLubeDetailServiceImpl implements IDmsPlanLubeDetailService
     @Override
     public int insertDmsPlanLubeDetail(DmsPlanLubeDetail dmsPlanLubeDetail)
     {
-        dmsPlanLubeDetail.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsPlanLubeDetail.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsPlanLubeDetail.setCreateTime(DateUtils.getNowDate());
         dmsPlanLubeDetail.setIsFlag(1l);
         return dmsPlanLubeDetailMapper.insertDmsPlanLubeDetail(dmsPlanLubeDetail);
@@ -71,7 +76,7 @@ public class DmsPlanLubeDetailServiceImpl implements IDmsPlanLubeDetailService
     @Override
     public int updateDmsPlanLubeDetail(DmsPlanLubeDetail dmsPlanLubeDetail)
     {
-        dmsPlanLubeDetail.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsPlanLubeDetail.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsPlanLubeDetail.setUpdateTime(DateUtils.getNowDate());
         return dmsPlanLubeDetailMapper.updateDmsPlanLubeDetail(dmsPlanLubeDetail);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanLubeServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanLubeServiceImpl.java
index 8dc66ff..fb91e53 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanLubeServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanLubeServiceImpl.java
@@ -1,5 +1,17 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.constant.SecurityConstants;
+//import com.hw.common.core.domain.R;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.core.utils.StringUtils;
+//import com.hw.common.core.utils.uuid.Seq;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsPlanLube;
+//import com.aucma.dms.mapper.DmsPlanLubeMapper;
+//import com.aucma.dms.service.IDmsPlanLubeService;
+//import com.hw.job.api.RemoteJobService;
+//import com.hw.job.api.domain.SysJob;
+//import com.hw.job.api.util.CronUtils;
 
 import com.aucma.common.utils.DateUtils;
 import com.aucma.common.utils.SecurityUtils;
@@ -105,7 +117,7 @@ public class DmsPlanLubeServiceImpl implements IDmsPlanLubeService {
         dmsPlanLube.setTimeLimit((timeLimitDays * 24 * 60 * 60)
                 + (timeLimitHours * 60 * 60));
         dmsPlanLube.setIsFlag("1");
-        dmsPlanLube.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsPlanLube.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsPlanLube.setCreateTime(DateUtils.getNowDate());
         int rows = dmsPlanLubeMapper.insertDmsPlanLube(dmsPlanLube);
 
@@ -153,7 +165,7 @@ public class DmsPlanLubeServiceImpl implements IDmsPlanLubeService {
         Long timeLimitHours = dmsPlanLube.getTimeLimitHours() == null ? 0L : dmsPlanLube.getTimeLimitHours();
         dmsPlanLube.setTimeLimit((timeLimitDays * 24 * 60 * 60)
                 + (timeLimitHours * 60 * 60));
-        dmsPlanLube.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsPlanLube.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsPlanLube.setUpdateTime(DateUtils.getNowDate());
         return dmsPlanLubeMapper.updateDmsPlanLube(dmsPlanLube);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanMaintDetailServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanMaintDetailServiceImpl.java
index c8537f1..e055d79 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanMaintDetailServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanMaintDetailServiceImpl.java
@@ -1,5 +1,11 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.exception.ServiceException;
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsPlanMaintDetail;
+//import com.aucma.dms.mapper.DmsPlanMaintDetailMapper;
+//import com.aucma.dms.service.IDmsPlanMaintDetailService;
 
 import com.aucma.common.exception.ServiceException;
 import com.aucma.common.utils.DateUtils;
@@ -58,7 +64,7 @@ public class DmsPlanMaintDetailServiceImpl implements IDmsPlanMaintDetailService
     public int insertDmsPlanMaintDetail(DmsPlanMaintDetail dmsPlanMaintDetail)
     {
        if (dmsPlanMaintDetail.getDeviceId()==null){throw new ServiceException("设备名称不能为空");}
-       dmsPlanMaintDetail.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+       dmsPlanMaintDetail.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsPlanMaintDetail.setCreateTime(DateUtils.getNowDate());
         dmsPlanMaintDetail.setIsFlag(1l);
         Long stationId = dmsPlanMaintDetailMapper.selectStationIdByCode(dmsPlanMaintDetail.getMaintStationCode());
@@ -77,7 +83,7 @@ public class DmsPlanMaintDetailServiceImpl implements IDmsPlanMaintDetailService
     @Override
     public int updateDmsPlanMaintDetail(DmsPlanMaintDetail dmsPlanMaintDetail)
     {
-        dmsPlanMaintDetail.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsPlanMaintDetail.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsPlanMaintDetail.setUpdateTime(DateUtils.getNowDate());
         Long stationId = dmsPlanMaintDetailMapper.selectStationIdByCode(dmsPlanMaintDetail.getMaintStationCode());
         dmsPlanMaintDetail.setMaintStationId(stationId);
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanMaintServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanMaintServiceImpl.java
index dea8bcd..4b0d256 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanMaintServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanMaintServiceImpl.java
@@ -132,8 +132,11 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService {
         Long timeLimitHours = dmsPlanMaint.getTimeLimitHours() == null?0L:dmsPlanMaint.getTimeLimitHours();
         dmsPlanMaint.setTimeLimit((timeLimitDays * 24 * 60 * 60)
                 + (timeLimitHours * 60 * 60));
-        dmsPlanMaint.setIsFlag(1l);
-        dmsPlanMaint.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        // 设置默认值：IS_FLAG 为 null 时默认为 0
+        if (dmsPlanMaint.getIsFlag() == null) {
+            dmsPlanMaint.setIsFlag(0L);
+        }
+        dmsPlanMaint.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsPlanMaint.setCreateTime(DateUtils.getNowDate());
         int rows = dmsPlanMaintMapper.insertDmsPlanMaint(dmsPlanMaint);
 
@@ -181,7 +184,7 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService {
         Long timeLimitHours = dmsPlanMaint.getTimeLimitHours() == null?0L:dmsPlanMaint.getTimeLimitHours();
         dmsPlanMaint.setTimeLimit((timeLimitDays * 24 * 60 * 60)
                 + (timeLimitHours * 60 * 60));
-        dmsPlanMaint.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsPlanMaint.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsPlanMaint.setUpdateTime(DateUtils.getNowDate());
         return dmsPlanMaintMapper.updateDmsPlanMaint(dmsPlanMaint);
     }
@@ -235,7 +238,7 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService {
             List<DmsPlanMaintDetail> list = new ArrayList<DmsPlanMaintDetail>();
             for (DmsPlanMaintDetail dmsPlanMaintDetail : dmsPlanMaintDetailList) {
                 dmsPlanMaintDetail.setIsFlag(1l);
-                dmsPlanMaintDetail.setCreateBy(loginUser.getUsername());
+                dmsPlanMaintDetail.setCreateBy(loginUser.getUserId());
                 dmsPlanMaintDetail.setPlanMaintId(planMaintId);
                 list.add(dmsPlanMaintDetail);
             }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanRepairDetailServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanRepairDetailServiceImpl.java
index 44e8164..d7fb36e 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanRepairDetailServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanRepairDetailServiceImpl.java
@@ -1,5 +1,10 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.aucma.dms.domain.DmsPlanRepairDetail;
+//import com.aucma.dms.mapper.DmsPlanRepairDetailMapper;
+//import com.aucma.dms.service.IDmsPlanRepairDetailService;
+
 import com.aucma.common.utils.DateUtils;
 import com.aucma.dms.domain.DmsPlanRepairDetail;
 import com.aucma.dms.mapper.DmsPlanRepairDetailMapper;
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanRepairServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanRepairServiceImpl.java
index f2740f4..e6c46f2 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanRepairServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsPlanRepairServiceImpl.java
@@ -107,8 +107,15 @@ public class DmsPlanRepairServiceImpl implements IDmsPlanRepairService
 //        dmsPlanRepair.setRepairTime(nextExecution);
 //        dmsPlanRepair.setJobId(jobIdR.getData().longValue());
 //        dmsPlanRepair.setPlanRepairCode(planRepairCode);
-        dmsPlanRepair.setTimeLimit((dmsPlanRepair.getTimeLimitDays()*24*60*60)
-                +(dmsPlanRepair.getTimeLimitHours()*60*60));
+        // 计算时限：防止空指针异常
+        Long timeLimitDays = dmsPlanRepair.getTimeLimitDays() != null ? dmsPlanRepair.getTimeLimitDays() : 0L;
+        Long timeLimitHours = dmsPlanRepair.getTimeLimitHours() != null ? dmsPlanRepair.getTimeLimitHours() : 0L;
+        dmsPlanRepair.setTimeLimit((timeLimitDays * 24 * 60 * 60) + (timeLimitHours * 60 * 60));
+
+        // 设置默认值：IS_FLAG 为 null 时默认为 0
+        if (dmsPlanRepair.getIsFlag() == null || dmsPlanRepair.getIsFlag().isEmpty()) {
+            dmsPlanRepair.setIsFlag("0");
+        }
 
         dmsPlanRepair.setCreateTime(DateUtils.getNowDate());
         int rows = dmsPlanRepairMapper.insertDmsPlanRepair(dmsPlanRepair);
@@ -126,9 +133,11 @@ public class DmsPlanRepairServiceImpl implements IDmsPlanRepairService
     @Override
     public int updateDmsPlanRepair(DmsPlanRepair dmsPlanRepair)
     {
+        // 计算时限：防止空指针异常
+        Long timeLimitDays = dmsPlanRepair.getTimeLimitDays() != null ? dmsPlanRepair.getTimeLimitDays() : 0L;
+        Long timeLimitHours = dmsPlanRepair.getTimeLimitHours() != null ? dmsPlanRepair.getTimeLimitHours() : 0L;
+        dmsPlanRepair.setTimeLimit((timeLimitDays * 24 * 60 * 60) + (timeLimitHours * 60 * 60));
 
-        dmsPlanRepair.setTimeLimit((dmsPlanRepair.getTimeLimitDays()*24*60*60)
-                +(dmsPlanRepair.getTimeLimitHours()*60*60));
         dmsPlanRepair.setUpdateTime(DateUtils.getNowDate());
         dmsPlanRepairMapper.deleteDmsPlanRepairDetailByPlanRepairId(dmsPlanRepair.getPlanRepairId());
         insertDmsPlanRepairDetail(dmsPlanRepair);
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRealtimeStatusServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRealtimeStatusServiceImpl.java
index 9a3961e..de60393 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRealtimeStatusServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRealtimeStatusServiceImpl.java
@@ -1,5 +1,11 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.aucma.dms.domain.DmsRealtimeStatus;
+//import com.aucma.dms.domain.DmsRealtimeStatusHistory;
+//import com.aucma.dms.mapper.DmsRealtimeStatusMapper;
+//import com.aucma.dms.service.IDmsRealtimeStatusService;
+
 import com.aucma.common.utils.DateUtils;
 import com.aucma.dms.domain.DmsRealtimeStatus;
 import com.aucma.dms.domain.DmsRealtimeStatusHistory;
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordAlarmInfoServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordAlarmInfoServiceImpl.java
index 7565eb7..481adde 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordAlarmInfoServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordAlarmInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.aucma.dms.service.impl;
 
-
 import com.aucma.common.constant.DmsConstants;
 import com.aucma.common.constant.SystemConstants;
 import com.aucma.common.utils.DateUtils;
@@ -109,7 +108,7 @@ public class DmsRecordAlarmInfoServiceImpl implements IDmsRecordAlarmInfoService
         dmsRecordAlarmInfo.setAlarmStatus(DmsConstants.DMS_ALARM_STATUS_ARTIFICIAL_HANDLE);
         dmsRecordAlarmInfo.setHandleUser(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
         dmsRecordAlarmInfo.setHandleTime(DateUtils.getNowDate());
-        dmsRecordAlarmInfo.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsRecordAlarmInfo.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsRecordAlarmInfo.setUpdateTime(DateUtils.getNowDate());
         return dmsRecordAlarmInfoMapper.updateDmsRecordAlarmInfo(dmsRecordAlarmInfo);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordInspectServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordInspectServiceImpl.java
index 66b7fe6..fdbfdc5 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordInspectServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordInspectServiceImpl.java
@@ -1,5 +1,11 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsRecordInspect;
+//import com.aucma.dms.mapper.DmsRecordInspectMapper;
+//import com.aucma.dms.service.IDmsRecordInspectService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.utils.DateUtils;
@@ -59,7 +65,7 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService
     {
         LoginUser user = SecurityUtils.getLoginUser();
         dmsRecordInspect.setIsFlag("1");
-        dmsRecordInspect.setCreateBy(user.getUsername());
+        dmsRecordInspect.setCreateBy(user.getUserId());
         dmsRecordInspect.setCreateTime(DateUtils.getNowDate());
         return dmsRecordInspectMapper.insertDmsRecordInspect(dmsRecordInspect);
     }
@@ -74,7 +80,7 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService
     public int updateDmsRecordInspect(DmsRecordInspect dmsRecordInspect)
     {
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsRecordInspect.setUpdateBy(user.getUsername());
+        dmsRecordInspect.setUpdateBy(user.getUserId());
         dmsRecordInspect.setUpdateTime(DateUtils.getNowDate());
         return dmsRecordInspectMapper.updateDmsRecordInspect(dmsRecordInspect);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordLubeServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordLubeServiceImpl.java
index f1ffcdc..937375b 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordLubeServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordLubeServiceImpl.java
@@ -1,5 +1,11 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsRecordLube;
+//import com.aucma.dms.mapper.DmsRecordLubeMapper;
+//import com.aucma.dms.service.IDmsRecordLubeService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.utils.DateUtils;
@@ -58,7 +64,7 @@ public class DmsRecordLubeServiceImpl implements IDmsRecordLubeService
     public int insertDmsRecordLube(DmsRecordLube dmsRecordLube)
     {
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsRecordLube.setCreateBy(user.getUsername());
+        dmsRecordLube.setCreateBy(user.getUserId());
         dmsRecordLube.setCreateTime(DateUtils.getNowDate());
         dmsRecordLube.setIsFlag("1");
         return dmsRecordLubeMapper.insertDmsRecordLube(dmsRecordLube);
@@ -74,7 +80,7 @@ public class DmsRecordLubeServiceImpl implements IDmsRecordLubeService
     public int updateDmsRecordLube(DmsRecordLube dmsRecordLube)
     {
         LoginUser user = SecurityUtils.getLoginUser();
-        dmsRecordLube.setUpdateBy(user.getUsername());
+        dmsRecordLube.setUpdateBy(user.getUserId());
         dmsRecordLube.setUpdateTime(DateUtils.getNowDate());
         return dmsRecordLubeMapper.updateDmsRecordLube(dmsRecordLube);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java
index 56de9c2..2de945b 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRecordShutDownServiceImpl.java
@@ -1,6 +1,7 @@
 package com.aucma.dms.service.impl;
 
 
+
 import com.aucma.common.utils.DateUtils;
 import com.aucma.common.utils.SecurityUtils;
 import com.aucma.dms.domain.DmsRecordShutDown;
@@ -56,7 +57,7 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService
     @Override
     public int insertDmsRecordShutDown(DmsRecordShutDown dmsRecordShutDown)
     {
-        dmsRecordShutDown.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsRecordShutDown.setCreateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsRecordShutDown.setCreateTime(DateUtils.getNowDate());
         return dmsRecordShutDownMapper.insertDmsRecordShutDown(dmsRecordShutDown);
     }
@@ -70,7 +71,7 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService
     @Override
     public int updateDmsRecordShutDown(DmsRecordShutDown dmsRecordShutDown)
     {
-        dmsRecordShutDown.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUsername() :SecurityUtils.getLoginUser().getUser().getNickName());
+        dmsRecordShutDown.setUpdateBy(SecurityUtils.getLoginUser()==null ? SecurityUtils.getUserId() :SecurityUtils.getLoginUser().getUser().getUserId());
         dmsRecordShutDown.setUpdateTime(DateUtils.getNowDate());
         return dmsRecordShutDownMapper.updateDmsRecordShutDown(dmsRecordShutDown);
     }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRepairInstanceActivityServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRepairInstanceActivityServiceImpl.java
index d261a64..9b7578a 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRepairInstanceActivityServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRepairInstanceActivityServiceImpl.java
@@ -1,5 +1,14 @@
 package com.aucma.dms.service.impl;
 
+//import com.hw.common.core.utils.DateUtils;
+//import com.hw.common.security.utils.SecurityUtils;
+//import com.aucma.dms.domain.DmsRepairInstance;
+//import com.aucma.dms.domain.DmsRepairInstanceActivity;
+//import com.aucma.dms.mapper.DmsPlanRepairMapper;
+//import com.aucma.dms.mapper.DmsRepairInstanceActivityMapper;
+//import com.aucma.dms.mapper.DmsRepairInstanceMapper;
+//import com.aucma.dms.service.IDmsRepairInstanceActivityService;
+//import com.hw.system.api.model.LoginUser;
 
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.utils.DateUtils;
@@ -68,7 +77,7 @@ public class DmsRepairInstanceActivityServiceImpl implements IDmsRepairInstanceA
 
         LoginUser user = SecurityUtils.getLoginUser();
         dmsRepairInstanceActivity.setCreateTime(DateUtils.getNowDate());
-        dmsRepairInstanceActivity.setCreateBy(user.getUsername());
+        dmsRepairInstanceActivity.setCreateBy(user.getUserId());
         dmsRepairInstanceActivity.setStartTime(DateUtils.getNowDate());
         dmsRepairInstanceActivity.setProcessHandleStatus("2");
         //如果是最后一步，则添加一条检修记录（检修记录暂时不用)
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRepairInstanceServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRepairInstanceServiceImpl.java
index 7cb23aa..a953872 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRepairInstanceServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsRepairInstanceServiceImpl.java
@@ -83,9 +83,10 @@ public class DmsRepairInstanceServiceImpl implements IDmsRepairInstanceService
     @Override
     public int insertDmsRepairInstance(DmsRepairInstance dmsRepairInstance)
     {
-/*        WfProcessActivity wfProcessActivity = new WfProcessActivity();
-        wfProcessActivity.setWfProcessId(dmsRepairInstance.getWfProcessId());*/
-        //Long aLong = dmsRepairInstanceMapper.selectWfProcessActivityId(dmsRepairInstance.getWfProcessId());
+        // 已废弃审批流功能 - 以下代码已注释
+        // WfProcessActivity wfProcessActivity = new WfProcessActivity();
+        // wfProcessActivity.setWfProcessId(dmsRepairInstance.getWfProcessId());
+        // Long aLong = dmsRepairInstanceMapper.selectWfProcessActivityId(dmsRepairInstance.getWfProcessId());
 //        System.out.println(aLong);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         Date date = new Date();
@@ -113,17 +114,18 @@ public class DmsRepairInstanceServiceImpl implements IDmsRepairInstanceService
         }
         dmsRepairInstance.setApplyBy(user.getUsername());
         dmsRepairInstance.setApplyTime(DateUtils.getNowDate());
-        dmsRepairInstance.setWfProcessId(101l);
+        // 已废弃审批流功能
+        // dmsRepairInstance.setWfProcessId(101l);
         int flag = dmsRepairInstanceMapper.insertDmsRepairInstance(dmsRepairInstance);
         //创建工单时新建工单实例节点
 
         DmsRepairInstanceActivity dmsRepairInstanceActivity = new DmsRepairInstanceActivity();
         dmsRepairInstanceActivity.setRepairInstanceId(dmsRepairInstance.getRepairInstanceId());
         dmsRepairInstanceActivity.setProcessHandleStatus("1");
-        //先写死第一步所对应的步骤，后续通过wfProcessId来查询步骤对应的id
-       // dmsRepairInstanceActivity.setProcessActivityId(aLong);
+        // 已废弃审批流功能
+        // dmsRepairInstanceActivity.setProcessActivityId(aLong);
         dmsRepairInstanceActivity.setProcessStepOrder(1l);
-        dmsRepairInstanceActivity.setCreateBy(user.getUsername());
+        dmsRepairInstanceActivity.setCreateBy(user.getUserId());
         dmsRepairInstanceActivity.setCreateTime(DateUtils.getNowDate());
         dmsRepairInstanceActivity.setStartTime(DateUtils.getNowDate());
         dmsRepairInstanceActivity.setRepairType(dmsRepairInstance.getRepairType());
@@ -194,9 +196,10 @@ public class DmsRepairInstanceServiceImpl implements IDmsRepairInstanceService
 
     @Override
     public int insertDmsRepairInstancePDA(DmsRepairInstance dmsRepairInstance) {
-//        //Long aLong= remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 101l);
+        // 已废弃审批流功能 - 以下代码已注释
+        // Long aLong= remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 101l);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH");
-        dmsRepairInstance.setWfProcessId(101l);
+        // dmsRepairInstance.setWfProcessId(101l);
         dmsRepairInstance.setBillsRepairCode(sdf.format(DateUtils.getNowDate()));
         dmsRepairInstance.setBillsStatus("0");
         dmsRepairInstance.setInstanceType("1");
@@ -205,7 +208,8 @@ public class DmsRepairInstanceServiceImpl implements IDmsRepairInstanceService
         //创建工单实例节点
         DmsRepairInstanceActivity dmsRepairInstanceActivity = new DmsRepairInstanceActivity();
         dmsRepairInstanceActivity.setRepairInstanceId(dmsRepairInstance.getRepairInstanceId());
-//        dmsRepairInstanceActivity.setProcessActivityId(aLong);
+        // 已废弃审批流功能
+        // dmsRepairInstanceActivity.setProcessActivityId(aLong);
         dmsRepairInstanceActivity.setRepairType(dmsRepairInstance.getRepairType());
         dmsRepairInstanceActivity.setRepairGroup(dmsRepairInstance.getRepairGroup());
         dmsRepairInstanceActivity.setRepairSupervisor(dmsRepairInstance.getRepairSupervisor());
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml
index 0f57f48..800fb3e 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectProjectMapper.xml
@@ -13,8 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="upLimit"    column="up_limit"    />
         <result property="lowLimit"    column="low_limit"    />
         <result property="defValue"    column="def_value"    />
-        <result property="isFlag"    column="is_flag"    />
-        <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -22,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDmsBaseInspectProjectVo">
-        select inspect_project_id, inspect_project_code, inspect_project, inspect_type, record_method, up_limit, low_limit, def_value, is_flag, remark, create_by, create_time, update_by, update_time
+        select inspect_project_id, inspect_project_code, inspect_project, inspect_type, record_method, up_limit, low_limit, def_value, create_by, create_time, update_by, update_time
         from dms_base_inspect_project
     </sql>
 
@@ -36,7 +34,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="upLimit != null "> and up_limit = #{upLimit}</if>
             <if test="lowLimit != null "> and low_limit = #{lowLimit}</if>
             <if test="defValue != null "> and def_value = #{defValue}</if>
-            <if test="isFlag != null  and isFlag != ''"> and is_flag = #{isFlag}</if>
         </where>
     </select>
     
@@ -45,35 +42,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where inspect_project_id = #{inspectProjectId}
     </select>
         
-    <insert id="insertDmsBaseInspectProject" parameterType="DmsBaseInspectProject" useGeneratedKeys="true" keyProperty="inspectProjectId">
+    <insert id="insertDmsBaseInspectProject" parameterType="DmsBaseInspectProject">
+        <selectKey keyProperty="inspectProjectId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_INSPECT_PROJ.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_base_inspect_project
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="inspectProjectCode != null">inspect_project_code,</if>
+            <if test="inspectProjectId != null">inspect_project_id,</if>
+            <if test="inspectProjectCode != null and inspectProjectCode != ''">inspect_project_code,</if>
             <if test="inspectProject != null and inspectProject != ''">inspect_project,</if>
-            <if test="inspectProjectProperty != null and inspectProjectProperty != ''">inspect_project_property,</if>
+            inspect_project_property,
             <if test="inspectType != null and inspectType != ''">inspect_type,</if>
             <if test="recordMethod != null">record_method,</if>
             <if test="upLimit != null">up_limit,</if>
             <if test="lowLimit != null">low_limit,</if>
             <if test="defValue != null">def_value,</if>
-            <if test="isFlag != null and isFlag != ''">is_flag,</if>
-            <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="inspectProjectCode != null">#{inspectProjectCode},</if>
+            <if test="inspectProjectId != null">#{inspectProjectId,jdbcType=NUMERIC},</if>
+            <if test="inspectProjectCode != null and inspectProjectCode != ''">#{inspectProjectCode},</if>
             <if test="inspectProject != null and inspectProject != ''">#{inspectProject},</if>
-            <if test="inspectProjectProperty != null">#{inspectProjectProperty},</if>
+            <choose><when test="inspectProjectProperty != null">#{inspectProjectProperty}</when><otherwise>1</otherwise></choose>,
             <if test="inspectType != null and inspectType != ''">#{inspectType},</if>
             <if test="recordMethod != null">#{recordMethod},</if>
-            <if test="upLimit != null">#{upLimit},</if>
-            <if test="lowLimit != null">#{lowLimit},</if>
-            <if test="defValue != null">#{defValue},</if>
-            <if test="isFlag != null and isFlag != ''">#{isFlag},</if>
-            <if test="remark != null">#{remark},</if>
+            <if test="upLimit != null">#{upLimit,jdbcType=NUMERIC},</if>
+            <if test="lowLimit != null">#{lowLimit,jdbcType=NUMERIC},</if>
+            <if test="defValue != null">#{defValue,jdbcType=NUMERIC},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -91,8 +89,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="upLimit != null">up_limit = #{upLimit},</if>
             <if test="lowLimit != null">low_limit = #{lowLimit},</if>
             <if test="defValue != null">def_value = #{defValue},</if>
-            <if test="isFlag != null and isFlag != ''">is_flag = #{isFlag},</if>
-            <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml
index f868b77..c3b17c5 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectRouteMapper.xml
@@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cyclePeriod"    column="cycle_period"    />
         <result property="deviceTypeId"    column="device_type_id"    />
         <result property="isFlag"    column="is_flag"    />
-        <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -20,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDmsBaseInspectRouteVo">
-        select inspect_route_id, route_code, route_name, inspect_type, cycle_period, device_type_id, is_flag, remark, create_by, create_time, update_by, update_time from dms_base_inspect_route
+        select inspect_route_id, route_code, route_name, inspect_type, cycle_period, device_type_id, is_flag, create_by, create_time, update_by, update_time from dms_base_inspect_route
     </sql>
 
     <select id="selectDmsBaseInspectRouteList" parameterType="DmsBaseInspectRoute" resultMap="DmsBaseInspectRouteResult">
@@ -41,14 +40,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where inspect_route_id = #{inspectRouteId}
     </select>
 
-    <insert id="insertDmsBaseInspectRoute" parameterType="DmsBaseInspectRoute" useGeneratedKeys="true" keyProperty="inspectRouteId">
+    <insert id="insertDmsBaseInspectRoute" parameterType="DmsBaseInspectRoute">
+        <selectKey keyProperty="inspectRouteId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_INSPECT_ROUTE.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_base_inspect_route
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="inspectRouteId != null">inspect_route_id,</if>
             <if test="routeCode != null">route_code,</if>
             <if test="routeName != null and routeName != ''">route_name,</if>
             <if test="inspectType != null and inspectType != ''">inspect_type,</if>
             <if test="cyclePeriod != null">cycle_period,</if>
-            <if test="deviceTypeId != null">device_type_id,</if>
+<!--            <if test="deviceTypeId != null">device_type_id,</if>-->
             <if test="isFlag != null and isFlag != ''">is_flag,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
@@ -57,11 +60,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="inspectRouteId != null">#{inspectRouteId},</if>
             <if test="routeCode != null">#{routeCode},</if>
             <if test="routeName != null and routeName != ''">#{routeName},</if>
             <if test="inspectType != null and inspectType != ''">#{inspectType},</if>
             <if test="cyclePeriod != null">#{cyclePeriod},</if>
-            <if test="deviceTypeId != null">#{deviceTypeId},</if>
+<!--            <if test="deviceTypeId != null">#{deviceTypeId,jdbcType=NUMERIC},</if>-->
             <if test="isFlag != null and isFlag != ''">#{isFlag},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -78,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="routeName != null and routeName != ''">route_name = #{routeName},</if>
             <if test="inspectType != null and inspectType != ''">inspect_type = #{inspectType},</if>
             <if test="cyclePeriod != null">cycle_period = #{cyclePeriod},</if>
-            <if test="deviceTypeId != null">device_type_id = #{deviceTypeId},</if>
+<!--            <if test="deviceTypeId != null">device_type_id = #{deviceTypeId},</if>-->
             <if test="isFlag != null and isFlag != ''">is_flag = #{isFlag},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml
index b77aaec..adfdf45 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseInspectStandardMapper.xml
@@ -20,7 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDmsBaseInspectStandardVo">
-        select inspect_standard_id, standard_code, standard_name, inspect_objective, inspect_project_id, inspect_item_count, is_flag, remark, create_by, create_time, update_by, update_time from dms_base_inspect_standard
+        select inspect_standard_id, standard_code, standard_name, inspect_objective,
+               inspect_project_id, inspect_item_count, is_flag, remark, create_by, create_time, update_by, update_time from dms_base_inspect_standard
     </sql>
 
     <select id="selectDmsBaseInspectStandardList" parameterType="DmsBaseInspectStandard" resultMap="DmsBaseInspectStandardResult">
@@ -40,9 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where inspect_standard_id = #{inspectStandardId}
     </select>
         
-    <insert id="insertDmsBaseInspectStandard" parameterType="DmsBaseInspectStandard" useGeneratedKeys="true" keyProperty="inspectStandardId">
+    <insert id="insertDmsBaseInspectStandard" parameterType="DmsBaseInspectStandard">
+        <selectKey keyProperty="inspectStandardId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_INSPECT_STD.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_base_inspect_standard
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="inspectStandardId != null">inspect_standard_id,</if>
             <if test="standardCode != null">standard_code,</if>
             <if test="standardName != null and standardName != ''">standard_name,</if>
             <if test="inspectObjective != null">inspect_objective,</if>
@@ -56,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="inspectStandardId != null">#{inspectStandardId},</if>
             <if test="standardCode != null">#{standardCode},</if>
             <if test="standardName != null and standardName != ''">#{standardName},</if>
             <if test="inspectObjective != null">#{inspectObjective},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml
index d6929b5..c060731 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStandardMapper.xml
@@ -40,9 +40,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where lube_standard_id = #{lubeStandardId}
     </select>
         
-    <insert id="insertDmsBaseLubeStandard" parameterType="DmsBaseLubeStandard" useGeneratedKeys="true" keyProperty="lubeStandardId">
+    <insert id="insertDmsBaseLubeStandard" parameterType="DmsBaseLubeStandard">
+        <selectKey keyProperty="lubeStandardId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_LUBE_STD.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_base_lube_standard
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="lubeStandardId != null">lube_standard_id,</if>
             <if test="lubeStandardCode != null and lubeStandardCode != ''">lube_standard_code,</if>
             <if test="deviceTypeId != null">device_type_id,</if>
             <if test="lubeProtocol != null and lubeProtocol != ''">lube_protocol,</if>
@@ -55,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="lubeStandardId != null">#{lubeStandardId},</if>
             <if test="lubeStandardCode != null and lubeStandardCode != ''">#{lubeStandardCode},</if>
             <if test="deviceTypeId != null">#{deviceTypeId},</if>
             <if test="lubeProtocol != null and lubeProtocol != ''">#{lubeProtocol},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml
index 4960a30..8d37d7a 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseLubeStationMapper.xml
@@ -38,9 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where lube_station_id = #{lubeStationId}
     </select>
         
-    <insert id="insertDmsBaseLubeStation" parameterType="DmsBaseLubeStation" useGeneratedKeys="true" keyProperty="lubeStationId">
+    <insert id="insertDmsBaseLubeStation" parameterType="DmsBaseLubeStation">
+        <selectKey keyProperty="lubeStationId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_LUBE_STATION.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_base_lube_station
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="lubeStationId != null">lube_station_id,</if>
             <if test="deviceTypeId != null">device_type_id,</if>
             <if test="lubeStationCode != null">lube_station_code,</if>
             <if test="lubeStationName != null and lubeStationName != ''">lube_station_name,</if>
@@ -53,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="lubeStationId != null">#{lubeStationId},</if>
             <if test="deviceTypeId != null">#{deviceTypeId},</if>
             <if test="lubeStationCode != null">#{lubeStationCode},</if>
             <if test="lubeStationName != null and lubeStationName != ''">#{lubeStationName},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml
index 96a1d26..969e169 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintProjectMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="maintProjectId"    column="maint_project_id"    />
         <result property="maintProjectName"    column="maint_project_name"    />
         <result property="maintProjectDesc"    column="maint_project_desc"    />
+        <result property="activeFlag"    column="active_flag"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -19,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select dbmp.maint_project_id,
                dbmp.maint_project_name,
                dbmp.maint_project_desc,
+               dbmp.active_flag,
                dbmp.remark, dbmp.create_by, dbmp.create_time, dbmp.update_by, dbmp.update_time
         from dms_base_maint_project dbmp
     </sql>
@@ -27,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select dbmp.maint_project_id,
                dbmp.maint_project_name,
                dbmp.maint_project_desc,
+               dbmp.active_flag,
                dbmp.remark, dbmp.create_by, dbmp.create_time, dbmp.update_by, dbmp.update_time,
                 dbsp.maint_station_id
         from dms_base_maint_project dbmp
@@ -45,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDmsBaseMaintProjectList" parameterType="DmsBaseMaintProject" resultMap="DmsBaseMaintProjectResult">
         <include refid="selectDmsBaseMaintProjectVo"/>
         <where>  
-            <if test="maintProjectName != null  and maintProjectName != ''"> and dbmp.maint_project_name like concat('%', #{maintProjectName}, '%')</if>
+            <if test="maintProjectName != null  and maintProjectName != ''"> and dbmp.maint_project_name like '%' || #{maintProjectName} || '%'</if>
             <if test="maintProjectDesc != null  and maintProjectDesc != ''"> and dbmp.maint_project_desc = #{maintProjectDesc}</if>
 <!--             <if test="maint_station_id != null"> and dbsp.maint_station_id = #{maintStationId}</if>-->
               <if test="maintProjectId != null"> and dbmp.maint_project_id = #{maintProjectId}</if>
@@ -57,11 +60,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where dbmp.maint_project_id = #{maintProjectId}
     </select>
         
-    <insert id="insertDmsBaseMaintProject" parameterType="DmsBaseMaintProject" useGeneratedKeys="true" keyProperty="maintProjectId">
+    <insert id="insertDmsBaseMaintProject" parameterType="DmsBaseMaintProject">
+        <selectKey keyProperty="maintProjectId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_MAINT_PROJ.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_base_maint_project
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="maintProjectId != null">maint_project_id,</if>
             <if test="maintProjectName != null and maintProjectName != ''">maint_project_name,</if>
             <if test="maintProjectDesc != null">maint_project_desc,</if>
+            <if test="activeFlag != null">active_flag,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -69,8 +77,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="maintProjectId != null">#{maintProjectId},</if>
             <if test="maintProjectName != null and maintProjectName != ''">#{maintProjectName},</if>
             <if test="maintProjectDesc != null">#{maintProjectDesc},</if>
+            <if test="activeFlag != null">#{activeFlag},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -84,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="maintProjectName != null and maintProjectName != ''">maint_project_name = #{maintProjectName},</if>
             <if test="maintProjectDesc != null">maint_project_desc = #{maintProjectDesc},</if>
+            <if test="activeFlag != null">active_flag = #{activeFlag},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml
index 029089e..eee22c1 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStandardMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="maintProtocol"    column="maint_protocol"    />
         <result property="operationDescription"    column="operation_description"    />
         <result property="isFlag"    column="is_flag"    />
+        <result property="activeFlag"    column="active_flag"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -19,20 +20,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDmsBaseMaintStandardVo">
-        select maint_standard_id, maint_standard_code, device_type_id, maint_protocol, operation_description, is_flag, remark, create_by, create_time, update_by, update_time from dms_base_maint_standard
+        select maint_standard_id, maint_standard_code, device_type_id, maint_protocol, operation_description, is_flag, active_flag, remark, create_by, create_time, update_by, update_time from dms_base_maint_standard
     </sql>
 
     <select id="selectDmsBaseMaintStandardList" parameterType="DmsBaseMaintStandard" resultMap="DmsBaseMaintStandardResult">
-        select a.maint_standard_id, a.maint_standard_code, a.device_type_id, a.maint_protocol, a.operation_description, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time
+        select a.maint_standard_id, a.maint_standard_code, a.device_type_id, a.maint_protocol, a.operation_description, a.is_flag, a.active_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time
         from dms_base_maint_standard a
-        left join dms_base_device_type b on a.device_type_id = b.device_type_id        <where>
-            <if test="maintStandardCode != null  and maintStandardCode != ''"> and a.maint_standard_code like concat('%',#{maintStandardCode},'%') </if>
+        <where>
+            <if test="maintStandardCode != null  and maintStandardCode != ''"> and a.maint_standard_code like '%' || #{maintStandardCode} || '%' </if>
             <if test="deviceTypeId != null "> and a.device_type_id = #{deviceTypeId}</if>
-            <if test="maintProtocol != null  and maintProtocol != ''"> and a.maint_protocol like concat('%',#{maintProtocol},'%') </if>
+            <if test="maintProtocol != null  and maintProtocol != ''"> and a.maint_protocol like '%' || #{maintProtocol} || '%' </if>
             <if test="operationDescription != null  and operationDescription != ''"> and a.operation_description = #{operationDescription}</if>
             <if test="isFlag != null "> and a.is_flag = #{isFlag}</if>
-            <if test="TypeName != null "> and b.type_name like concat('%', #{TypeName},'%')</if>
-    </where>
+        </where>
     </select>
 
     <select id="selectDmsBaseMaintStandardByMaintStandardId" parameterType="Long" resultMap="DmsBaseMaintStandardResult">
@@ -40,14 +40,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where maint_standard_id = #{maintStandardId}
     </select>
 
-    <insert id="insertDmsBaseMaintStandard" parameterType="DmsBaseMaintStandard" useGeneratedKeys="true" keyProperty="maintStandardId">
+    <insert id="insertDmsBaseMaintStandard" parameterType="DmsBaseMaintStandard">
+        <selectKey keyProperty="maintStandardId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_MAINT_STD.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_base_maint_standard
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="maintStandardCode != null">maint_standard_code,</if>
+            <if test="maintStandardId != null">maint_standard_id,</if>
+            <if test="maintStandardCode != null and maintStandardCode != ''">maint_standard_code,</if>
             <if test="deviceTypeId != null">device_type_id,</if>
             <if test="maintProtocol != null and maintProtocol != ''">maint_protocol,</if>
             <if test="operationDescription != null">operation_description,</if>
             <if test="isFlag != null">is_flag,</if>
+            <if test="activeFlag != null">active_flag,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -55,11 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="maintStandardCode != null">#{maintStandardCode},</if>
-            <if test="deviceTypeId != null">#{deviceTypeId},</if>
+            <if test="maintStandardId != null">#{maintStandardId,jdbcType=NUMERIC},</if>
+            <if test="maintStandardCode != null and maintStandardCode != ''">#{maintStandardCode},</if>
+            <if test="deviceTypeId != null">#{deviceTypeId,jdbcType=NUMERIC},</if>
             <if test="maintProtocol != null and maintProtocol != ''">#{maintProtocol},</if>
             <if test="operationDescription != null">#{operationDescription},</if>
             <if test="isFlag != null">#{isFlag},</if>
+            <if test="activeFlag != null">#{activeFlag},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -76,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maintProtocol != null and maintProtocol != ''">maint_protocol = #{maintProtocol},</if>
             <if test="operationDescription != null">operation_description = #{operationDescription},</if>
             <if test="isFlag != null">is_flag = #{isFlag},</if>
+            <if test="activeFlag != null">active_flag = #{activeFlag},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml
index 3949d0a..b58f47b 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml
@@ -19,19 +19,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
   <sql id="selectDmsBaseMaintStationVo">
-        select maint_station_id, device_type_id, maint_station_code, protocol_code, is_flag, remark, create_by, create_time, update_by, update_time from dms_base_maint_station
+        select maint_station_id, device_type_id, maint_station_code, protocol_code, remark, create_by, create_time, update_by, update_time from dms_base_maint_station
     </sql>
 
     <select id="selectDmsBaseMaintStationList" parameterType="DmsBaseMaintStation" resultMap="DmsBaseMaintStationResult">
-        select a.maint_station_id, a.device_type_id, a.maint_station_code, a.maint_station_name, a.protocol_code, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time
+        select a.maint_station_id, a.device_type_id, a.maint_station_code, a.maint_station_name, a.protocol_code, a.remark, a.create_by, a.create_time, a.update_by, a.update_time
         from dms_base_maint_station a
-        left join dms_base_device_type b on a.device_type_id = b.device_type_id
         <where>
             <if test="deviceTypeId != null "> and a.device_type_id = #{deviceTypeId}</if>
             <if test="maintStationCode != null  and maintStationCode != ''"> and a.maint_station_code = #{maintStationCode}</if>
             <if test="protocolCode != null  and protocolCode != ''"> and a.protocol_code = #{protocolCode}</if>
             <if test="isFlag != null "> and a.is_flag = #{isFlag}</if>
-            <if test="TypeName != null "> and b.type_name like concat('%', #{TypeName},'%')</if>
         </where>
     </select>
 
@@ -54,9 +52,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             x.maint_instance_id = #{maintInstanceId}
     </select>
 
-    <insert id="insertDmsBaseMaintStation" parameterType="DmsBaseMaintStation" useGeneratedKeys="true" keyProperty="maintStationId">
+    <insert id="insertDmsBaseMaintStation" parameterType="DmsBaseMaintStation">
+        <selectKey keyProperty="maintStationId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_MAINT_STATION.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_base_maint_station
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="maintStationId != null">maint_station_id,</if>
             <if test="deviceTypeId != null">device_type_id,</if>
             <if test="maintStationCode != null">maint_station_code,</if>
             <if test="protocolCode != null">protocol_code,</if>
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="maintStationId != null">#{maintStationId},</if>
             <if test="deviceTypeId != null">#{deviceTypeId},</if>
             <if test="maintStationCode != null">#{maintStationCode},</if>
             <if test="protocolCode != null">#{protocolCode},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml
index 34c470a..cf3e641 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutReasonMapper.xml
@@ -41,9 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where shut_reason_id = #{shutReasonId}
     </select>
 
-    <insert id="insertDmsBaseShutReason" parameterType="DmsBaseShutReason" useGeneratedKeys="true" keyProperty="shutReasonId">
+    <insert id="insertDmsBaseShutReason" parameterType="DmsBaseShutReason">
+        <selectKey keyProperty="shutReasonId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_SHUT_REASON.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_base_shut_reason
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="shutReasonId != null">shut_reason_id,</if>
             <if test="reasonCode != null">reason_code,</if>
             <if test="deviceId != null">device_id,</if>
             <if test="shutTypeId != null">shut_type_id,</if>
@@ -56,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="shutReasonId != null">#{shutReasonId},</if>
             <if test="reasonCode != null">#{reasonCode},</if>
             <if test="deviceId != null">#{deviceId},</if>
             <if test="shutTypeId != null">#{shutTypeId},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml
index 1c4994d..4c744aa 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBaseShutTypeMapper.xml
@@ -34,9 +34,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where shut_type_id = #{shutTypeId}
     </select>
         
-    <insert id="insertDmsBaseShutType" parameterType="DmsBaseShutType" useGeneratedKeys="true" keyProperty="shutTypeId">
+    <insert id="insertDmsBaseShutType" parameterType="DmsBaseShutType">
+        <selectKey keyProperty="shutTypeId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_SHUT_TYPE.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_base_shut_type
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="shutTypeId != null">shut_type_id,</if>
             <if test="typeCode != null">type_code,</if>
             <if test="shutTypeName != null and shutTypeName != ''">shut_type_name,</if>
             <if test="isFlag != null and isFlag != ''">is_flag,</if>
@@ -47,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="shutTypeId != null">#{shutTypeId},</if>
             <if test="typeCode != null">#{typeCode},</if>
             <if test="shutTypeName != null and shutTypeName != ''">#{shutTypeName},</if>
             <if test="isFlag != null and isFlag != ''">#{isFlag},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml
index 6f05e6a..3315539 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml
@@ -22,8 +22,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <!-- 已废弃审批流功能 -->
+        <!-- <result property="wfProcessId"    column="wf_process_id"    /> -->
         <result property="deviceId"    column="device_id"    />
-
+        <result property="approveStatus"    column="approveStatus"    />
         <result property="deviceCode"    column="device_code"    />
         <result property="deviceName"    column="device_name"    />
         <result property="deviceLocation"    column="device_location"    />
@@ -35,8 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="repairType"    column="repair_type"    />
         <result property="outsrcId"    column="outsrc_id"    />
         <result property="processHandleResolution"    column="process_handle_resolution"    />
-        <result property="approveStatus"    column="approveStatus"    />
-
     </resultMap>
 
 
@@ -81,7 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultSourceType != null  and faultSourceType != ''"> and fault_source_type = #{faultSourceType}</if>
             <if test="faultSourceId != null "> and fault_source_id = #{faultSourceId}</if>
             <if test="repairInstanceId != null "> and repair_instance_id = #{repairInstanceId}</if>
-            <if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if> -->
             <if test="billsFaultCode != null  and billsFaultCode != ''"> and bills_fault_code = #{billsFaultCode}</if>
             <if test="billsStatus != null  and billsStatus != ''"> and bills_status = #{billsStatus}</if>
             <if test="applyUser != null  and applyUser != ''"> and apply_user = #{applyUser}</if>
@@ -121,6 +122,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="deviceId != null">device_id,</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">wf_process_id,</if> -->
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="faultSourceType != null">#{faultSourceType},</if>
@@ -140,6 +143,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="deviceId != null">#{deviceId},</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">#{wfProcessId},</if> -->
          </trim>
     </insert>
 
@@ -189,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectDmsBillsFaultInstanceJoinVo">
-        select dbfi.repair_instance_id, dbfi.fault_source_type, dbfi.fault_source_id, dbfi.wf_process_id, dbfi.bills_fault_code, dbfi.bills_status,
+        select dbfi.repair_instance_id, dbfi.fault_source_type, dbfi.fault_source_id, dbfi.bills_fault_code, dbfi.bills_status,
                dbfi.apply_user, dbfi.apply_time, dbfi.real_begin_time, dbfi.real_end_time, dbfi.require_end_time, dbfi.device_id,dbfi.approveStatus,
                dbdl.device_code,dbdl.device_name,dbdl.device_location,dbdl.device_spec
         from dms_bills_fault_instance dbfi left join base_deviceledger dbdl on dbfi.device_id=dbdl.OBJ_ID
@@ -201,7 +206,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultSourceType != null  and faultSourceType != ''"> and fault_source_type = #{faultSourceType}</if>
             <if test="faultSourceId != null "> and fault_source_id = #{faultSourceId}</if>
             <if test="repairInstanceId != null "> and repair_instance_id = #{repairInstanceId}</if>
-            <if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if> -->
             <if test="billsFaultCode != null  and billsFaultCode != ''"> and bills_fault_code = #{billsFaultCode}</if>
             <if test="billsStatus != null  and billsStatus != ''"> and bills_status = #{billsStatus}</if>
             <if test="applyUser != null  and applyUser != ''"> and apply_user = #{applyUser}</if>
@@ -266,7 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             x.fault_description ,
             x.checked_fault ,
-               x.process_handle_resolution,
+               -- dri.wf_process_id, -- 已废弃审批流handle_resolution,
             x.repair_content ,
             x.protected_method ,
             x.repairer ,
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
index 725353f..ca7145d 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
@@ -7,7 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="DmsBillsInspectInstance" id="DmsBillsInspectInstanceResult">
         <result property="inspectInstanceId"    column="inspect_instance_id"    />
         <result property="planInspectId"    column="plan_inspect_id"    />
-        <result property="wfProcessId"    column="wf_process_id"    />
+        <!-- 已废弃审批流功能 -->
+        <!-- <result property="wfProcessId"    column="wf_process_id"    /> -->
         <result property="inspectType"    column="inspect_type"    />
         <result property="billsInspectCode"    column="bills_inspect_code"    />
         <result property="planBeginTime"    column="plan_begin_time"    />
@@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             a.inspect_instance_id,
             a.plan_inspect_id,
-            a.wf_process_id,
+            -- a.wf_process_id, -- 已废弃审批流
             a.inspect_type,
             a.bills_inspect_code,
             a.plan_begin_time,
@@ -54,7 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="planInspectId != null "> and a.plan_inspect_id like concat('%',#{planInspectId},'%') </if>
             <if test="inspectInstanceId != null "> and a.inspect_instance_id = #{inspectInstanceId}</if>
-            <if test="wfProcessId != null "> and a.wf_process_id = #{wfProcessId}</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null "> and a.wf_process_id = #{wfProcessId}</if> -->
             <if test="inspectType != null  and inspectType != ''"> and a.inspect_type = #{inspectType}</if>
             <if test="billsInspectCode != null  and billsInspectCode != ''"> and a.bills_inspect_code = #{billsInspectCode}</if>
             <if test="planBeginTime != null "> and a.plan_begin_time > #{planBeginTime}</if>
@@ -84,7 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into dms_bills_inspect_instance
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="planInspectId != null">plan_inspect_id,</if>
-            <if test="wfProcessId != null">wf_process_id,</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">wf_process_id,</if> -->
             <if test="inspectType != null and inspectType != ''">inspect_type,</if>
             <if test="inspectRouteId != null and inspectRouteId != ''">inspect_route_id,</if>
             <if test="billsInspectCode != null">bills_inspect_code,</if>
@@ -102,7 +105,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="planInspectId != null">#{planInspectId},</if>
-            <if test="wfProcessId != null">#{wfProcessId},</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">#{wfProcessId},</if> -->
             <if test="inspectType != null and inspectType != ''">#{inspectType},</if>
             <if test="inspectRouteId != null and inspectRouteId != ''">#{inspectRouteId},</if>
             <if test="billsInspectCode != null">#{billsInspectCode},</if>
@@ -161,7 +165,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update dms_bills_inspect_instance
         <trim prefix="SET" suffixOverrides=",">
             <if test="planInspectId != null">plan_inspect_id = #{planInspectId},</if>
-            <if test="wfProcessId != null">wf_process_id = #{wfProcessId},</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">wf_process_id = #{wfProcessId},</if> -->
             <if test="inspectType != null and inspectType != ''">inspect_type = #{inspectType},</if>
             <if test="billsInspectCode != null">bills_inspect_code = #{billsInspectCode},</if>
             <if test="planBeginTime != null">plan_begin_time = #{planBeginTime},</if>
@@ -215,14 +220,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         dbii.create_time,
         dbir.route_name,a.plan_inspect_code,
         a.remark inspectDesc
-        from
-        dms_bills_inspect_instance dbii
+        from dms_bills_inspect_instance dbii
         left join dms_base_inspect_route dbir on
         dbii.inspect_route_id = dbir.inspect_route_id left join dms_plan_inspect a on dbii.plan_inspect_id = a.plan_inspect_id
 
         <where>
             <if test="inspectRouteId != null "> and dbii.inspect_route_id = #{inspectRouteId}</if>
-            <if test="wfProcessId != null "> and dbii.wf_process_id = #{wfProcessId}</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null "> and dbii.wf_process_id = #{wfProcessId}</if> -->
             <if test="inspectType != null  and inspectType != ''"> and dbii.inspect_type = #{inspectType}</if>
             <if test="billsInspectCode != null  and billsInspectCode != ''"> and dbii.bills_inspect_code = #{billsInspectCode}</if>
             <if test="inspectStatus != null  and inspectStatus != ''"> and dbii.inspect_status = #{inspectStatus}</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml
index 26ad39d..303f9f4 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml
@@ -53,9 +53,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where bills_maint_detail_id = #{billsMaintDetailId}
     </select>
 
-    <insert id="insertDmsBillsMaintDetail" parameterType="DmsBillsMaintDetail" useGeneratedKeys="true" keyProperty="billsMaintDetailId">
+    <insert id="insertDmsBillsMaintDetail" parameterType="DmsBillsMaintDetail">
+        <selectKey keyProperty="billsMaintDetailId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_MAINT_DETAIL.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_bills_maint_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="billsMaintDetailId != null">bills_maint_detail_id,</if>
             <if test="maintInstanceId != null">maint_instance_id,</if>
             <if test="deviceId != null">device_id,</if>
             <if test="stationId != null">station_id,</if>
@@ -72,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTime != null">end_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="billsMaintDetailId != null">#{billsMaintDetailId},</if>
             <if test="maintInstanceId != null">#{maintInstanceId},</if>
             <if test="deviceId != null">#{deviceId},</if>
             <if test="stationId != null">#{stationId},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailProjectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailProjectMapper.xml
index d431b6e..b677cf3 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailProjectMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailProjectMapper.xml
@@ -38,9 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where maint_detail_project_id = #{maintDetailProjectId}
     </select>
         
-    <insert id="insertDmsBillsMaintDetailProject" parameterType="DmsBillsMaintDetailProject" useGeneratedKeys="true" keyProperty="maintDetailProjectId">
+    <insert id="insertDmsBillsMaintDetailProject" parameterType="DmsBillsMaintDetailProject">
+        <selectKey keyProperty="maintDetailProjectId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_MAINT_DTL_PROJ.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_bills_maint_detail_project
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="maintDetailProjectId != null">maint_detail_project_id,</if>
             <if test="billsMaintDetailId != null">bills_maint_detail_id,</if>
             <if test="maintProjectId != null">maint_project_id,</if>
             <if test="maintProjectName != null and maintProjectName != ''">maint_project_name,</if>
@@ -53,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="maintDetailProjectId != null">#{maintDetailProjectId},</if>
             <if test="billsMaintDetailId != null">#{billsMaintDetailId},</if>
             <if test="maintProjectId != null">#{maintProjectId},</if>
             <if test="maintProjectName != null and maintProjectName != ''">#{maintProjectName},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml
index 8f67167..fb6b166 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml
@@ -7,7 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="DmsBillsMaintInstance" id="DmsBillsMaintInstanceResult">
         <result property="maintInstanceId"    column="maint_instance_id"    />
         <result property="planMaintId"    column="plan_maint_id"    />
-        <result property="wfProcessId"    column="wf_process_id"    />
+        <!-- 已废弃审批流功能 -->
+        <!-- <result property="wfProcessId"    column="wf_process_id"    /> -->
         <result property="billsMaintCode"    column="bills_maint_code"    />
         <result property="planBeginTime"    column="plan_begin_time"    />
         <result property="realBeginTime"    column="real_begin_time"    />
@@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             a.maint_instance_id,
             a.plan_maint_id,
-            a.wf_process_id,
+            -- a.wf_process_id, -- 已废弃审批流
             a.bills_maint_code,
             a.plan_begin_time,
             a.real_begin_time,
@@ -56,7 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="planMaintId != null "> and a.plan_maint_id = #{planMaintId}</if>
             <if test="maintInstanceId != null "> and a.maint_instance_id = #{maintInstanceId}</if>
-            <if test="wfProcessId != null "> and a.wf_process_id = #{wfProcessId}</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null "> and a.wf_process_id = #{wfProcessId}</if> -->
             <if test="billsMaintCode != null  and billsMaintCode != ''"> and a.bills_maint_code like concat('%',#{billsMaintCode},'%') </if>
             <if test="planBeginTime != null "> and a.plan_begin_time > #{planBeginTime}</if>
             <if test="planEndTime != null "> and   #{planEndTime}>a.plan_end_time</if>
@@ -74,11 +76,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where maint_instance_id = #{maintInstanceId}
     </select>
 
-    <insert id="insertDmsBillsMaintInstance" parameterType="DmsBillsMaintInstance" useGeneratedKeys="true" keyProperty="maintInstanceId">
+    <insert id="insertDmsBillsMaintInstance" parameterType="DmsBillsMaintInstance">
+        <selectKey keyProperty="maintInstanceId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_MAINT_INST.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_bills_maint_instance
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="maintInstanceId != null">maint_instance_id,</if>
             <if test="planMaintId != null">plan_maint_id,</if>
-            <if test="wfProcessId != null">wf_process_id,</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">wf_process_id,</if> -->
             <if test="billsMaintCode != null and billsMaintCode != ''">bills_maint_code,</if>
             <if test="planBeginTime != null">plan_begin_time,</if>
             <if test="realBeginTime != null">real_begin_time,</if>
@@ -94,8 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="maintInstanceId != null">#{maintInstanceId},</if>
             <if test="planMaintId != null">#{planMaintId},</if>
-            <if test="wfProcessId != null">#{wfProcessId},</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">#{wfProcessId},</if> -->
             <if test="billsMaintCode != null and billsMaintCode != ''">#{billsMaintCode},</if>
             <if test="planBeginTime != null">#{planBeginTime},</if>
             <if test="realBeginTime != null">#{realBeginTime},</if>
@@ -116,7 +125,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update dms_bills_maint_instance
         <trim prefix="SET" suffixOverrides=",">
             <if test="planMaintId != null">plan_maint_id = #{planMaintId},</if>
-            <if test="wfProcessId != null">wf_process_id = #{wfProcessId},</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">wf_process_id = #{wfProcessId},</if> -->
             <if test="billsMaintCode != null and billsMaintCode != ''">bills_maint_code = #{billsMaintCode},</if>
             <if test="planBeginTime != null">plan_begin_time = #{planBeginTime},</if>
             <if test="realBeginTime != null">real_begin_time = #{realBeginTime},</if>
@@ -168,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
         dbmi.maint_instance_id,
         dbmi.plan_maint_id,
-        dbmi.wf_process_id,
+        -- dbmi.wf_process_id, -- 已废弃审批流
         dbmi.bills_maint_code,
         dbmi.plan_begin_time,
         dbmi.real_begin_time,
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml
index 44e20c6..510d666 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml
@@ -36,9 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where route_detail_id = #{routeDetailId}
     </select>
 
-    <insert id="insertDmsInspectRouteDetail" parameterType="DmsInspectRouteDetail" useGeneratedKeys="true" keyProperty="routeDetailId">
+    <insert id="insertDmsInspectRouteDetail" parameterType="DmsInspectRouteDetail">
+        <selectKey keyProperty="routeDetailId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_INSPECT_RTE_DTL.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_inspect_route_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="routeDetailId != null">route_detail_id,</if>
             <if test="inspectRouteId != null">inspect_route_id,</if>
             <if test="lineStep != null">line_step,</if>
             <if test="deviceId != null">device_id,</if>
@@ -47,9 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="inspectRouteId != null">#{inspectRouteId},</if>
-            <if test="lineStep != null">#{lineStep},</if>
-            <if test="deviceId != null">#{deviceId},</if>
+            <if test="routeDetailId != null">#{routeDetailId,jdbcType=NUMERIC},</if>
+            <if test="inspectRouteId != null">#{inspectRouteId,jdbcType=NUMERIC},</if>
+            <if test="lineStep != null">#{lineStep,jdbcType=NUMERIC},</if>
+            <if test="deviceId != null">#{deviceId,jdbcType=NUMERIC},</if>
             <if test="inspectStandard != null">#{inspectStandard},</if>
             <if test="isFlag != null and isFlag != ''">#{isFlag},</if>
             <if test="remark != null">#{remark},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml
index 078d56e..00b8578 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml
@@ -53,9 +53,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where plan_inspect_id = #{planInspectId}
     </select>
 
-    <insert id="insertDmsPlanInspect" parameterType="DmsPlanInspect" useGeneratedKeys="true" keyProperty="planInspectId">
+    <insert id="insertDmsPlanInspect" parameterType="DmsPlanInspect">
+        <selectKey keyProperty="planInspectId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_PLAN_INSPECT.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_plan_inspect
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="planInspectId != null">plan_inspect_id,</if>
             <if test="planInspectCode != null">plan_inspect_code,</if>
             <if test="planInspectName != null">plan_inspect_name,</if>
             <if test="inspectType != null">inspect_type,</if>
@@ -74,14 +78,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="planInspectId != null">#{planInspectId,jdbcType=NUMERIC},</if>
             <if test="planInspectCode != null">#{planInspectCode},</if>
             <if test="planInspectName != null">#{planInspectName},</if>
             <if test="inspectType != null">#{inspectType},</if>
-            <if test="inspectRouteId != null">#{inspectRouteId},</if>
-            <if test="deviceAmount != null">#{deviceAmount},</if>
+            <if test="inspectRouteId != null">#{inspectRouteId,jdbcType=NUMERIC},</if>
+            <if test="deviceAmount != null">#{deviceAmount,jdbcType=NUMERIC},</if>
             <if test="planTime != null">#{planTime},</if>
-            <if test="timeLimit != null">#{timeLimit},</if>
-            <if test="jobId != null">#{jobId},</if>
+            <if test="timeLimit != null">#{timeLimit,jdbcType=NUMERIC},</if>
+            <if test="jobId != null">#{jobId,jdbcType=NUMERIC},</if>
             <if test="cyclePeriod != null">#{cyclePeriod},</if>
             <if test="performer != null">#{performer},</if>
             <if test="isFlag != null and isFlag != ''">#{isFlag},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml
index df022b4..030d66b 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maintLevel != null "> and maint_level = #{maintLevel}</if>
             <if test="maintGroup != null  and maintGroup != ''"> and maint_group = #{maintGroup}</if>
             <if test="maintSupervisor != null  and maintSupervisor != ''"> and maint_supervisor = #{maintSupervisor}</if>
-            <if test="params.beginTime != null and params.endTime != null">and maint_time between #{params.beginTime} and #{params.endTime}</if>
+            <if test="params != null and params.beginTime != null and params.endTime != null">and maint_time between #{params.beginTime} and #{params.endTime}</if>
             <if test="cyclePeriod != null "> and cycle_period = #{cyclePeriod}</if>
             <if test="maintStatus != null "> and maint_status = #{maintStatus}</if>
             <if test="createMethod != null "> and create_method = #{createMethod}</if>
@@ -74,9 +74,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.plan_maint_id = #{planMaintId}
     </select>
 
-    <insert id="insertDmsPlanMaint" parameterType="DmsPlanMaint" useGeneratedKeys="true" keyProperty="planMaintId">
+    <insert id="insertDmsPlanMaint" parameterType="DmsPlanMaint">
+        <selectKey keyProperty="planMaintId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_PLAN_MAINT.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_plan_maint
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="planMaintId != null">plan_maint_id,</if>
             <if test="planMaintCode != null and planMaintCode != ''">plan_maint_code,</if>
             <if test="maintLevel != null">maint_level,</if>
             <if test="maintGroup != null">maint_group,</if>
@@ -95,16 +99,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="planMaintId != null">#{planMaintId,jdbcType=NUMERIC},</if>
             <if test="planMaintCode != null and planMaintCode != ''">#{planMaintCode},</if>
-            <if test="maintLevel != null">#{maintLevel},</if>
+            <if test="maintLevel != null">#{maintLevel,jdbcType=NUMERIC},</if>
             <if test="maintGroup != null">#{maintGroup},</if>
             <if test="maintSupervisor != null">#{maintSupervisor},</if>
             <if test="maintTime != null">#{maintTime},</if>
-            <if test="timeLimit != null">#{timeLimit},</if>
-            <if test="jobId != null">#{jobId},</if>
-            <if test="cyclePeriod != null">#{cyclePeriod},</if>
-            <if test="maintStatus != null">#{maintStatus},</if>
-            <if test="createMethod != null">#{createMethod},</if>
+            <if test="timeLimit != null">#{timeLimit,jdbcType=NUMERIC},</if>
+            <if test="jobId != null">#{jobId,jdbcType=NUMERIC},</if>
+            <if test="cyclePeriod != null">#{cyclePeriod,jdbcType=NUMERIC},</if>
+            <if test="maintStatus != null">#{maintStatus,jdbcType=NUMERIC},</if>
+            <if test="createMethod != null">#{createMethod,jdbcType=NUMERIC},</if>
             <if test="isFlag != null">#{isFlag},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsPlanRepairMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsPlanRepairMapper.xml
index d338fc2..892f678 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsPlanRepairMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsPlanRepairMapper.xml
@@ -69,9 +69,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.plan_repair_id = #{planRepairId}
     </select>
 
-    <insert id="insertDmsPlanRepair" parameterType="DmsPlanRepair" useGeneratedKeys="true" keyProperty="planRepairId">
+    <insert id="insertDmsPlanRepair" parameterType="DmsPlanRepair">
+        <selectKey keyProperty="planRepairId" resultType="long" order="BEFORE">
+            SELECT SEQ_DMS_PLAN_REPAIR.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_plan_repair
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="planRepairId != null">plan_repair_id,</if>
             <if test="planRepairCode != null and planRepairCode != ''">plan_repair_code,</if>
             <if test="repairType != null">repair_type,</if>
             <if test="repairGroup != null">repair_group,</if>
@@ -88,14 +92,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="planRepairId != null">#{planRepairId,jdbcType=NUMERIC},</if>
             <if test="planRepairCode != null and planRepairCode != ''">#{planRepairCode},</if>
             <if test="repairType != null">#{repairType},</if>
             <if test="repairGroup != null">#{repairGroup},</if>
             <if test="repairSupervisor != null">#{repairSupervisor},</if>
             <if test="repairTime != null">#{repairTime},</if>
-            <if test="timeLimit != null">#{timeLimit},</if>
+            <if test="timeLimit != null">#{timeLimit,jdbcType=NUMERIC},</if>
             <if test="repairEndTime != null">#{repairEndTime},</if>
-            <if test="cyclePeriod != null">#{cyclePeriod},</if>
+            <if test="cyclePeriod != null">#{cyclePeriod,jdbcType=NUMERIC},</if>
             <if test="createMethod != null">#{createMethod},</if>
             <if test="isFlag != null and isFlag != ''">#{isFlag},</if>
             <if test="remark != null">#{remark},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRecordAlarmInfoMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRecordAlarmInfoMapper.xml
index 9d7d733..a0eadef 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsRecordAlarmInfoMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsRecordAlarmInfoMapper.xml
@@ -24,10 +24,11 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
-        <result property="alarmLevel" column="alarm_level"/>
-        <result property="noticeType" column="notice_type"/>
-        <result property="recoverType" column="recover_type"/>
-        <result property="alarmType" column="alarm_type"/>
+        <!-- 以下字段来自不存在的dms_base_alarm_rule表，已注释 -->
+        <!-- <result property="alarmLevel" column="alarm_level"/> -->
+        <!-- <result property="noticeType" column="notice_type"/> -->
+        <!-- <result property="recoverType" column="recover_type"/> -->
+        <!-- <result property="alarmType" column="alarm_type"/> -->
         <result property="deviceCode" column="device_code"/>
         <result property="deviceName" column="device_name"/>
     </resultMap>
@@ -38,11 +39,6 @@
                dbdl.device_code,
                dbdl.device_name,
                drai.alarm_rule_id,
-               dbar.alarm_type,
-               dbar.alarm_level,
-               dbar.notice_type,
-               dbar.recover_type,
-               dbar.alarm_status_word,
                drai.alarm_begin_time,
                drai.alarm_end_time,
                drai.continue_time,
@@ -61,7 +57,6 @@
                drai.update_time
         from dms_record_alarm_info drai
                  left join base_deviceledger dbdl on drai.device_id = dbdl.OBJ_ID
-                 left join dms_base_alarm_rule dbar on drai.alarm_rule_id = dbar.alarm_rule_id
     </sql>
 
     <select id="selectDmsRecordAlarmInfoList" parameterType="DmsRecordAlarmInfo" resultMap="DmsRecordAlarmInfoResult">
@@ -69,8 +64,6 @@
         <where>
             <if test="alarmId != null ">and drai.alarm_id = #{alarmId}</if>
             <if test="deviceId != null ">and drai.device_id = #{deviceId}</if>
-            <if test="alarmType != null  and alarmType != ''">and dbar.alarm_type = #{alarmType}</if>
-            <if test="alarmLevel != null  and alarmLevel != ''">and dbar.alarm_level = #{alarmLevel}</if>
             <if test="alarmRuleId != null ">and drai.alarm_rule_id = #{alarmRuleId}</if>
             <if test="params.beginAlarmBeginTime != null and params.beginAlarmBeginTime != '' and params.endAlarmBeginTime != null and params.endAlarmBeginTime != ''">
                 and drai.alarm_begin_time between #{params.beginAlarmBeginTime} and #{params.endAlarmBeginTime}
@@ -85,7 +78,6 @@
             <if test="handleSuggest != null  and handleSuggest != ''">and drai.handle_suggest = #{handleSuggest}</if>
             <if test="noticeStatus != null  and noticeStatus != ''">and drai.notice_status = #{noticeStatus}</if>
             <if test="handleUser != null  and handleUser != ''">and drai.handle_user = #{handleUser}</if>
-            <if test="noticeType != null  and noticeType != ''">and dbar.notice_type like concat( '%',#{noticeType} ,'%')</if>
             <if test="params.beginHandleTime != null and params.beginHandleTime != '' and params.endHandleTime != null and params.endHandleTime != ''">
                 and drai.handle_time between #{params.beginHandleTime} and #{params.endHandleTime}
             </if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml
index adbefd7..a1be875 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml
@@ -79,9 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="billsInspectCode != null">#{billsInspectCode},</if>
-            <if test="planInspectId != null">#{planInspectId},</if>
+            <if test="planInspectId != null">#{planInspectId,jdbcType=NUMERIC},</if>
             <if test="inspectType != null and inspectType != ''">#{inspectType},</if>
-            <if test="inspectRouteId != null">#{inspectRouteId},</if>
+            <if test="inspectRouteId != null">#{inspectRouteId,jdbcType=NUMERIC},</if>
             <if test="deviceAmount != null">#{deviceAmount},</if>
             <if test="planBeginTime != null">#{planBeginTime},</if>
             <if test="planEndTime != null">#{planEndTime},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRepairInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRepairInstanceMapper.xml
index bf9d185..19001eb 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsRepairInstanceMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsRepairInstanceMapper.xml
@@ -7,7 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="DmsRepairInstance" id="DmsRepairInstanceResult">
         <result property="repairInstanceId"    column="repair_instance_id"    />
         <result property="planRepairId"    column="plan_repair_id"    />
-        <result property="wfProcessId"    column="wf_process_id"    />
+        <!-- 已废弃审批流功能 -->
+        <!-- <result property="wfProcessId"    column="wf_process_id"    /> -->
         <result property="billsRepairCode"    column="bills_repair_code"    />
         <result property="billsStatus"    column="bills_status"    />
         <result property="planBeginTime"    column="plan_begin_time"    />
@@ -26,7 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectDmsRepairInstanceVo">
-        select repair_instance_id, plan_repair_id, wf_process_id, bills_repair_code, bills_status, plan_begin_time, real_begin_time, plan_end_time, real_end_time, repair_comp_rate, instance_type, is_flag, remark, apply_by, apply_time, update_by, update_time from dms_repair_instance
+        select repair_instance_id, plan_repair_id, bills_repair_code, bills_status, plan_begin_time, real_begin_time, plan_end_time,
+               real_end_time, repair_comp_rate, instance_type, is_flag, remark, apply_by, apply_time, update_by, update_time
+        from dms_repair_instance
     </sql>
 
     <select id="selectDmsRepairInstanceList" parameterType="DmsRepairInstance" resultMap="DmsRepairInstanceResult">
@@ -34,7 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="repairInstanceId!=null">and repair_instance_id = #{repairInstanceId}</if>
             <if test="planRepairId != null "> and plan_repair_id = #{planRepairId}</if>
-            <if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if> -->
             <if test="billsRepairCode != null  and billsRepairCode != ''"> and bills_repair_code = #{billsRepairCode}</if>
             <if test="billsStatus != null  and billsStatus != ''"> and bills_status = #{billsStatus}</if>
             <if test="planBeginTime != null "> and plan_begin_time = #{planBeginTime}</if>
@@ -58,7 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into dms_repair_instance
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="planRepairId != null">plan_repair_id,</if>
-            <if test="wfProcessId != null">wf_process_id,</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">wf_process_id,</if> -->
             <if test="billsRepairCode != null and billsRepairCode != ''">bills_repair_code,</if>
             <if test="billsStatus != null and billsStatus != ''">bills_status,</if>
             <if test="planBeginTime != null">plan_begin_time,</if>
@@ -76,7 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="planRepairId != null">#{planRepairId},</if>
-            <if test="wfProcessId != null">#{wfProcessId},</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">#{wfProcessId},</if> -->
             <if test="billsRepairCode != null and billsRepairCode != ''">#{billsRepairCode},</if>
             <if test="billsStatus != null and billsStatus != ''">#{billsStatus},</if>
             <if test="planBeginTime != null">#{planBeginTime},</if>
@@ -98,7 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update dms_repair_instance
         <trim prefix="SET" suffixOverrides=",">
             <if test="planRepairId != null">plan_repair_id = #{planRepairId},</if>
-            <if test="wfProcessId != null">wf_process_id = #{wfProcessId},</if>
+            <!-- 已废弃审批流 -->
+            <!-- <if test="wfProcessId != null">wf_process_id = #{wfProcessId},</if> -->
             <if test="billsRepairCode != null and billsRepairCode != ''">bills_repair_code = #{billsRepairCode},</if>
             <if test="billsStatus != null and billsStatus != ''">bills_status = #{billsStatus},</if>
             <if test="planBeginTime != null">plan_begin_time = #{planBeginTime},</if>