diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorWorkUnitController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorWorkUnitController.java
index dadde3e..53bbbe2 100644
--- a/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorWorkUnitController.java
+++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseMonitorWorkUnitController.java
@@ -39,12 +39,6 @@ public class BaseMonitorWorkUnitController extends BaseController {
     @Autowired
     private IBaseMonitorWorkUnitService baseMonitorWorkUnitService;
 
-    @Autowired
-    private IBaseMonitorInfoService baseMonitorInfoService;
-
-    @Autowired
-    private IBaseWorkUnitService baseWorkUnitService;
-
     /**
      * 查询统计计量信息列表
      */
@@ -84,12 +78,7 @@ public class BaseMonitorWorkUnitController extends BaseController {
     @Log(title = "统计计量信息" , businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BaseMonitorWorkUnit baseMonitorWorkUnit) {
-        BaseMonitorInfo baseMonitorInfo = baseMonitorInfoService.selectBaseMonitorInfoByObjId(Long.valueOf(baseMonitorWorkUnit.getMonitorCode()));
-        baseMonitorWorkUnit.setMonitorCode(baseMonitorInfo.getMonitorCode());
-        BaseWorkUnit baseWorkUnit = baseWorkUnitService.selectBaseWorkUnitByObjId(Long.valueOf(baseMonitorWorkUnit.getWorkUnitCode()));
-        baseMonitorWorkUnit.setWorkUnitCode(baseWorkUnit.getWorkUnitCode());
         baseMonitorWorkUnit.setCreatedBy(getUsername());
-        baseMonitorWorkUnit.setCreatedTime(DateUtils.getNowDate());
         return toAjax(baseMonitorWorkUnitService.insertBaseMonitorWorkUnit(baseMonitorWorkUnit));
     }
 
@@ -100,12 +89,7 @@ public class BaseMonitorWorkUnitController extends BaseController {
     @Log(title = "统计计量信息" , businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BaseMonitorWorkUnit baseMonitorWorkUnit) {
-        BaseMonitorInfo baseMonitorInfo = baseMonitorInfoService.selectBaseMonitorInfoByObjId(Long.valueOf(baseMonitorWorkUnit.getMonitorCode()));
-        baseMonitorWorkUnit.setMonitorCode(baseMonitorInfo.getMonitorCode());
-        BaseWorkUnit baseWorkUnit = baseWorkUnitService.selectBaseWorkUnitByObjId(Long.valueOf(baseMonitorWorkUnit.getWorkUnitCode()));
-        baseMonitorWorkUnit.setWorkUnitCode(baseWorkUnit.getWorkUnitCode());
         baseMonitorWorkUnit.setUpdatedBy(getUsername());
-        baseMonitorWorkUnit.setUpdatedTime(DateUtils.getNowDate());
         return toAjax(baseMonitorWorkUnitService.updateBaseMonitorWorkUnit(baseMonitorWorkUnit));
     }
 
diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java
index 1ff77b9..e994e0c 100644
--- a/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java
+++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java
@@ -66,6 +66,7 @@ public class BaseQualityInspectionItemController extends BaseController {
     public AjaxResult getInfo(@PathVariable("objId" ) Long objId) {
         return success(baseQualityInspectionItemService.selectBaseQualityInspectionItemByObjId(objId));
     }
+
     /**
      * 查询所有父级以及名称
      * */
diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseWorkUnitController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseWorkUnitController.java
index 818fde0..55c60ed 100644
--- a/aucma-base/src/main/java/com/aucma/base/controller/BaseWorkUnitController.java
+++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseWorkUnitController.java
@@ -33,7 +33,7 @@ import com.aucma.common.utils.poi.ExcelUtil;
  * @date 2023-10-12
  */
 @RestController
-@RequestMapping("/base/workUnit" )
+@RequestMapping("/base/workUnit")
 public class BaseWorkUnitController extends BaseController {
     @Autowired
     private IBaseWorkUnitService baseWorkUnitService;
@@ -43,23 +43,16 @@ public class BaseWorkUnitController extends BaseController {
     /**
      * 查询统计单元信息列表
      */
-    @PreAuthorize("@ss.hasPermi('base:workUnit:list')" )
-    @GetMapping("/list" )
-        public AjaxResult list(BaseWorkUnit baseWorkUnit) {
-            List<BaseWorkUnit> list = baseWorkUnitService.selectBaseWorkUnitList(baseWorkUnit);
-        BaseProductLine baseProductLine = new BaseProductLine();
-            for (int i=0;i<list.size();i++){
-                if (list.get(i).getProductLineCode()!=null){
-                    baseProductLine.setProductLineCode(list.get(i).getProductLineCode());
-                    list.get(i).setProductLineName(baseProductLineService.selectBaseProductLineList(baseProductLine).get(0).getProductLineName());
-                }
+    @PreAuthorize("@ss.hasPermi('base:workUnit:list')")
+    @GetMapping("/list")
+    public AjaxResult list(BaseWorkUnit baseWorkUnit) {
+        List<BaseWorkUnit> list = baseWorkUnitService.selectBaseWorkUnitList(baseWorkUnit);
+        return success(list);
+    }
 
-            }
-            return success(list);
-        }
     /**
      * 查询计量设备信息下拉树结构
-     * */
+     */
     @PostMapping("/workUnitTree")
     public AjaxResult getMonitorInfoTree(BaseWorkUnit baseWorkUnit) {
         List<TreeSelects> list = baseWorkUnitService.selectBaseWorkUnitTreeList(baseWorkUnit);
@@ -69,29 +62,29 @@ public class BaseWorkUnitController extends BaseController {
     /**
      * 导出统计单元信息列表
      */
-    @PreAuthorize("@ss.hasPermi('base:workUnit:export')" )
-    @Log(title = "统计单元信息" , businessType = BusinessType.EXPORT)
-    @PostMapping("/export" )
+    @PreAuthorize("@ss.hasPermi('base:workUnit:export')")
+    @Log(title = "统计单元信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
     public void export(HttpServletResponse response, BaseWorkUnit baseWorkUnit) {
         List<BaseWorkUnit> list = baseWorkUnitService.selectBaseWorkUnitList(baseWorkUnit);
-        ExcelUtil<BaseWorkUnit> util = new ExcelUtil<BaseWorkUnit>(BaseWorkUnit. class);
-        util.exportExcel(response, list, "统计单元信息数据" );
+        ExcelUtil<BaseWorkUnit> util = new ExcelUtil<BaseWorkUnit>(BaseWorkUnit.class);
+        util.exportExcel(response, list, "统计单元信息数据");
     }
 
     /**
      * 获取统计单元信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('base:workUnit:query')" )
-    @GetMapping(value = "/{objId}" )
-    public AjaxResult getInfo(@PathVariable("objId" ) Long objId) {
+    @PreAuthorize("@ss.hasPermi('base:workUnit:query')")
+    @GetMapping(value = "/{objId}")
+    public AjaxResult getInfo(@PathVariable("objId") Long objId) {
         return success(baseWorkUnitService.selectBaseWorkUnitByObjId(objId));
     }
 
     /**
      * 新增统计单元信息
      */
-    @PreAuthorize("@ss.hasPermi('base:workUnit:add')" )
-    @Log(title = "统计单元信息" , businessType = BusinessType.INSERT)
+    @PreAuthorize("@ss.hasPermi('base:workUnit:add')")
+    @Log(title = "统计单元信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BaseWorkUnit baseWorkUnit) {
         baseWorkUnit.setCreatedBy(getUsername());
@@ -102,8 +95,8 @@ public class BaseWorkUnitController extends BaseController {
     /**
      * 修改统计单元信息
      */
-    @PreAuthorize("@ss.hasPermi('base:workUnit:edit')" )
-    @Log(title = "统计单元信息" , businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('base:workUnit:edit')")
+    @Log(title = "统计单元信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BaseWorkUnit baseWorkUnit) {
         baseWorkUnit.setUpdatedBy(getUsername());
@@ -114,9 +107,9 @@ public class BaseWorkUnitController extends BaseController {
     /**
      * 删除统计单元信息
      */
-    @PreAuthorize("@ss.hasPermi('base:workUnit:remove')" )
-    @Log(title = "统计单元信息" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{objIds}" )
+    @PreAuthorize("@ss.hasPermi('base:workUnit:remove')")
+    @Log(title = "统计单元信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{objIds}")
     public AjaxResult remove(@PathVariable Long[] objIds) {
         return toAjax(baseWorkUnitService.deleteBaseWorkUnitByObjIds(objIds));
     }
diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorWorkUnit.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorWorkUnit.java
index 6844810..174bf81 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorWorkUnit.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseMonitorWorkUnit.java
@@ -1,6 +1,7 @@
 package com.aucma.base.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -13,185 +14,223 @@ import com.aucma.common.core.domain.BaseEntity;
  * @author Yinq
  * @date 2023-10-12
  */
-public class BaseMonitorWorkUnit extends BaseEntity
-        {
-private static final long serialVersionUID=1L;
+public class BaseMonitorWorkUnit extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** 主键标识 */
-            @Excel(name = "主键标识")
+    /**
+     * 主键标识
+     */
+    @Excel(name = "主键标识")
     private Long objId;
 
-    /** 计量设备编号 */
-            @Excel(name = "计量设备编号")
+    /**
+     * 计量设备编号
+     */
+    @Excel(name = "计量设备编号")
     private String monitorCode;
 
-    /** 统计单元编号 */
-            @Excel(name = "统计单元编号")
+    /**
+     * 计量设备名称
+     */
+    @Excel(name = "计量设备名称")
+    private String monitorName;
+
+    /**
+     * 统计单元编号
+     */
+    @Excel(name = "统计单元编号")
     private String workUnitCode;
 
-    /** 计量设备状态 */
-            @Excel(name = "计量设备状态")
+    /**
+     * 统计单元名称
+     */
+    @Excel(name = "统计单元名称")
+    private String workUnitName;
+
+    /**
+     * 计量设备状态
+     */
+    @Excel(name = "计量设备状态")
     private Long monitorStatus;
 
-    /** 计量设备类型 */
-            @Excel(name = "计量设备类型")
+    /**
+     * 计量设备类型
+     */
+    @Excel(name = "计量设备类型")
     private Long monitorType;
 
-    /** 计算方式（0-加，1-减） */
-            @Excel(name = "计算方式", readConverterExp = "0=-加，1-减")
+    /**
+     * 计算方式（0-加，1-减）
+     */
+    @Excel(name = "计算方式", readConverterExp = "0=-加，1-减")
     private Long formulaMode;
 
-    /** 比率 */
-            @Excel(name = "比率")
+    /**
+     * 比率
+     */
+    @Excel(name = "比率")
     private Long proportion;
 
-    /** 启用标识 */
-            @Excel(name = "启用标识")
+    /**
+     * 启用标识
+     */
+    @Excel(name = "启用标识")
     private Long isFlag;
 
-    /** 创建人 */
-            @Excel(name = "创建人")
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人")
     private String createdBy;
 
-    /** 创建时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-            @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
-    /** 修改人 */
-            @Excel(name = "修改人")
+    /**
+     * 修改人
+     */
+    @Excel(name = "修改人")
     private String updatedBy;
 
-    /** 修改时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-            @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
-    public void setObjId(Long objId)
-            {
-            this.objId = objId;
-            }
+    public String getMonitorName() {
+        return monitorName;
+    }
 
-    public Long getObjId()
-            {
-            return objId;
-            }
-    public void setMonitorCode(String monitorCode)
-            {
-            this.monitorCode = monitorCode;
-            }
+    public void setMonitorName(String monitorName) {
+        this.monitorName = monitorName;
+    }
 
-    public String getMonitorCode()
-            {
-            return monitorCode;
-            }
-    public void setWorkUnitCode(String workUnitCode)
-            {
-            this.workUnitCode = workUnitCode;
-            }
+    public String getWorkUnitName() {
+        return workUnitName;
+    }
 
-    public String getWorkUnitCode()
-            {
-            return workUnitCode;
-            }
-    public void setMonitorStatus(Long monitorStatus)
-            {
-            this.monitorStatus = monitorStatus;
-            }
+    public void setWorkUnitName(String workUnitName) {
+        this.workUnitName = workUnitName;
+    }
 
-    public Long getMonitorStatus()
-            {
-            return monitorStatus;
-            }
-    public void setMonitorType(Long monitorType)
-            {
-            this.monitorType = monitorType;
-            }
+    public void setObjId(Long objId) {
+        this.objId = objId;
+    }
 
-    public Long getMonitorType()
-            {
-            return monitorType;
-            }
-    public void setFormulaMode(Long formulaMode)
-            {
-            this.formulaMode = formulaMode;
-            }
+    public Long getObjId() {
+        return objId;
+    }
 
-    public Long getFormulaMode()
-            {
-            return formulaMode;
-            }
-    public void setProportion(Long proportion)
-            {
-            this.proportion = proportion;
-            }
+    public void setMonitorCode(String monitorCode) {
+        this.monitorCode = monitorCode;
+    }
 
-    public Long getProportion()
-            {
-            return proportion;
-            }
-    public void setIsFlag(Long isFlag)
-            {
-            this.isFlag = isFlag;
-            }
+    public String getMonitorCode() {
+        return monitorCode;
+    }
 
-    public Long getIsFlag()
-            {
-            return isFlag;
-            }
-    public void setCreatedBy(String createdBy)
-            {
-            this.createdBy = createdBy;
-            }
+    public void setWorkUnitCode(String workUnitCode) {
+        this.workUnitCode = workUnitCode;
+    }
 
-    public String getCreatedBy()
-            {
-            return createdBy;
-            }
-    public void setCreatedTime(Date createdTime)
-            {
-            this.createdTime = createdTime;
-            }
+    public String getWorkUnitCode() {
+        return workUnitCode;
+    }
 
-    public Date getCreatedTime()
-            {
-            return createdTime;
-            }
-    public void setUpdatedBy(String updatedBy)
-            {
-            this.updatedBy = updatedBy;
-            }
+    public void setMonitorStatus(Long monitorStatus) {
+        this.monitorStatus = monitorStatus;
+    }
 
-    public String getUpdatedBy()
-            {
-            return updatedBy;
-            }
-    public void setUpdatedTime(Date updatedTime)
-            {
-            this.updatedTime = updatedTime;
-            }
+    public Long getMonitorStatus() {
+        return monitorStatus;
+    }
 
-    public Date getUpdatedTime()
-            {
-            return updatedTime;
-            }
+    public void setMonitorType(Long monitorType) {
+        this.monitorType = monitorType;
+    }
 
-@Override
-public String toString(){
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("objId",getObjId())
-            .append("monitorCode",getMonitorCode())
-            .append("workUnitCode",getWorkUnitCode())
-            .append("monitorStatus",getMonitorStatus())
-            .append("monitorType",getMonitorType())
-            .append("formulaMode",getFormulaMode())
-            .append("proportion",getProportion())
-            .append("remark",getRemark())
-            .append("isFlag",getIsFlag())
-            .append("createdBy",getCreatedBy())
-            .append("createdTime",getCreatedTime())
-            .append("updatedBy",getUpdatedBy())
-            .append("updatedTime",getUpdatedTime())
-        .toString();
-        }
-        }
+    public Long getMonitorType() {
+        return monitorType;
+    }
+
+    public void setFormulaMode(Long formulaMode) {
+        this.formulaMode = formulaMode;
+    }
+
+    public Long getFormulaMode() {
+        return formulaMode;
+    }
+
+    public void setProportion(Long proportion) {
+        this.proportion = proportion;
+    }
+
+    public Long getProportion() {
+        return proportion;
+    }
+
+    public void setIsFlag(Long isFlag) {
+        this.isFlag = isFlag;
+    }
+
+    public Long getIsFlag() {
+        return isFlag;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setUpdatedBy(String updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    public String getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedTime(Date updatedTime) {
+        this.updatedTime = updatedTime;
+    }
+
+    public Date getUpdatedTime() {
+        return updatedTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("objId", getObjId())
+                .append("monitorCode", getMonitorCode())
+                .append("workUnitCode", getWorkUnitCode())
+                .append("monitorStatus", getMonitorStatus())
+                .append("monitorType", getMonitorType())
+                .append("formulaMode", getFormulaMode())
+                .append("proportion", getProportion())
+                .append("remark", getRemark())
+                .append("isFlag", getIsFlag())
+                .append("createdBy", getCreatedBy())
+                .append("createdTime", getCreatedTime())
+                .append("updatedBy", getUpdatedBy())
+                .append("updatedTime", getUpdatedTime())
+                .toString();
+    }
+}
diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseWorkUnit.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseWorkUnit.java
index ee68480..396c3ad 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseWorkUnit.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseWorkUnit.java
@@ -17,249 +17,260 @@ import com.aucma.common.core.domain.TreeEntity;
  * @author Yinq
  * @date 2023-10-12
  */
-public class BaseWorkUnit extends BaseEntity
-        {
-private static final long serialVersionUID=1L;
+public class BaseWorkUnit extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** 主键标识 */
-            @Excel(name = "主键标识")
+    /**
+     * 主键标识
+     */
+    @Excel(name = "主键标识")
     private Long objId;
 
-    /** 统计单元编号 */
-            @Excel(name = "统计单元编号")
+    /**
+     * 统计单元编号
+     */
+    @Excel(name = "统计单元编号")
     private String workUnitCode;
 
-    /** 统计单元名称 */
-            @Excel(name = "统计单元名称")
+    /**
+     * 统计单元名称
+     */
+    @Excel(name = "统计单元名称")
     private String workUnitName;
 
-    /** 统计区域 */
-            @Excel(name = "统计区域")
+    /**
+     * 统计区域
+     */
+    @Excel(name = "统计区域")
     private String workUnitAddress;
 
-    /** 排序 */
-            @Excel(name = "排序")
+    /**
+     * 排序
+     */
+    @Excel(name = "排序")
     private Long workUnitSort;
 
-    /** 产线/工位 */
-            @Excel(name = "产线/工位")
+    /**
+     * 产线/工位
+     */
+    @Excel(name = "产线/工位")
     private String productLineCode;
 
     private String productLineName;
 
-            public String getProductLineName() {
-                return productLineName;
-            }
+    public String getProductLineName() {
+        return productLineName;
+    }
 
-            public void setProductLineName(String productLineName) {
-                this.productLineName = productLineName;
-            }
+    public void setProductLineName(String productLineName) {
+        this.productLineName = productLineName;
+    }
 
-            /** 统计单元类型 */
-            @Excel(name = "统计单元类型")
+    /**
+     * 统计单元类型
+     */
+    @Excel(name = "统计单元类型")
     private Long workUnitType;
 
-    /** 启用标识 */
-            @Excel(name = "启用标识")
+    /**
+     * 启用标识
+     */
+    @Excel(name = "启用标识")
     private Long isFlag;
 
-    /** 创建人 */
-            @Excel(name = "创建人")
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人")
     private String createdBy;
 
-    /** 创建时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-            @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
-    /** 更新人 */
-            @Excel(name = "更新人")
+    /**
+     * 更新人
+     */
+    @Excel(name = "更新人")
     private String updatedBy;
 
-    /** 更新时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-            @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
-            private List<BaseWorkUnit> children = new ArrayList<BaseWorkUnit>();
+    
+    private List<BaseWorkUnit> children = new ArrayList<BaseWorkUnit>();
 
-            private String parentName;
+    private String parentName;
 
-            private Long parentId;
+    private Long parentId;
 
-            private Integer orderNum;
+    private Integer orderNum;
 
-            private String ancestors;
+    private String ancestors;
 
-            public List<BaseWorkUnit> getChildren() {
-                return children;
-            }
+    public List<BaseWorkUnit> getChildren() {
+        return children;
+    }
 
-            public void setChildren(List<BaseWorkUnit> children) {
-                this.children = children;
-            }
+    public void setChildren(List<BaseWorkUnit> children) {
+        this.children = children;
+    }
 
-            public String getParentName() {
-                return parentName;
-            }
+    public String getParentName() {
+        return parentName;
+    }
 
-            public void setParentName(String parentName) {
-                this.parentName = parentName;
-            }
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
 
-            public Long getParentId() {
-                return parentId;
-            }
+    public Long getParentId() {
+        return parentId;
+    }
 
-            public void setParentId(Long parentId) {
-                this.parentId = parentId;
-            }
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
 
-            public Integer getOrderNum() {
-                return orderNum;
-            }
+    public Integer getOrderNum() {
+        return orderNum;
+    }
 
-            public void setOrderNum(Integer orderNum) {
-                this.orderNum = orderNum;
-            }
+    public void setOrderNum(Integer orderNum) {
+        this.orderNum = orderNum;
+    }
 
-            public String getAncestors() {
-                return ancestors;
-            }
+    public String getAncestors() {
+        return ancestors;
+    }
 
-            public void setAncestors(String ancestors) {
-                this.ancestors = ancestors;
-            }
+    public void setAncestors(String ancestors) {
+        this.ancestors = ancestors;
+    }
 
-            public void setObjId(Long objId)
-            {
-            this.objId = objId;
-            }
+    public void setObjId(Long objId) {
+        this.objId = objId;
+    }
 
-    public Long getObjId()
-            {
-            return objId;
-            }
-    public void setWorkUnitCode(String workUnitCode)
-            {
-            this.workUnitCode = workUnitCode;
-            }
+    public Long getObjId() {
+        return objId;
+    }
 
-    public String getWorkUnitCode()
-            {
-            return workUnitCode;
-            }
-    public void setWorkUnitName(String workUnitName)
-            {
-            this.workUnitName = workUnitName;
-            }
+    public void setWorkUnitCode(String workUnitCode) {
+        this.workUnitCode = workUnitCode;
+    }
 
-    public String getWorkUnitName()
-            {
-            return workUnitName;
-            }
-    public void setWorkUnitAddress(String workUnitAddress)
-            {
-            this.workUnitAddress = workUnitAddress;
-            }
+    public String getWorkUnitCode() {
+        return workUnitCode;
+    }
 
-    public String getWorkUnitAddress()
-            {
-            return workUnitAddress;
-            }
-    public void setWorkUnitSort(Long workUnitSort)
-            {
-            this.workUnitSort = workUnitSort;
-            }
+    public void setWorkUnitName(String workUnitName) {
+        this.workUnitName = workUnitName;
+    }
 
-    public Long getWorkUnitSort()
-            {
-            return workUnitSort;
-            }
-    public void setProductLineCode(String productLineCode)
-            {
-            this.productLineCode = productLineCode;
-            }
+    public String getWorkUnitName() {
+        return workUnitName;
+    }
 
-    public String getProductLineCode()
-            {
-            return productLineCode;
-            }
-    public void setWorkUnitType(Long workUnitType)
-            {
-            this.workUnitType = workUnitType;
-            }
+    public void setWorkUnitAddress(String workUnitAddress) {
+        this.workUnitAddress = workUnitAddress;
+    }
 
-    public Long getWorkUnitType()
-            {
-            return workUnitType;
-            }
-    public void setIsFlag(Long isFlag)
-            {
-            this.isFlag = isFlag;
-            }
+    public String getWorkUnitAddress() {
+        return workUnitAddress;
+    }
 
-    public Long getIsFlag()
-            {
-            return isFlag;
-            }
-    public void setCreatedBy(String createdBy)
-            {
-            this.createdBy = createdBy;
-            }
+    public void setWorkUnitSort(Long workUnitSort) {
+        this.workUnitSort = workUnitSort;
+    }
 
-    public String getCreatedBy()
-            {
-            return createdBy;
-            }
-    public void setCreatedTime(Date createdTime)
-            {
-            this.createdTime = createdTime;
-            }
+    public Long getWorkUnitSort() {
+        return workUnitSort;
+    }
 
-    public Date getCreatedTime()
-            {
-            return createdTime;
-            }
-    public void setUpdatedBy(String updatedBy)
-            {
-            this.updatedBy = updatedBy;
-            }
+    public void setProductLineCode(String productLineCode) {
+        this.productLineCode = productLineCode;
+    }
 
-    public String getUpdatedBy()
-            {
-            return updatedBy;
-            }
-    public void setUpdatedTime(Date updatedTime)
-            {
-            this.updatedTime = updatedTime;
-            }
+    public String getProductLineCode() {
+        return productLineCode;
+    }
 
-    public Date getUpdatedTime()
-            {
-            return updatedTime;
-            }
+    public void setWorkUnitType(Long workUnitType) {
+        this.workUnitType = workUnitType;
+    }
 
-            @Override
-            public String toString() {
-                return "BaseWorkUnit{" +
-                        "objId=" + objId +
-                        ", workUnitCode='" + workUnitCode + '\'' +
-                        ", workUnitName='" + workUnitName + '\'' +
-                        ", workUnitAddress='" + workUnitAddress + '\'' +
-                        ", workUnitSort=" + workUnitSort +
-                        ", productLineCode='" + productLineCode + '\'' +
-                        ", productLineName='" + productLineName + '\'' +
-                        ", workUnitType=" + workUnitType +
-                        ", isFlag=" + isFlag +
-                        ", createdBy='" + createdBy + '\'' +
-                        ", createdTime=" + createdTime +
-                        ", updatedBy='" + updatedBy + '\'' +
-                        ", updatedTime=" + updatedTime +
-                        ", children=" + children +
-                        ", parentName='" + parentName + '\'' +
-                        ", parentId=" + parentId +
-                        ", orderNum=" + orderNum +
-                        ", ancestors='" + ancestors + '\'' +
-                        '}';
-            }
-        }
+    public Long getWorkUnitType() {
+        return workUnitType;
+    }
+
+    public void setIsFlag(Long isFlag) {
+        this.isFlag = isFlag;
+    }
+
+    public Long getIsFlag() {
+        return isFlag;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setUpdatedBy(String updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    public String getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedTime(Date updatedTime) {
+        this.updatedTime = updatedTime;
+    }
+
+    public Date getUpdatedTime() {
+        return updatedTime;
+    }
+
+    @Override
+    public String toString() {
+        return "BaseWorkUnit{" +
+                "objId=" + objId +
+                ", workUnitCode='" + workUnitCode + '\'' +
+                ", workUnitName='" + workUnitName + '\'' +
+                ", workUnitAddress='" + workUnitAddress + '\'' +
+                ", workUnitSort=" + workUnitSort +
+                ", productLineCode='" + productLineCode + '\'' +
+                ", productLineName='" + productLineName + '\'' +
+                ", workUnitType=" + workUnitType +
+                ", isFlag=" + isFlag +
+                ", createdBy='" + createdBy + '\'' +
+                ", createdTime=" + createdTime +
+                ", updatedBy='" + updatedBy + '\'' +
+                ", updatedTime=" + updatedTime +
+                ", children=" + children +
+                ", parentName='" + parentName + '\'' +
+                ", parentId=" + parentId +
+                ", orderNum=" + orderNum +
+                ", ancestors='" + ancestors + '\'' +
+                '}';
+    }
+}
diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseQualityInspectionItemMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseQualityInspectionItemMapper.java
index 63281e1..296e87b 100644
--- a/aucma-base/src/main/java/com/aucma/base/mapper/BaseQualityInspectionItemMapper.java
+++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseQualityInspectionItemMapper.java
@@ -27,7 +27,11 @@ public interface BaseQualityInspectionItemMapper
      */
     public List<BaseQualityInspectionItem> selectBaseQualityInspectionItemList(BaseQualityInspectionItem baseQualityInspectionItem);
 
+    /**
+     * 查询所有父级以及名称
+     * */
     List<BaseQualityInspectionItem> selectBaseQualityInspectionItemParent();
+
     /**
      * 新增质检项信息维护
      *
diff --git a/aucma-base/src/main/java/com/aucma/base/service/IBaseQualityInspectionItemService.java b/aucma-base/src/main/java/com/aucma/base/service/IBaseQualityInspectionItemService.java
index 50c6536..8586766 100644
--- a/aucma-base/src/main/java/com/aucma/base/service/IBaseQualityInspectionItemService.java
+++ b/aucma-base/src/main/java/com/aucma/base/service/IBaseQualityInspectionItemService.java
@@ -19,7 +19,11 @@ public interface IBaseQualityInspectionItemService
      */
     public BaseQualityInspectionItem selectBaseQualityInspectionItemByObjId(Long objId);
 
+    /**
+     * 查询所有父级以及名称
+     * */
     List<BaseQualityInspectionItem> selectBaseQualityInspectionItemParent();
+
     /**
      * 查询质检项信息维护列表
      *
diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorWorkUnitServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorWorkUnitServiceImpl.java
index 7c65bd6..0c6bdf7 100644
--- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorWorkUnitServiceImpl.java
+++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseMonitorWorkUnitServiceImpl.java
@@ -1,6 +1,8 @@
 package com.aucma.base.service.impl;
 
 import java.util.List;
+
+import com.aucma.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.aucma.base.mapper.BaseMonitorWorkUnitMapper;
@@ -52,7 +54,7 @@ public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitServi
     @Override
     public int insertBaseMonitorWorkUnit(BaseMonitorWorkUnit baseMonitorWorkUnit)
     {
-
+        baseMonitorWorkUnit.setCreatedTime(DateUtils.getNowDate());
         return baseMonitorWorkUnitMapper.insertBaseMonitorWorkUnit(baseMonitorWorkUnit);
     }
 
@@ -65,6 +67,7 @@ public class BaseMonitorWorkUnitServiceImpl implements IBaseMonitorWorkUnitServi
     @Override
     public int updateBaseMonitorWorkUnit(BaseMonitorWorkUnit baseMonitorWorkUnit)
     {
+        baseMonitorWorkUnit.setUpdatedTime(DateUtils.getNowDate());
         return baseMonitorWorkUnitMapper.updateBaseMonitorWorkUnit(baseMonitorWorkUnit);
     }
 
diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseQualityInspectionItemServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseQualityInspectionItemServiceImpl.java
index 22d2a25..8aa001e 100644
--- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseQualityInspectionItemServiceImpl.java
+++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseQualityInspectionItemServiceImpl.java
@@ -31,6 +31,9 @@ public class BaseQualityInspectionItemServiceImpl implements IBaseQualityInspect
         return baseQualityInspectionItemMapper.selectBaseQualityInspectionItemByObjId(objId);
     }
 
+    /**
+     * 查询所有父级以及名称
+     * */
     @Override
     public List<BaseQualityInspectionItem> selectBaseQualityInspectionItemParent() {
         return baseQualityInspectionItemMapper.selectBaseQualityInspectionItemParent();
diff --git a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseWorkUnitServiceImpl.java b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseWorkUnitServiceImpl.java
index b6e3240..e142c7b 100644
--- a/aucma-base/src/main/java/com/aucma/base/service/impl/BaseWorkUnitServiceImpl.java
+++ b/aucma-base/src/main/java/com/aucma/base/service/impl/BaseWorkUnitServiceImpl.java
@@ -112,15 +112,16 @@ public class BaseWorkUnitServiceImpl implements IBaseWorkUnitService
 
     @Override
     public List<BaseWorkUnit> buildWorkUnitTree(List<BaseWorkUnit> baseWorkUnits) {
+
         List<BaseWorkUnit> returnList = new ArrayList<BaseWorkUnit>();
         List<Long> tempList = baseWorkUnits.stream().map(BaseWorkUnit::getObjId).collect(Collectors.toList());
-        for (BaseWorkUnit baseWorkUnit : baseWorkUnits)
+        for (BaseWorkUnit baseMonitorInfo : baseWorkUnits)
         {
             // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(baseWorkUnit.getParentId()))
+            if (!tempList.contains(baseMonitorInfo.getParentId()))
             {
-                recursionFn(baseWorkUnits, baseWorkUnit);
-                returnList.add(baseWorkUnit);
+                recursionFn(baseWorkUnits, baseMonitorInfo);
+                returnList.add(baseMonitorInfo);
             }
         }
         if (returnList.isEmpty())
diff --git a/aucma-base/src/main/resources/mapper/base/BaseMonitorWorkUnitMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseMonitorWorkUnitMapper.xml
index d8a460c..b1850e7 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseMonitorWorkUnitMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseMonitorWorkUnitMapper.xml
@@ -5,47 +5,63 @@
 <mapper namespace="com.aucma.base.mapper.BaseMonitorWorkUnitMapper">
 
     <resultMap type="BaseMonitorWorkUnit" id="BaseMonitorWorkUnitResult">
-            <result property="objId"    column="obj_id"    />
-            <result property="monitorCode"    column="monitor_code"    />
-            <result property="workUnitCode"    column="work_unit_code"    />
-            <result property="monitorStatus"    column="monitor_status"    />
-            <result property="monitorType"    column="monitor_type"    />
-            <result property="formulaMode"    column="formula_mode"    />
-            <result property="proportion"    column="proportion"    />
-            <result property="remark"    column="remark"    />
-            <result property="isFlag"    column="is_flag"    />
-            <result property="createdBy"    column="created_by"    />
-            <result property="createdTime"    column="created_time"    />
-            <result property="updatedBy"    column="updated_by"    />
-            <result property="updatedTime"    column="updated_time"    />
+        <result property="objId" column="obj_id"/>
+        <result property="monitorCode" column="monitor_code"/>
+        <result property="monitorName" column="monitor_name"/>
+        <result property="workUnitCode" column="work_unit_code"/>
+        <result property="workUnitName" column="work_unit_name"/>
+        <result property="monitorStatus" column="monitor_status"/>
+        <result property="monitorType" column="monitor_type"/>
+        <result property="formulaMode" column="formula_mode"/>
+        <result property="proportion" column="proportion"/>
+        <result property="remark" column="remark"/>
+        <result property="isFlag" column="is_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
     </resultMap>
 
     <sql id="selectBaseMonitorWorkUnitVo">
-        select obj_id, monitor_code, work_unit_code, monitor_status, monitor_type, formula_mode, proportion, remark, is_flag, created_by, created_time, updated_by, updated_time from base_monitor_work_unit
+        select bmwu.obj_id,
+               bmwu.monitor_code,
+               bmi.monitor_name,
+               bmwu.work_unit_code,
+               wu.work_unit_name,
+               bmwu.monitor_status,
+               bmwu.monitor_type,
+               bmwu.formula_mode,
+               bmwu.proportion,
+               bmwu.remark,
+               bmwu.is_flag,
+               bmwu.created_by,
+               bmwu.created_time,
+               bmwu.updated_by,
+               bmwu.updated_time
+        from base_monitor_work_unit bmwu
+                 left join BASE_WORK_UNIT wu on wu.WORK_UNIT_CODE = bmwu.work_unit_code
+                 left join BASE_MONITORINFO bmi on bmi.monitor_code = bmwu.monitor_code
     </sql>
 
-    <select id="selectBaseMonitorWorkUnitList" parameterType="BaseMonitorWorkUnit" resultMap="BaseMonitorWorkUnitResult">
+    <select id="selectBaseMonitorWorkUnitList" parameterType="BaseMonitorWorkUnit"
+            resultMap="BaseMonitorWorkUnitResult">
         <include refid="selectBaseMonitorWorkUnitVo"/>
         <where>
-                        <if test="objId != null "> and obj_id = #{objId}</if>
-                        <if test="monitorCode != null  and monitorCode != ''"> and monitor_code = #{monitorCode}</if>
-                        <if test="workUnitCode != null  and workUnitCode != ''"> and work_unit_code = #{workUnitCode}</if>
-                        <if test="monitorStatus != null "> and monitor_status = #{monitorStatus}</if>
-                        <if test="monitorType != null "> and monitor_type = #{monitorType}</if>
-                        <if test="formulaMode != null "> and formula_mode = #{formulaMode}</if>
-                        <if test="proportion != null "> and proportion = #{proportion}</if>
-                        <if test="isFlag != null "> and is_flag = #{isFlag}</if>
-                        <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
-                        <if test="createdTime != null "> and created_time = #{createdTime}</if>
-                        <if test="updatedBy != null  and updatedBy != ''"> and updated_by = #{updatedBy}</if>
-                        <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
+            <if test="objId != null ">and bmwu.obj_id = #{objId}</if>
+            <if test="monitorCode != null  and monitorCode != ''">and bmwu.monitor_code = #{monitorCode}</if>
+            <if test="workUnitCode != null  and workUnitCode != ''">and bmwu.work_unit_code = #{workUnitCode}</if>
+            <if test="monitorStatus != null ">and bmwu.monitor_status = #{monitorStatus}</if>
+            <if test="monitorType != null ">and bmwu.monitor_type = #{monitorType}</if>
+            <if test="formulaMode != null ">and bmwu.formula_mode = #{formulaMode}</if>
+            <if test="proportion != null ">and bmwu.proportion = #{proportion}</if>
+            <if test="isFlag != null ">and bmwu.is_flag = #{isFlag}</if>
         </where>
         order by OBJ_ID
     </select>
 
     <select id="selectBaseMonitorWorkUnitByObjId" parameterType="Long" resultMap="BaseMonitorWorkUnitResult">
-            <include refid="selectBaseMonitorWorkUnitVo"/>
-            where obj_id = #{objId}
+        <include refid="selectBaseMonitorWorkUnitVo"/>
+        where bmwu.obj_id = #{objId}
     </select>
 
     <insert id="insertBaseMonitorWorkUnit" parameterType="BaseMonitorWorkUnit">
@@ -54,58 +70,60 @@
         </selectKey>
         insert into base_monitor_work_unit
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="objId != null">obj_id,</if>
-                <if test="monitorCode != null and monitorCode != ''">monitor_code,</if>
-                <if test="workUnitCode != null">work_unit_code,</if>
-                <if test="monitorStatus != null">monitor_status,</if>
-                <if test="monitorType != null">monitor_type,</if>
-                <if test="formulaMode != null">formula_mode,</if>
-                <if test="proportion != null">proportion,</if>
-                <if test="remark != null">remark,</if>
-                <if test="isFlag != null">is_flag,</if>
-                <if test="createdBy != null">created_by,</if>
-                <if test="createdTime != null">created_time,</if>
-                <if test="updatedBy != null">updated_by,</if>
-                <if test="updatedTime != null">updated_time,</if>
+            <if test="objId != null">obj_id,</if>
+            <if test="monitorCode != null and monitorCode != ''">monitor_code,</if>
+            <if test="workUnitCode != null">work_unit_code,</if>
+            <if test="monitorStatus != null">monitor_status,</if>
+            <if test="monitorType != null">monitor_type,</if>
+            <if test="formulaMode != null">formula_mode,</if>
+            <if test="proportion != null">proportion,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isFlag != null">is_flag,</if>
+            <if test="createdBy != null">created_by,</if>
+            <if test="createdTime != null">created_time,</if>
+            <if test="updatedBy != null">updated_by,</if>
+            <if test="updatedTime != null">updated_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="objId != null">#{objId},</if>
-                <if test="monitorCode != null and monitorCode != ''">#{monitorCode},</if>
-                <if test="workUnitCode != null">#{workUnitCode},</if>
-                <if test="monitorStatus != null">#{monitorStatus},</if>
-                <if test="monitorType != null">#{monitorType},</if>
-                <if test="formulaMode != null">#{formulaMode},</if>
-                <if test="proportion != null">#{proportion},</if>
-                <if test="remark != null">#{remark},</if>
-                <if test="isFlag != null">#{isFlag},</if>
-                <if test="createdBy != null">#{createdBy},</if>
-                <if test="createdTime != null">#{createdTime},</if>
-                <if test="updatedBy != null">#{updatedBy},</if>
-                <if test="updatedTime != null">#{updatedTime},</if>
+            <if test="objId != null">#{objId},</if>
+            <if test="monitorCode != null and monitorCode != ''">#{monitorCode},</if>
+            <if test="workUnitCode != null">#{workUnitCode},</if>
+            <if test="monitorStatus != null">#{monitorStatus},</if>
+            <if test="monitorType != null">#{monitorType},</if>
+            <if test="formulaMode != null">#{formulaMode},</if>
+            <if test="proportion != null">#{proportion},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isFlag != null">#{isFlag},</if>
+            <if test="createdBy != null">#{createdBy},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updatedBy != null">#{updatedBy},</if>
+            <if test="updatedTime != null">#{updatedTime},</if>
         </trim>
     </insert>
 
     <update id="updateBaseMonitorWorkUnit" parameterType="BaseMonitorWorkUnit">
         update base_monitor_work_unit
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="monitorCode != null and monitorCode != ''">monitor_code = #{monitorCode},</if>
-                    <if test="workUnitCode != null">work_unit_code = #{workUnitCode},</if>
-                    <if test="monitorStatus != null">monitor_status = #{monitorStatus},</if>
-                    <if test="monitorType != null">monitor_type = #{monitorType},</if>
-                    <if test="formulaMode != null">formula_mode = #{formulaMode},</if>
-                    <if test="proportion != null">proportion = #{proportion},</if>
-                    <if test="remark != null">remark = #{remark},</if>
-                    <if test="isFlag != null">is_flag = #{isFlag},</if>
-                    <if test="createdBy != null">created_by = #{createdBy},</if>
-                    <if test="createdTime != null">created_time = #{createdTime},</if>
-                    <if test="updatedBy != null">updated_by = #{updatedBy},</if>
-                    <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+            <if test="monitorCode != null and monitorCode != ''">monitor_code = #{monitorCode},</if>
+            <if test="workUnitCode != null">work_unit_code = #{workUnitCode},</if>
+            <if test="monitorStatus != null">monitor_status = #{monitorStatus},</if>
+            <if test="monitorType != null">monitor_type = #{monitorType},</if>
+            <if test="formulaMode != null">formula_mode = #{formulaMode},</if>
+            <if test="proportion != null">proportion = #{proportion},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isFlag != null">is_flag = #{isFlag},</if>
+            <if test="createdBy != null">created_by = #{createdBy},</if>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
+            <if test="updatedBy != null">updated_by = #{updatedBy},</if>
+            <if test="updatedTime != null">updated_time = #{updatedTime},</if>
         </trim>
         where obj_id = #{objId}
     </update>
 
     <delete id="deleteBaseMonitorWorkUnitByObjId" parameterType="Long">
-        delete from base_monitor_work_unit where obj_id = #{objId}
+        delete
+        from base_monitor_work_unit
+        where obj_id = #{objId}
     </delete>
 
     <delete id="deleteBaseMonitorWorkUnitByObjIds" parameterType="String">
diff --git a/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
index ac38b43..f01bb0e 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
@@ -5,109 +5,136 @@
 <mapper namespace="com.aucma.base.mapper.BaseQualityInspectionItemMapper">
 
     <resultMap type="BaseQualityInspectionItem" id="BaseQualityInspectionItemResult">
-            <result property="objId"    column="obj_id"    />
-            <result property="qualityDefectCode"    column="quality_defect_code"    />
-            <result property="qualityDefectName"    column="quality_defect_name"    />
-            <result property="parentId"    column="parent_id"    />
-            <result property="materialCategories"    column="material_categories"    />
-            <result property="materialSubclass"    column="material_subclass"    />
-            <result property="plantCode"    column="plant_code"    />
-            <result property="remark"    column="remark"    />
-            <result property="isFlag"    column="is_flag"    />
-            <result property="createdBy"    column="created_by"    />
-            <result property="createdTime"    column="created_time"    />
-            <result property="updatedBy"    column="updated_by"    />
-            <result property="updatedTime"    column="updated_time"    />
+        <result property="objId" column="obj_id"/>
+        <result property="qualityDefectCode" column="quality_defect_code"/>
+        <result property="qualityDefectName" column="quality_defect_name"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="materialCategories" column="material_categories"/>
+        <result property="materialSubclass" column="material_subclass"/>
+        <result property="plantCode" column="plant_code"/>
+        <result property="remark" column="remark"/>
+        <result property="isFlag" column="is_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
     </resultMap>
 
     <sql id="selectBaseQualityInspectionItemVo">
-        select obj_id, quality_defect_code, quality_defect_name, parent_id, material_categories, material_subclass, plant_code, remark, is_flag, created_by, created_time, updated_by, updated_time from base_quality_inspection_item
+        select obj_id,
+               quality_defect_code,
+               quality_defect_name,
+               parent_id,
+               material_categories,
+               material_subclass,
+               plant_code,
+               remark,
+               is_flag,
+               created_by,
+               created_time,
+               updated_by,
+               updated_time
+        from base_quality_inspection_item
     </sql>
 
-    <select id="selectBaseQualityInspectionItemList" parameterType="BaseQualityInspectionItem" resultMap="BaseQualityInspectionItemResult">
+    <select id="selectBaseQualityInspectionItemList" parameterType="BaseQualityInspectionItem"
+            resultMap="BaseQualityInspectionItemResult">
         <include refid="selectBaseQualityInspectionItemVo"/>
         <where>
-                        <if test="qualityDefectCode != null  and qualityDefectCode != ''"> and quality_defect_code = #{qualityDefectCode}</if>
-                        <if test="qualityDefectName != null  and qualityDefectName != ''"> and quality_defect_name like concat(concat('%', #{qualityDefectName}), '%')</if>
-                        <if test="parentId != null  and parentId != ''"> and parent_id = #{parentId}</if>
-                        <if test="materialCategories != null  and materialCategories != ''"> and material_categories = #{materialCategories}</if>
-                        <if test="materialSubclass != null  and materialSubclass != ''"> and material_subclass = #{materialSubclass}</if>
-                        <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
-                        <if test="isFlag != null "> and is_flag = #{isFlag}</if>
-                        <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
-                        <if test="createdTime != null "> and created_time = #{createdTime}</if>
-                        <if test="updatedBy != null  and updatedBy != ''"> and updated_by = #{updatedBy}</if>
-                        <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
+            <if test="qualityDefectCode != null  and qualityDefectCode != ''">and quality_defect_code =
+                #{qualityDefectCode}
+            </if>
+            <if test="qualityDefectName != null  and qualityDefectName != ''">and quality_defect_name like
+                concat(concat('%', #{qualityDefectName}), '%')
+            </if>
+            <if test="parentId != null  and parentId != ''">and parent_id = #{parentId}</if>
+            <if test="materialCategories != null  and materialCategories != ''">and material_categories =
+                #{materialCategories}
+            </if>
+            <if test="materialSubclass != null  and materialSubclass != ''">and material_subclass =
+                #{materialSubclass}
+            </if>
+            <if test="plantCode != null  and plantCode != ''">and plant_code = #{plantCode}</if>
+            <if test="isFlag != null ">and is_flag = #{isFlag}</if>
+            <if test="createdBy != null  and createdBy != ''">and created_by = #{createdBy}</if>
+            <if test="createdTime != null ">and created_time = #{createdTime}</if>
+            <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
+            <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
         </where>
+        order by quality_defect_code
     </select>
 
-    <select id="selectBaseQualityInspectionItemByObjId" parameterType="Long" resultMap="BaseQualityInspectionItemResult">
-            <include refid="selectBaseQualityInspectionItemVo"/>
-            where obj_id = #{objId}
+    <select id="selectBaseQualityInspectionItemByObjId" parameterType="Long"
+            resultMap="BaseQualityInspectionItemResult">
+        <include refid="selectBaseQualityInspectionItemVo"/>
+        where obj_id = #{objId}
     </select>
     <select id="selectBaseQualityInspectionItemParent" resultMap="BaseQualityInspectionItemResult">
         <include refid="selectBaseQualityInspectionItemVo"/>
         where PARENT_ID = 0
+        order by quality_defect_code
     </select>
 
     <insert id="insertBaseQualityInspectionItem" parameterType="BaseQualityInspectionItem">
-            <selectKey keyProperty="objId" resultType="long" order="BEFORE">
-                SELECT seq_base_quality_inspection.NEXTVAL as objId FROM DUAL
-            </selectKey>
+        <selectKey keyProperty="objId" resultType="long" order="BEFORE">
+            SELECT seq_base_quality_inspection.NEXTVAL as objId FROM DUAL
+        </selectKey>
         insert into base_quality_inspection_item
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="objId != null">obj_id,</if>
-                <if test="qualityDefectCode != null">quality_defect_code,</if>
-                <if test="qualityDefectName != null">quality_defect_name,</if>
-                <if test="parentId != null">parent_id,</if>
-                <if test="materialCategories != null">material_categories,</if>
-                <if test="materialSubclass != null">material_subclass,</if>
-                <if test="plantCode != null">plant_code,</if>
-                <if test="remark != null">remark,</if>
-                <if test="isFlag != null">is_flag,</if>
-                <if test="createdBy != null">created_by,</if>
-                <if test="createdTime != null">created_time,</if>
-                <if test="updatedBy != null">updated_by,</if>
-                <if test="updatedTime != null">updated_time,</if>
+            <if test="objId != null">obj_id,</if>
+            <if test="qualityDefectCode != null">quality_defect_code,</if>
+            <if test="qualityDefectName != null">quality_defect_name,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="materialCategories != null">material_categories,</if>
+            <if test="materialSubclass != null">material_subclass,</if>
+            <if test="plantCode != null">plant_code,</if>
+            <if test="remark != null">remark,</if>
+            <if test="isFlag != null">is_flag,</if>
+            <if test="createdBy != null">created_by,</if>
+            <if test="createdTime != null">created_time,</if>
+            <if test="updatedBy != null">updated_by,</if>
+            <if test="updatedTime != null">updated_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="objId != null">#{objId},</if>
-                <if test="qualityDefectCode != null">#{qualityDefectCode},</if>
-                <if test="qualityDefectName != null">#{qualityDefectName},</if>
-                <if test="parentId != null">#{parentId},</if>
-                <if test="materialCategories != null">#{materialCategories},</if>
-                <if test="materialSubclass != null">#{materialSubclass},</if>
-                <if test="plantCode != null">#{plantCode},</if>
-                <if test="remark != null">#{remark},</if>
-                <if test="isFlag != null">#{isFlag},</if>
-                <if test="createdBy != null">#{createdBy},</if>
-                <if test="createdTime != null">#{createdTime},</if>
-                <if test="updatedBy != null">#{updatedBy},</if>
-                <if test="updatedTime != null">#{updatedTime},</if>
+            <if test="objId != null">#{objId},</if>
+            <if test="qualityDefectCode != null">#{qualityDefectCode},</if>
+            <if test="qualityDefectName != null">#{qualityDefectName},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="materialCategories != null">#{materialCategories},</if>
+            <if test="materialSubclass != null">#{materialSubclass},</if>
+            <if test="plantCode != null">#{plantCode},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="isFlag != null">#{isFlag},</if>
+            <if test="createdBy != null">#{createdBy},</if>
+            <if test="createdTime != null">#{createdTime},</if>
+            <if test="updatedBy != null">#{updatedBy},</if>
+            <if test="updatedTime != null">#{updatedTime},</if>
         </trim>
     </insert>
 
     <update id="updateBaseQualityInspectionItem" parameterType="BaseQualityInspectionItem">
         update base_quality_inspection_item
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="qualityDefectCode != null">quality_defect_code = #{qualityDefectCode},</if>
-                    <if test="qualityDefectName != null">quality_defect_name = #{qualityDefectName},</if>
-                    <if test="parentId != null">parent_id = #{parentId},</if>
-                    <if test="materialCategories != null">material_categories = #{materialCategories},</if>
-                    <if test="materialSubclass != null">material_subclass = #{materialSubclass},</if>
-                    <if test="plantCode != null">plant_code = #{plantCode},</if>
-                    <if test="remark != null">remark = #{remark},</if>
-                    <if test="isFlag != null">is_flag = #{isFlag},</if>
-                    <if test="createdBy != null">created_by = #{createdBy},</if>
-                    <if test="createdTime != null">created_time = #{createdTime},</if>
-                    <if test="updatedBy != null">updated_by = #{updatedBy},</if>
-                    <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+            <if test="qualityDefectCode != null">quality_defect_code = #{qualityDefectCode},</if>
+            <if test="qualityDefectName != null">quality_defect_name = #{qualityDefectName},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="materialCategories != null">material_categories = #{materialCategories},</if>
+            <if test="materialSubclass != null">material_subclass = #{materialSubclass},</if>
+            <if test="plantCode != null">plant_code = #{plantCode},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="isFlag != null">is_flag = #{isFlag},</if>
+            <if test="createdBy != null">created_by = #{createdBy},</if>
+            <if test="createdTime != null">created_time = #{createdTime},</if>
+            <if test="updatedBy != null">updated_by = #{updatedBy},</if>
+            <if test="updatedTime != null">updated_time = #{updatedTime},</if>
         </trim>
         where obj_id = #{objId}
     </update>
 
     <delete id="deleteBaseQualityInspectionItemByObjId" parameterType="Long">
-        delete from base_quality_inspection_item where obj_id = #{objId}
+        delete
+        from base_quality_inspection_item
+        where obj_id = #{objId}
     </delete>
 
     <delete id="deleteBaseQualityInspectionItemByObjIds" parameterType="String">