diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
index b86b790..1c9d5a3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.controller.quality;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,10 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO;
+import com.casic.missiles.enums.resource.LabCodeDictEnum;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +37,11 @@
     private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService;
     private final AbstractPermissionContext permissionContext;
 
+
     public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) {
         this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService;
         this.permissionContext = permissionContext;
+
     }
 
     /**
@@ -49,6 +55,19 @@
     }
 
     /**
+     * 部门选择接口
+     */
+    @ApiOperation("部门选择列表查询")
+    @GetMapping(value = "/deptList")
+    public ReturnDTO<List<BizLabRelDept>> labList(String labCode) {
+        QueryWrapper<BizLabRelDept> query = new QueryWrapper<>();
+        if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) {
+            query.eq("biz_lab_code", labCode);
+        }
+        return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query));
+    }
+
+    /**
      * 质量活动监督记录分页列表
      */
     @ApiOperation("分页查询")
@@ -64,7 +83,7 @@
     /**
      * 新增质量活动监督记录
      */
-    @ApiOperation("新增接口")
+    @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交")
     @PostMapping(value = "/add")
     public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) {
         AuthUser user = permissionContext.getAuthService().getLoginUser();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
index b86b790..1c9d5a3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.controller.quality;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,10 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO;
+import com.casic.missiles.enums.resource.LabCodeDictEnum;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +37,11 @@
     private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService;
     private final AbstractPermissionContext permissionContext;
 
+
     public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) {
         this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService;
         this.permissionContext = permissionContext;
+
     }
 
     /**
@@ -49,6 +55,19 @@
     }
 
     /**
+     * 部门选择接口
+     */
+    @ApiOperation("部门选择列表查询")
+    @GetMapping(value = "/deptList")
+    public ReturnDTO<List<BizLabRelDept>> labList(String labCode) {
+        QueryWrapper<BizLabRelDept> query = new QueryWrapper<>();
+        if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) {
+            query.eq("biz_lab_code", labCode);
+        }
+        return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query));
+    }
+
+    /**
      * 质量活动监督记录分页列表
      */
     @ApiOperation("分页查询")
@@ -64,7 +83,7 @@
     /**
      * 新增质量活动监督记录
      */
-    @ApiOperation("新增接口")
+    @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交")
     @PostMapping(value = "/add")
     public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
index 35e66ee..639199c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
@@ -5,7 +5,6 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
@@ -17,9 +16,6 @@
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
-
 
 /**
  * 质量活动模板管理控制器
@@ -71,8 +67,8 @@
      */
     @ApiOperation("模板添加")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-        bizQualityTemplateService.saveList(bizQualityTemplates);
+    public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.save(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
@@ -92,9 +88,8 @@
      */
     @ApiOperation("模板修改")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-
-        bizQualityTemplateService.saveOrUpdateList(bizQualityTemplates);
+    public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.updateById(bizQualityTemplate);
         return ReturnUtil.success();
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
index b86b790..1c9d5a3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.controller.quality;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,10 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO;
+import com.casic.missiles.enums.resource.LabCodeDictEnum;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +37,11 @@
     private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService;
     private final AbstractPermissionContext permissionContext;
 
+
     public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) {
         this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService;
         this.permissionContext = permissionContext;
+
     }
 
     /**
@@ -49,6 +55,19 @@
     }
 
     /**
+     * 部门选择接口
+     */
+    @ApiOperation("部门选择列表查询")
+    @GetMapping(value = "/deptList")
+    public ReturnDTO<List<BizLabRelDept>> labList(String labCode) {
+        QueryWrapper<BizLabRelDept> query = new QueryWrapper<>();
+        if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) {
+            query.eq("biz_lab_code", labCode);
+        }
+        return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query));
+    }
+
+    /**
      * 质量活动监督记录分页列表
      */
     @ApiOperation("分页查询")
@@ -64,7 +83,7 @@
     /**
      * 新增质量活动监督记录
      */
-    @ApiOperation("新增接口")
+    @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交")
     @PostMapping(value = "/add")
     public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
index 35e66ee..639199c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
@@ -5,7 +5,6 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
@@ -17,9 +16,6 @@
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
-
 
 /**
  * 质量活动模板管理控制器
@@ -71,8 +67,8 @@
      */
     @ApiOperation("模板添加")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-        bizQualityTemplateService.saveList(bizQualityTemplates);
+    public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.save(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
@@ -92,9 +88,8 @@
      */
     @ApiOperation("模板修改")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-
-        bizQualityTemplateService.saveOrUpdateList(bizQualityTemplates);
+    public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.updateById(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
index c16f721..1ffebdd 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.quality.BizQualityTemplate;
 import com.casic.missiles.model.quality.BizQualityTemplateItem;
 import com.casic.missiles.service.quality.IBizQualityTemplateItemService;
 import io.swagger.annotations.Api;
@@ -18,6 +19,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 质量模板明细控制器
@@ -60,16 +62,8 @@
      */
     @ApiOperation("新增接口")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setCreateTime(new Date());
-        bizQualityTemplateItem.setUpdateTime(new Date());
-
-        //模板不能为空
-        Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> {
-            throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL);
-        });
-        bizQualityTemplateItemService.save(bizQualityTemplateItem);
-
+    public ReturnDTO add(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
@@ -89,9 +83,8 @@
      */
     @ApiOperation("修改接口")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setUpdateTime(new Date());
-        bizQualityTemplateItemService.updateById(bizQualityTemplateItem);
+    public ReturnDTO update(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
index b86b790..1c9d5a3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.controller.quality;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,10 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO;
+import com.casic.missiles.enums.resource.LabCodeDictEnum;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +37,11 @@
     private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService;
     private final AbstractPermissionContext permissionContext;
 
+
     public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) {
         this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService;
         this.permissionContext = permissionContext;
+
     }
 
     /**
@@ -49,6 +55,19 @@
     }
 
     /**
+     * 部门选择接口
+     */
+    @ApiOperation("部门选择列表查询")
+    @GetMapping(value = "/deptList")
+    public ReturnDTO<List<BizLabRelDept>> labList(String labCode) {
+        QueryWrapper<BizLabRelDept> query = new QueryWrapper<>();
+        if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) {
+            query.eq("biz_lab_code", labCode);
+        }
+        return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query));
+    }
+
+    /**
      * 质量活动监督记录分页列表
      */
     @ApiOperation("分页查询")
@@ -64,7 +83,7 @@
     /**
      * 新增质量活动监督记录
      */
-    @ApiOperation("新增接口")
+    @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交")
     @PostMapping(value = "/add")
     public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
index 35e66ee..639199c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
@@ -5,7 +5,6 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
@@ -17,9 +16,6 @@
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
-
 
 /**
  * 质量活动模板管理控制器
@@ -71,8 +67,8 @@
      */
     @ApiOperation("模板添加")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-        bizQualityTemplateService.saveList(bizQualityTemplates);
+    public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.save(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
@@ -92,9 +88,8 @@
      */
     @ApiOperation("模板修改")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-
-        bizQualityTemplateService.saveOrUpdateList(bizQualityTemplates);
+    public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.updateById(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
index c16f721..1ffebdd 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.quality.BizQualityTemplate;
 import com.casic.missiles.model.quality.BizQualityTemplateItem;
 import com.casic.missiles.service.quality.IBizQualityTemplateItemService;
 import io.swagger.annotations.Api;
@@ -18,6 +19,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 质量模板明细控制器
@@ -60,16 +62,8 @@
      */
     @ApiOperation("新增接口")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setCreateTime(new Date());
-        bizQualityTemplateItem.setUpdateTime(new Date());
-
-        //模板不能为空
-        Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> {
-            throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL);
-        });
-        bizQualityTemplateItemService.save(bizQualityTemplateItem);
-
+    public ReturnDTO add(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
@@ -89,9 +83,8 @@
      */
     @ApiOperation("修改接口")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setUpdateTime(new Date());
-        bizQualityTemplateItemService.updateById(bizQualityTemplateItem);
+    public ReturnDTO update(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
index 6dfd648..c90dea6 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
@@ -4,23 +4,24 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.quality.BizLabRelDept">
-        <result column="id" property="id" />
-        <result column="biz_lab_code" property="bizLabCode" />
-        <result column="dept_id" property="deptId" />
+        <result column="id" property="id"/>
+        <result column="biz_lab_code" property="bizLabCode"/>
+        <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-            id ,
+        id
+        ,
             biz_lab_code as bizLabCode ,
-            dept_id as deptId 
+            dept_id as deptId
     </sql>
 
-    <select id="selectBizLabRelDeptPage"  resultType="com.casic.missiles.model.quality.BizLabRelDept">
+    <select id="selectBizLabRelDeptPage" resultType="com.casic.missiles.model.quality.BizLabRelDept">
         select
-                a.id ,
-                a.biz_lab_code as bizLabCode ,
-                a.dept_id as deptId 
+        a.id ,
+        a.biz_lab_code as bizLabCode,
+        a.dept_id as deptId,a.group_no as groupNo
         from biz_lab_rel_dept a
         <where>
             <if test="qw != null">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
index b86b790..1c9d5a3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.controller.quality;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,10 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO;
+import com.casic.missiles.enums.resource.LabCodeDictEnum;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +37,11 @@
     private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService;
     private final AbstractPermissionContext permissionContext;
 
+
     public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) {
         this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService;
         this.permissionContext = permissionContext;
+
     }
 
     /**
@@ -49,6 +55,19 @@
     }
 
     /**
+     * 部门选择接口
+     */
+    @ApiOperation("部门选择列表查询")
+    @GetMapping(value = "/deptList")
+    public ReturnDTO<List<BizLabRelDept>> labList(String labCode) {
+        QueryWrapper<BizLabRelDept> query = new QueryWrapper<>();
+        if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) {
+            query.eq("biz_lab_code", labCode);
+        }
+        return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query));
+    }
+
+    /**
      * 质量活动监督记录分页列表
      */
     @ApiOperation("分页查询")
@@ -64,7 +83,7 @@
     /**
      * 新增质量活动监督记录
      */
-    @ApiOperation("新增接口")
+    @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交")
     @PostMapping(value = "/add")
     public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
index 35e66ee..639199c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
@@ -5,7 +5,6 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
@@ -17,9 +16,6 @@
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
-
 
 /**
  * 质量活动模板管理控制器
@@ -71,8 +67,8 @@
      */
     @ApiOperation("模板添加")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-        bizQualityTemplateService.saveList(bizQualityTemplates);
+    public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.save(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
@@ -92,9 +88,8 @@
      */
     @ApiOperation("模板修改")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-
-        bizQualityTemplateService.saveOrUpdateList(bizQualityTemplates);
+    public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.updateById(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
index c16f721..1ffebdd 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.quality.BizQualityTemplate;
 import com.casic.missiles.model.quality.BizQualityTemplateItem;
 import com.casic.missiles.service.quality.IBizQualityTemplateItemService;
 import io.swagger.annotations.Api;
@@ -18,6 +19,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 质量模板明细控制器
@@ -60,16 +62,8 @@
      */
     @ApiOperation("新增接口")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setCreateTime(new Date());
-        bizQualityTemplateItem.setUpdateTime(new Date());
-
-        //模板不能为空
-        Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> {
-            throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL);
-        });
-        bizQualityTemplateItemService.save(bizQualityTemplateItem);
-
+    public ReturnDTO add(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
@@ -89,9 +83,8 @@
      */
     @ApiOperation("修改接口")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setUpdateTime(new Date());
-        bizQualityTemplateItemService.updateById(bizQualityTemplateItem);
+    public ReturnDTO update(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
index 6dfd648..c90dea6 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
@@ -4,23 +4,24 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.quality.BizLabRelDept">
-        <result column="id" property="id" />
-        <result column="biz_lab_code" property="bizLabCode" />
-        <result column="dept_id" property="deptId" />
+        <result column="id" property="id"/>
+        <result column="biz_lab_code" property="bizLabCode"/>
+        <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-            id ,
+        id
+        ,
             biz_lab_code as bizLabCode ,
-            dept_id as deptId 
+            dept_id as deptId
     </sql>
 
-    <select id="selectBizLabRelDeptPage"  resultType="com.casic.missiles.model.quality.BizLabRelDept">
+    <select id="selectBizLabRelDeptPage" resultType="com.casic.missiles.model.quality.BizLabRelDept">
         select
-                a.id ,
-                a.biz_lab_code as bizLabCode ,
-                a.dept_id as deptId 
+        a.id ,
+        a.biz_lab_code as bizLabCode,
+        a.dept_id as deptId,a.group_no as groupNo
         from biz_lab_rel_dept a
         <where>
             <if test="qw != null">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
index 12fe8e9..ca25514 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
@@ -21,24 +21,33 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "主键" , dataType = "Long")
+    @ApiModelProperty(value = "主键", dataType = "Long")
     @TableField("id")
     private Long id;
 
     /**
      * 部门字典值
      */
-    @ApiModelProperty(value = "部门字典值" , dataType = "String")
+    @ApiModelProperty(value = "部门字典值", dataType = "String")
     @TableField("biz_lab_code")
     private String bizLabCode;
 
     /**
      * 组织机构ID
      */
-    @ApiModelProperty(value = "组织机构ID" , dataType = "Long")
+    @ApiModelProperty(value = "组织机构ID", dataType = "Long")
     @TableField("dept_id")
     private Long deptId;
 
+    @ApiModelProperty(value = "组织机构名称", dataType = "Long")
+    @TableField(exist = false)
+    private String deptName;
+    /**
+     * 组别代码
+     */
+    @ApiModelProperty(value = "组别代码", dataType = "Long")
+    @TableField("group_no")
+    private String groupNo;
 
     @Override
     public String toString() {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
index b86b790..1c9d5a3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.controller.quality;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,10 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO;
+import com.casic.missiles.enums.resource.LabCodeDictEnum;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +37,11 @@
     private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService;
     private final AbstractPermissionContext permissionContext;
 
+
     public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) {
         this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService;
         this.permissionContext = permissionContext;
+
     }
 
     /**
@@ -49,6 +55,19 @@
     }
 
     /**
+     * 部门选择接口
+     */
+    @ApiOperation("部门选择列表查询")
+    @GetMapping(value = "/deptList")
+    public ReturnDTO<List<BizLabRelDept>> labList(String labCode) {
+        QueryWrapper<BizLabRelDept> query = new QueryWrapper<>();
+        if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) {
+            query.eq("biz_lab_code", labCode);
+        }
+        return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query));
+    }
+
+    /**
      * 质量活动监督记录分页列表
      */
     @ApiOperation("分页查询")
@@ -64,7 +83,7 @@
     /**
      * 新增质量活动监督记录
      */
-    @ApiOperation("新增接口")
+    @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交")
     @PostMapping(value = "/add")
     public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
index 35e66ee..639199c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
@@ -5,7 +5,6 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
@@ -17,9 +16,6 @@
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
-
 
 /**
  * 质量活动模板管理控制器
@@ -71,8 +67,8 @@
      */
     @ApiOperation("模板添加")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-        bizQualityTemplateService.saveList(bizQualityTemplates);
+    public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.save(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
@@ -92,9 +88,8 @@
      */
     @ApiOperation("模板修改")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-
-        bizQualityTemplateService.saveOrUpdateList(bizQualityTemplates);
+    public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.updateById(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
index c16f721..1ffebdd 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.quality.BizQualityTemplate;
 import com.casic.missiles.model.quality.BizQualityTemplateItem;
 import com.casic.missiles.service.quality.IBizQualityTemplateItemService;
 import io.swagger.annotations.Api;
@@ -18,6 +19,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 质量模板明细控制器
@@ -60,16 +62,8 @@
      */
     @ApiOperation("新增接口")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setCreateTime(new Date());
-        bizQualityTemplateItem.setUpdateTime(new Date());
-
-        //模板不能为空
-        Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> {
-            throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL);
-        });
-        bizQualityTemplateItemService.save(bizQualityTemplateItem);
-
+    public ReturnDTO add(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
@@ -89,9 +83,8 @@
      */
     @ApiOperation("修改接口")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setUpdateTime(new Date());
-        bizQualityTemplateItemService.updateById(bizQualityTemplateItem);
+    public ReturnDTO update(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
index 6dfd648..c90dea6 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
@@ -4,23 +4,24 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.quality.BizLabRelDept">
-        <result column="id" property="id" />
-        <result column="biz_lab_code" property="bizLabCode" />
-        <result column="dept_id" property="deptId" />
+        <result column="id" property="id"/>
+        <result column="biz_lab_code" property="bizLabCode"/>
+        <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-            id ,
+        id
+        ,
             biz_lab_code as bizLabCode ,
-            dept_id as deptId 
+            dept_id as deptId
     </sql>
 
-    <select id="selectBizLabRelDeptPage"  resultType="com.casic.missiles.model.quality.BizLabRelDept">
+    <select id="selectBizLabRelDeptPage" resultType="com.casic.missiles.model.quality.BizLabRelDept">
         select
-                a.id ,
-                a.biz_lab_code as bizLabCode ,
-                a.dept_id as deptId 
+        a.id ,
+        a.biz_lab_code as bizLabCode,
+        a.dept_id as deptId,a.group_no as groupNo
         from biz_lab_rel_dept a
         <where>
             <if test="qw != null">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
index 12fe8e9..ca25514 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
@@ -21,24 +21,33 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "主键" , dataType = "Long")
+    @ApiModelProperty(value = "主键", dataType = "Long")
     @TableField("id")
     private Long id;
 
     /**
      * 部门字典值
      */
-    @ApiModelProperty(value = "部门字典值" , dataType = "String")
+    @ApiModelProperty(value = "部门字典值", dataType = "String")
     @TableField("biz_lab_code")
     private String bizLabCode;
 
     /**
      * 组织机构ID
      */
-    @ApiModelProperty(value = "组织机构ID" , dataType = "Long")
+    @ApiModelProperty(value = "组织机构ID", dataType = "Long")
     @TableField("dept_id")
     private Long deptId;
 
+    @ApiModelProperty(value = "组织机构名称", dataType = "Long")
+    @TableField(exist = false)
+    private String deptName;
+    /**
+     * 组别代码
+     */
+    @ApiModelProperty(value = "组别代码", dataType = "Long")
+    @TableField("group_no")
+    private String groupNo;
 
     @Override
     public String toString() {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
index 7237184..3769fa1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
@@ -4,10 +4,13 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.enums.quality.QualityFileNoEnum;
 import com.casic.missiles.enums.quality.QualityFileTypeEnum;
 import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.stereotype.Service;
@@ -25,6 +28,13 @@
  */
 @Service
 public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl<BizQualitySupervisionRecordMapper, BizQualitySupervisionRecord> implements IBizQualitySupervisionRecordService {
+    private final IBizLabRelDeptService relDeptService;
+    private final AbstractPermissionContext permissionContext;
+
+    public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) {
+        this.relDeptService = relDeptService;
+        this.permissionContext = permissionContext;
+    }
 
     @Override
     public List<BizQualitySupervisionRecord> selectBizQualitySupervisionRecordPage(QueryWrapper<BizQualitySupervisionRecord> query, Page<BizQualitySupervisionRecord> page) {
@@ -37,6 +47,15 @@
     }
 
     @Override
+    public List<BizLabRelDept> labList(QueryWrapper<BizLabRelDept> query) {
+        List<BizLabRelDept> deptList = relDeptService.list(query);
+        for (BizLabRelDept bizLabRelDept : deptList) {
+            bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId()));
+        }
+        return deptList;
+    }
+
+    @Override
     public boolean save(BizQualitySupervisionRecord entity) {
         //生成文件编码 系统号类同
         //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
index b86b790..1c9d5a3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.controller.quality;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,10 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO;
+import com.casic.missiles.enums.resource.LabCodeDictEnum;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +37,11 @@
     private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService;
     private final AbstractPermissionContext permissionContext;
 
+
     public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) {
         this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService;
         this.permissionContext = permissionContext;
+
     }
 
     /**
@@ -49,6 +55,19 @@
     }
 
     /**
+     * 部门选择接口
+     */
+    @ApiOperation("部门选择列表查询")
+    @GetMapping(value = "/deptList")
+    public ReturnDTO<List<BizLabRelDept>> labList(String labCode) {
+        QueryWrapper<BizLabRelDept> query = new QueryWrapper<>();
+        if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) {
+            query.eq("biz_lab_code", labCode);
+        }
+        return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query));
+    }
+
+    /**
      * 质量活动监督记录分页列表
      */
     @ApiOperation("分页查询")
@@ -64,7 +83,7 @@
     /**
      * 新增质量活动监督记录
      */
-    @ApiOperation("新增接口")
+    @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交")
     @PostMapping(value = "/add")
     public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
index 35e66ee..639199c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
@@ -5,7 +5,6 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
@@ -17,9 +16,6 @@
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
-
 
 /**
  * 质量活动模板管理控制器
@@ -71,8 +67,8 @@
      */
     @ApiOperation("模板添加")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-        bizQualityTemplateService.saveList(bizQualityTemplates);
+    public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.save(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
@@ -92,9 +88,8 @@
      */
     @ApiOperation("模板修改")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-
-        bizQualityTemplateService.saveOrUpdateList(bizQualityTemplates);
+    public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.updateById(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
index c16f721..1ffebdd 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.quality.BizQualityTemplate;
 import com.casic.missiles.model.quality.BizQualityTemplateItem;
 import com.casic.missiles.service.quality.IBizQualityTemplateItemService;
 import io.swagger.annotations.Api;
@@ -18,6 +19,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 质量模板明细控制器
@@ -60,16 +62,8 @@
      */
     @ApiOperation("新增接口")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setCreateTime(new Date());
-        bizQualityTemplateItem.setUpdateTime(new Date());
-
-        //模板不能为空
-        Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> {
-            throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL);
-        });
-        bizQualityTemplateItemService.save(bizQualityTemplateItem);
-
+    public ReturnDTO add(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
@@ -89,9 +83,8 @@
      */
     @ApiOperation("修改接口")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setUpdateTime(new Date());
-        bizQualityTemplateItemService.updateById(bizQualityTemplateItem);
+    public ReturnDTO update(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
index 6dfd648..c90dea6 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
@@ -4,23 +4,24 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.quality.BizLabRelDept">
-        <result column="id" property="id" />
-        <result column="biz_lab_code" property="bizLabCode" />
-        <result column="dept_id" property="deptId" />
+        <result column="id" property="id"/>
+        <result column="biz_lab_code" property="bizLabCode"/>
+        <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-            id ,
+        id
+        ,
             biz_lab_code as bizLabCode ,
-            dept_id as deptId 
+            dept_id as deptId
     </sql>
 
-    <select id="selectBizLabRelDeptPage"  resultType="com.casic.missiles.model.quality.BizLabRelDept">
+    <select id="selectBizLabRelDeptPage" resultType="com.casic.missiles.model.quality.BizLabRelDept">
         select
-                a.id ,
-                a.biz_lab_code as bizLabCode ,
-                a.dept_id as deptId 
+        a.id ,
+        a.biz_lab_code as bizLabCode,
+        a.dept_id as deptId,a.group_no as groupNo
         from biz_lab_rel_dept a
         <where>
             <if test="qw != null">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
index 12fe8e9..ca25514 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
@@ -21,24 +21,33 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "主键" , dataType = "Long")
+    @ApiModelProperty(value = "主键", dataType = "Long")
     @TableField("id")
     private Long id;
 
     /**
      * 部门字典值
      */
-    @ApiModelProperty(value = "部门字典值" , dataType = "String")
+    @ApiModelProperty(value = "部门字典值", dataType = "String")
     @TableField("biz_lab_code")
     private String bizLabCode;
 
     /**
      * 组织机构ID
      */
-    @ApiModelProperty(value = "组织机构ID" , dataType = "Long")
+    @ApiModelProperty(value = "组织机构ID", dataType = "Long")
     @TableField("dept_id")
     private Long deptId;
 
+    @ApiModelProperty(value = "组织机构名称", dataType = "Long")
+    @TableField(exist = false)
+    private String deptName;
+    /**
+     * 组别代码
+     */
+    @ApiModelProperty(value = "组别代码", dataType = "Long")
+    @TableField("group_no")
+    private String groupNo;
 
     @Override
     public String toString() {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
index 7237184..3769fa1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
@@ -4,10 +4,13 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.enums.quality.QualityFileNoEnum;
 import com.casic.missiles.enums.quality.QualityFileTypeEnum;
 import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.stereotype.Service;
@@ -25,6 +28,13 @@
  */
 @Service
 public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl<BizQualitySupervisionRecordMapper, BizQualitySupervisionRecord> implements IBizQualitySupervisionRecordService {
+    private final IBizLabRelDeptService relDeptService;
+    private final AbstractPermissionContext permissionContext;
+
+    public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) {
+        this.relDeptService = relDeptService;
+        this.permissionContext = permissionContext;
+    }
 
     @Override
     public List<BizQualitySupervisionRecord> selectBizQualitySupervisionRecordPage(QueryWrapper<BizQualitySupervisionRecord> query, Page<BizQualitySupervisionRecord> page) {
@@ -37,6 +47,15 @@
     }
 
     @Override
+    public List<BizLabRelDept> labList(QueryWrapper<BizLabRelDept> query) {
+        List<BizLabRelDept> deptList = relDeptService.list(query);
+        for (BizLabRelDept bizLabRelDept : deptList) {
+            bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId()));
+        }
+        return deptList;
+    }
+
+    @Override
     public boolean save(BizQualitySupervisionRecord entity) {
         //生成文件编码 系统号类同
         //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java
index a730958..273a88b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java
@@ -7,6 +7,9 @@
 import com.casic.missiles.service.quality.IBizQualityTemplateItemService;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 质量活动模板项 服务实现类
@@ -18,4 +21,23 @@
 @Service
 public class BizQualityTemplateItemServiceImpl extends ServiceImpl<BizQualityTemplateItemMapper, BizQualityTemplateItem> implements IBizQualityTemplateItemService {
 
+    @Override
+    public void saveList(List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) {
+            bizQualityTemplateItem.setCreateTime(new Date());
+            bizQualityTemplateItem.setUpdateTime(new Date());
+        }
+        saveBatch(bizQualityTemplateItems);
+    }
+
+    @Override
+    public void saveOrUpdateList(List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) {
+            bizQualityTemplateItem.setCreateTime(new Date());
+            if (bizQualityTemplateItem.getId() != null) {
+                bizQualityTemplateItem.setUpdateTime(new Date());
+            }
+        }
+        saveOrUpdateBatch(bizQualityTemplateItems);
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
index b86b790..1c9d5a3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.controller.quality;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,10 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO;
+import com.casic.missiles.enums.resource.LabCodeDictEnum;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +37,11 @@
     private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService;
     private final AbstractPermissionContext permissionContext;
 
+
     public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) {
         this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService;
         this.permissionContext = permissionContext;
+
     }
 
     /**
@@ -49,6 +55,19 @@
     }
 
     /**
+     * 部门选择接口
+     */
+    @ApiOperation("部门选择列表查询")
+    @GetMapping(value = "/deptList")
+    public ReturnDTO<List<BizLabRelDept>> labList(String labCode) {
+        QueryWrapper<BizLabRelDept> query = new QueryWrapper<>();
+        if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) {
+            query.eq("biz_lab_code", labCode);
+        }
+        return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query));
+    }
+
+    /**
      * 质量活动监督记录分页列表
      */
     @ApiOperation("分页查询")
@@ -64,7 +83,7 @@
     /**
      * 新增质量活动监督记录
      */
-    @ApiOperation("新增接口")
+    @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交")
     @PostMapping(value = "/add")
     public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
index 35e66ee..639199c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
@@ -5,7 +5,6 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
@@ -17,9 +16,6 @@
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
-
 
 /**
  * 质量活动模板管理控制器
@@ -71,8 +67,8 @@
      */
     @ApiOperation("模板添加")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-        bizQualityTemplateService.saveList(bizQualityTemplates);
+    public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.save(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
@@ -92,9 +88,8 @@
      */
     @ApiOperation("模板修改")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-
-        bizQualityTemplateService.saveOrUpdateList(bizQualityTemplates);
+    public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.updateById(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
index c16f721..1ffebdd 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.quality.BizQualityTemplate;
 import com.casic.missiles.model.quality.BizQualityTemplateItem;
 import com.casic.missiles.service.quality.IBizQualityTemplateItemService;
 import io.swagger.annotations.Api;
@@ -18,6 +19,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 质量模板明细控制器
@@ -60,16 +62,8 @@
      */
     @ApiOperation("新增接口")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setCreateTime(new Date());
-        bizQualityTemplateItem.setUpdateTime(new Date());
-
-        //模板不能为空
-        Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> {
-            throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL);
-        });
-        bizQualityTemplateItemService.save(bizQualityTemplateItem);
-
+    public ReturnDTO add(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
@@ -89,9 +83,8 @@
      */
     @ApiOperation("修改接口")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setUpdateTime(new Date());
-        bizQualityTemplateItemService.updateById(bizQualityTemplateItem);
+    public ReturnDTO update(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
index 6dfd648..c90dea6 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
@@ -4,23 +4,24 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.quality.BizLabRelDept">
-        <result column="id" property="id" />
-        <result column="biz_lab_code" property="bizLabCode" />
-        <result column="dept_id" property="deptId" />
+        <result column="id" property="id"/>
+        <result column="biz_lab_code" property="bizLabCode"/>
+        <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-            id ,
+        id
+        ,
             biz_lab_code as bizLabCode ,
-            dept_id as deptId 
+            dept_id as deptId
     </sql>
 
-    <select id="selectBizLabRelDeptPage"  resultType="com.casic.missiles.model.quality.BizLabRelDept">
+    <select id="selectBizLabRelDeptPage" resultType="com.casic.missiles.model.quality.BizLabRelDept">
         select
-                a.id ,
-                a.biz_lab_code as bizLabCode ,
-                a.dept_id as deptId 
+        a.id ,
+        a.biz_lab_code as bizLabCode,
+        a.dept_id as deptId,a.group_no as groupNo
         from biz_lab_rel_dept a
         <where>
             <if test="qw != null">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
index 12fe8e9..ca25514 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
@@ -21,24 +21,33 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "主键" , dataType = "Long")
+    @ApiModelProperty(value = "主键", dataType = "Long")
     @TableField("id")
     private Long id;
 
     /**
      * 部门字典值
      */
-    @ApiModelProperty(value = "部门字典值" , dataType = "String")
+    @ApiModelProperty(value = "部门字典值", dataType = "String")
     @TableField("biz_lab_code")
     private String bizLabCode;
 
     /**
      * 组织机构ID
      */
-    @ApiModelProperty(value = "组织机构ID" , dataType = "Long")
+    @ApiModelProperty(value = "组织机构ID", dataType = "Long")
     @TableField("dept_id")
     private Long deptId;
 
+    @ApiModelProperty(value = "组织机构名称", dataType = "Long")
+    @TableField(exist = false)
+    private String deptName;
+    /**
+     * 组别代码
+     */
+    @ApiModelProperty(value = "组别代码", dataType = "Long")
+    @TableField("group_no")
+    private String groupNo;
 
     @Override
     public String toString() {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
index 7237184..3769fa1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
@@ -4,10 +4,13 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.enums.quality.QualityFileNoEnum;
 import com.casic.missiles.enums.quality.QualityFileTypeEnum;
 import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.stereotype.Service;
@@ -25,6 +28,13 @@
  */
 @Service
 public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl<BizQualitySupervisionRecordMapper, BizQualitySupervisionRecord> implements IBizQualitySupervisionRecordService {
+    private final IBizLabRelDeptService relDeptService;
+    private final AbstractPermissionContext permissionContext;
+
+    public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) {
+        this.relDeptService = relDeptService;
+        this.permissionContext = permissionContext;
+    }
 
     @Override
     public List<BizQualitySupervisionRecord> selectBizQualitySupervisionRecordPage(QueryWrapper<BizQualitySupervisionRecord> query, Page<BizQualitySupervisionRecord> page) {
@@ -37,6 +47,15 @@
     }
 
     @Override
+    public List<BizLabRelDept> labList(QueryWrapper<BizLabRelDept> query) {
+        List<BizLabRelDept> deptList = relDeptService.list(query);
+        for (BizLabRelDept bizLabRelDept : deptList) {
+            bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId()));
+        }
+        return deptList;
+    }
+
+    @Override
     public boolean save(BizQualitySupervisionRecord entity) {
         //生成文件编码 系统号类同
         //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java
index a730958..273a88b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java
@@ -7,6 +7,9 @@
 import com.casic.missiles.service.quality.IBizQualityTemplateItemService;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 质量活动模板项 服务实现类
@@ -18,4 +21,23 @@
 @Service
 public class BizQualityTemplateItemServiceImpl extends ServiceImpl<BizQualityTemplateItemMapper, BizQualityTemplateItem> implements IBizQualityTemplateItemService {
 
+    @Override
+    public void saveList(List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) {
+            bizQualityTemplateItem.setCreateTime(new Date());
+            bizQualityTemplateItem.setUpdateTime(new Date());
+        }
+        saveBatch(bizQualityTemplateItems);
+    }
+
+    @Override
+    public void saveOrUpdateList(List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) {
+            bizQualityTemplateItem.setCreateTime(new Date());
+            if (bizQualityTemplateItem.getId() != null) {
+                bizQualityTemplateItem.setUpdateTime(new Date());
+            }
+        }
+        saveOrUpdateBatch(bizQualityTemplateItems);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java
index a62bb40..513bf8f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
 
 import java.util.List;
@@ -29,4 +30,6 @@
      * @return
      */
     Long selectMaxNo(QueryWrapper<BizQualitySupervisionRecord> query);
+
+    List<BizLabRelDept> labList(QueryWrapper<BizLabRelDept> query);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
index b86b790..1c9d5a3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.controller.quality;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,10 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.quality.BizQualitySupervisionRecordVO;
+import com.casic.missiles.enums.resource.LabCodeDictEnum;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +37,11 @@
     private final IBizQualitySupervisionRecordService bizQualitySupervisionRecordService;
     private final AbstractPermissionContext permissionContext;
 
+
     public BizQualitySupervisionRecordController(IBizQualitySupervisionRecordService bizQualitySupervisionRecordService, AbstractPermissionContext permissionContext) {
         this.bizQualitySupervisionRecordService = bizQualitySupervisionRecordService;
         this.permissionContext = permissionContext;
+
     }
 
     /**
@@ -49,6 +55,19 @@
     }
 
     /**
+     * 部门选择接口
+     */
+    @ApiOperation("部门选择列表查询")
+    @GetMapping(value = "/deptList")
+    public ReturnDTO<List<BizLabRelDept>> labList(String labCode) {
+        QueryWrapper<BizLabRelDept> query = new QueryWrapper<>();
+        if (StrUtil.isNotEmpty(labCode) && !LabCodeDictEnum.A.getCode().equals(labCode)) {
+            query.eq("biz_lab_code", labCode);
+        }
+        return ReturnUtil.success(bizQualitySupervisionRecordService.labList(query));
+    }
+
+    /**
      * 质量活动监督记录分页列表
      */
     @ApiOperation("分页查询")
@@ -64,7 +83,7 @@
     /**
      * 新增质量活动监督记录
      */
-    @ApiOperation("新增接口")
+    @ApiOperation(value = "新增接口", notes = "选择全部时,如果选择组织后需将实验室更新为具体的实验室进行提交")
     @PostMapping(value = "/add")
     public ReturnDTO add(@RequestBody BizQualitySupervisionRecord bizQualitySupervisionRecord) {
         AuthUser user = permissionContext.getAuthService().getLoginUser();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
index 35e66ee..639199c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateController.java
@@ -5,7 +5,6 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.ReturnDTO;
@@ -17,9 +16,6 @@
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
-
 
 /**
  * 质量活动模板管理控制器
@@ -71,8 +67,8 @@
      */
     @ApiOperation("模板添加")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-        bizQualityTemplateService.saveList(bizQualityTemplates);
+    public ReturnDTO add(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.save(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
@@ -92,9 +88,8 @@
      */
     @ApiOperation("模板修改")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody List<BizQualityTemplate> bizQualityTemplates) {
-
-        bizQualityTemplateService.saveOrUpdateList(bizQualityTemplates);
+    public ReturnDTO update(@RequestBody BizQualityTemplate bizQualityTemplate) {
+        bizQualityTemplateService.updateById(bizQualityTemplate);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
index c16f721..1ffebdd 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityTemplateItemController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.quality.BizQualityTemplate;
 import com.casic.missiles.model.quality.BizQualityTemplateItem;
 import com.casic.missiles.service.quality.IBizQualityTemplateItemService;
 import io.swagger.annotations.Api;
@@ -18,6 +19,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 质量模板明细控制器
@@ -60,16 +62,8 @@
      */
     @ApiOperation("新增接口")
     @PostMapping(value = "/add")
-    public ReturnDTO add(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setCreateTime(new Date());
-        bizQualityTemplateItem.setUpdateTime(new Date());
-
-        //模板不能为空
-        Assert.isFalse(bizQualityTemplateItem.getTemId() == null, () -> {
-            throw new BusinessException(BusinessExceptionEnum.PARAMS_NULL);
-        });
-        bizQualityTemplateItemService.save(bizQualityTemplateItem);
-
+    public ReturnDTO add(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
@@ -89,9 +83,8 @@
      */
     @ApiOperation("修改接口")
     @PostMapping(value = "/update")
-    public ReturnDTO update(@RequestBody BizQualityTemplateItem bizQualityTemplateItem) {
-        bizQualityTemplateItem.setUpdateTime(new Date());
-        bizQualityTemplateItemService.updateById(bizQualityTemplateItem);
+    public ReturnDTO update(@RequestBody List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        bizQualityTemplateItemService.saveOrUpdateList(bizQualityTemplateItems);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
index 6dfd648..c90dea6 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizLabRelDeptMapper.xml
@@ -4,23 +4,24 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.quality.BizLabRelDept">
-        <result column="id" property="id" />
-        <result column="biz_lab_code" property="bizLabCode" />
-        <result column="dept_id" property="deptId" />
+        <result column="id" property="id"/>
+        <result column="biz_lab_code" property="bizLabCode"/>
+        <result column="dept_id" property="deptId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-            id ,
+        id
+        ,
             biz_lab_code as bizLabCode ,
-            dept_id as deptId 
+            dept_id as deptId
     </sql>
 
-    <select id="selectBizLabRelDeptPage"  resultType="com.casic.missiles.model.quality.BizLabRelDept">
+    <select id="selectBizLabRelDeptPage" resultType="com.casic.missiles.model.quality.BizLabRelDept">
         select
-                a.id ,
-                a.biz_lab_code as bizLabCode ,
-                a.dept_id as deptId 
+        a.id ,
+        a.biz_lab_code as bizLabCode,
+        a.dept_id as deptId,a.group_no as groupNo
         from biz_lab_rel_dept a
         <where>
             <if test="qw != null">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
index 12fe8e9..ca25514 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizLabRelDept.java
@@ -21,24 +21,33 @@
     /**
      * 主键
      */
-    @ApiModelProperty(value = "主键" , dataType = "Long")
+    @ApiModelProperty(value = "主键", dataType = "Long")
     @TableField("id")
     private Long id;
 
     /**
      * 部门字典值
      */
-    @ApiModelProperty(value = "部门字典值" , dataType = "String")
+    @ApiModelProperty(value = "部门字典值", dataType = "String")
     @TableField("biz_lab_code")
     private String bizLabCode;
 
     /**
      * 组织机构ID
      */
-    @ApiModelProperty(value = "组织机构ID" , dataType = "Long")
+    @ApiModelProperty(value = "组织机构ID", dataType = "Long")
     @TableField("dept_id")
     private Long deptId;
 
+    @ApiModelProperty(value = "组织机构名称", dataType = "Long")
+    @TableField(exist = false)
+    private String deptName;
+    /**
+     * 组别代码
+     */
+    @ApiModelProperty(value = "组别代码", dataType = "Long")
+    @TableField("group_no")
+    private String groupNo;
 
     @Override
     public String toString() {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
index 7237184..3769fa1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java
@@ -4,10 +4,13 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.enums.quality.QualityFileNoEnum;
 import com.casic.missiles.enums.quality.QualityFileTypeEnum;
 import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
+import com.casic.missiles.service.quality.IBizLabRelDeptService;
 import com.casic.missiles.service.quality.IBizQualitySupervisionRecordService;
 import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.stereotype.Service;
@@ -25,6 +28,13 @@
  */
 @Service
 public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl<BizQualitySupervisionRecordMapper, BizQualitySupervisionRecord> implements IBizQualitySupervisionRecordService {
+    private final IBizLabRelDeptService relDeptService;
+    private final AbstractPermissionContext permissionContext;
+
+    public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext) {
+        this.relDeptService = relDeptService;
+        this.permissionContext = permissionContext;
+    }
 
     @Override
     public List<BizQualitySupervisionRecord> selectBizQualitySupervisionRecordPage(QueryWrapper<BizQualitySupervisionRecord> query, Page<BizQualitySupervisionRecord> page) {
@@ -37,6 +47,15 @@
     }
 
     @Override
+    public List<BizLabRelDept> labList(QueryWrapper<BizLabRelDept> query) {
+        List<BizLabRelDept> deptList = relDeptService.list(query);
+        for (BizLabRelDept bizLabRelDept : deptList) {
+            bizLabRelDept.setDeptName(permissionContext.getDeptService().getDeptName(bizLabRelDept.getDeptId()));
+        }
+        return deptList;
+    }
+
+    @Override
     public boolean save(BizQualitySupervisionRecord entity) {
         //生成文件编码 系统号类同
         //生成文件前缀 文件编号+实验室代码+记录分类识别码+组别代码+年号+三位流水号
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java
index a730958..273a88b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityTemplateItemServiceImpl.java
@@ -7,6 +7,9 @@
 import com.casic.missiles.service.quality.IBizQualityTemplateItemService;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 质量活动模板项 服务实现类
@@ -18,4 +21,23 @@
 @Service
 public class BizQualityTemplateItemServiceImpl extends ServiceImpl<BizQualityTemplateItemMapper, BizQualityTemplateItem> implements IBizQualityTemplateItemService {
 
+    @Override
+    public void saveList(List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) {
+            bizQualityTemplateItem.setCreateTime(new Date());
+            bizQualityTemplateItem.setUpdateTime(new Date());
+        }
+        saveBatch(bizQualityTemplateItems);
+    }
+
+    @Override
+    public void saveOrUpdateList(List<BizQualityTemplateItem> bizQualityTemplateItems) {
+        for (BizQualityTemplateItem bizQualityTemplateItem : bizQualityTemplateItems) {
+            bizQualityTemplateItem.setCreateTime(new Date());
+            if (bizQualityTemplateItem.getId() != null) {
+                bizQualityTemplateItem.setUpdateTime(new Date());
+            }
+        }
+        saveOrUpdateBatch(bizQualityTemplateItems);
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java
index a62bb40..513bf8f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.model.quality.BizLabRelDept;
 import com.casic.missiles.model.quality.BizQualitySupervisionRecord;
 
 import java.util.List;
@@ -29,4 +30,6 @@
      * @return
      */
     Long selectMaxNo(QueryWrapper<BizQualitySupervisionRecord> query);
+
+    List<BizLabRelDept> labList(QueryWrapper<BizLabRelDept> query);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java
index e32d9bb..6effcb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityTemplateItemService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.model.quality.BizQualityTemplateItem;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -14,4 +16,11 @@
  */
 public interface IBizQualityTemplateItemService extends IService<BizQualityTemplateItem> {
 
+    /**
+     * 保存列表
+     * @param bizQualityTemplateItems
+     */
+    void saveList(List<BizQualityTemplateItem> bizQualityTemplateItems);
+
+    void saveOrUpdateList(List<BizQualityTemplateItem> bizQualityTemplateItems);
 }