diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
index 351ee29..f796007 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
@@ -3,16 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
  * 现场检测记录表
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Data
@@ -27,66 +29,77 @@
     /**
      * 现场检测记录单编号
      */
+    @ApiModelProperty(value = "现场检测记录单编号", dataType = "String")
     @TableField("log_no")
     private String logNo;
 
     /**
      * 现场检测id
      */
+    @ApiModelProperty(value = "现场检测id", dataType = "String")
     @TableField("site_executive_id")
     private String siteExecutiveId;
 
     /**
      * 联系人
      */
+    @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
 
     /**
      * 电话
      */
+    @ApiModelProperty(value = "电话", dataType = "String")
     @TableField("contact_hone")
     private String contactHone;
 
     /**
      * 现场工作地点
      */
+    @ApiModelProperty(value = "现场工作地点", dataType = "String")
     @TableField("executive_address")
     private String executiveAddress;
 
     /**
      * 输出电压
      */
+    @ApiModelProperty(value = "输出电压", dataType = "String")
     @TableField("output_voltage")
     private String outputVoltage;
 
     /**
      * 零地电压
      */
+    @ApiModelProperty(value = "零地电压", dataType = "String")
     @TableField("zero_ground_voltage")
     private String zeroGroundVoltage;
 
     /**
      * 温度
      */
+    @ApiModelProperty(value = "温度", dataType = "String")
     @TableField("temperature")
     private String temperature;
 
     /**
      * 湿度
      */
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 删除标记
      */
+    @ApiModelProperty(value = "删除标记", dataType = "String")
     @TableField("is_del")
     private String isDel;
 
@@ -102,5 +115,40 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user")
+    private Long createUser;
 
+    /**
+     * 记录人
+     */
+    @ApiModelProperty(value = "记录人", dataType = "Long")
+    @TableField("recorder")
+    private Long recorder;
+
+    /**
+     * 记录时间
+     */
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @TableField("record_time")
+    private String recordTime;
+
+    /**
+     * 实验室
+     */
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    @TableField("laboratory_id")
+    private String laboratoryId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "携带仪器设备", dataType = "List")
+    private List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "记录人名称", dataType = "String")
+    private String recorderName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String laboratoryName;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
index 351ee29..f796007 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
@@ -3,16 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
  * 现场检测记录表
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Data
@@ -27,66 +29,77 @@
     /**
      * 现场检测记录单编号
      */
+    @ApiModelProperty(value = "现场检测记录单编号", dataType = "String")
     @TableField("log_no")
     private String logNo;
 
     /**
      * 现场检测id
      */
+    @ApiModelProperty(value = "现场检测id", dataType = "String")
     @TableField("site_executive_id")
     private String siteExecutiveId;
 
     /**
      * 联系人
      */
+    @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
 
     /**
      * 电话
      */
+    @ApiModelProperty(value = "电话", dataType = "String")
     @TableField("contact_hone")
     private String contactHone;
 
     /**
      * 现场工作地点
      */
+    @ApiModelProperty(value = "现场工作地点", dataType = "String")
     @TableField("executive_address")
     private String executiveAddress;
 
     /**
      * 输出电压
      */
+    @ApiModelProperty(value = "输出电压", dataType = "String")
     @TableField("output_voltage")
     private String outputVoltage;
 
     /**
      * 零地电压
      */
+    @ApiModelProperty(value = "零地电压", dataType = "String")
     @TableField("zero_ground_voltage")
     private String zeroGroundVoltage;
 
     /**
      * 温度
      */
+    @ApiModelProperty(value = "温度", dataType = "String")
     @TableField("temperature")
     private String temperature;
 
     /**
      * 湿度
      */
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 删除标记
      */
+    @ApiModelProperty(value = "删除标记", dataType = "String")
     @TableField("is_del")
     private String isDel;
 
@@ -102,5 +115,40 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user")
+    private Long createUser;
 
+    /**
+     * 记录人
+     */
+    @ApiModelProperty(value = "记录人", dataType = "Long")
+    @TableField("recorder")
+    private Long recorder;
+
+    /**
+     * 记录时间
+     */
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @TableField("record_time")
+    private String recordTime;
+
+    /**
+     * 实验室
+     */
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    @TableField("laboratory_id")
+    private String laboratoryId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "携带仪器设备", dataType = "List")
+    private List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "记录人名称", dataType = "String")
+    private String recorderName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String laboratoryName;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
index 2aff98d..2acfbeb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,12 +28,14 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 计量人员id
      */
+    @ApiModelProperty(value = "计量人员id", dataType = "Long")
     @TableField("staff_id")
     private Long staffId;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
index 351ee29..f796007 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
@@ -3,16 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
  * 现场检测记录表
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Data
@@ -27,66 +29,77 @@
     /**
      * 现场检测记录单编号
      */
+    @ApiModelProperty(value = "现场检测记录单编号", dataType = "String")
     @TableField("log_no")
     private String logNo;
 
     /**
      * 现场检测id
      */
+    @ApiModelProperty(value = "现场检测id", dataType = "String")
     @TableField("site_executive_id")
     private String siteExecutiveId;
 
     /**
      * 联系人
      */
+    @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
 
     /**
      * 电话
      */
+    @ApiModelProperty(value = "电话", dataType = "String")
     @TableField("contact_hone")
     private String contactHone;
 
     /**
      * 现场工作地点
      */
+    @ApiModelProperty(value = "现场工作地点", dataType = "String")
     @TableField("executive_address")
     private String executiveAddress;
 
     /**
      * 输出电压
      */
+    @ApiModelProperty(value = "输出电压", dataType = "String")
     @TableField("output_voltage")
     private String outputVoltage;
 
     /**
      * 零地电压
      */
+    @ApiModelProperty(value = "零地电压", dataType = "String")
     @TableField("zero_ground_voltage")
     private String zeroGroundVoltage;
 
     /**
      * 温度
      */
+    @ApiModelProperty(value = "温度", dataType = "String")
     @TableField("temperature")
     private String temperature;
 
     /**
      * 湿度
      */
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 删除标记
      */
+    @ApiModelProperty(value = "删除标记", dataType = "String")
     @TableField("is_del")
     private String isDel;
 
@@ -102,5 +115,40 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user")
+    private Long createUser;
 
+    /**
+     * 记录人
+     */
+    @ApiModelProperty(value = "记录人", dataType = "Long")
+    @TableField("recorder")
+    private Long recorder;
+
+    /**
+     * 记录时间
+     */
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @TableField("record_time")
+    private String recordTime;
+
+    /**
+     * 实验室
+     */
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    @TableField("laboratory_id")
+    private String laboratoryId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "携带仪器设备", dataType = "List")
+    private List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "记录人名称", dataType = "String")
+    private String recorderName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String laboratoryName;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
index 2aff98d..2acfbeb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,12 +28,14 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 计量人员id
      */
+    @ApiModelProperty(value = "计量人员id", dataType = "Long")
     @TableField("staff_id")
     private Long staffId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
index 10759c0..64e11f7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
@@ -12,7 +11,6 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,44 +28,47 @@
     private IEquipmentFixedAssetsService equipmentFixedAssetsService;
 
     @Override
-    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+    public boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> equipmentInfoList) {
         //先删除所有的绑定关系
-        deleteBySiteExecutiveId(siteExecutiveId);
+        deleteBySiteExecutiveLogId(siteExecutiveLogId);
         //新写入绑定关系
         List<BusinessSiteExecutiveEquipmentRelation> list = new ArrayList<>();
         equipmentInfoList.forEach(assets -> {
             BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation();
-            siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId());
             siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo());
             siteExecutiveEquipmentRelation.setEquipmentId(assets.getId());
+            siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId());
+            siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId());
             list.add(siteExecutiveEquipmentRelation);
         });
         return this.saveBatch(list);
     }
 
+    @Override
+    public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) {
+        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
 
     @Override
-    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+    public Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
+        queryWrapper.in("site_executive_log_id", siteExecutiveLogIds);
         return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
     }
 
     @Override
-    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+    public List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
-        List<BusinessSiteExecutiveEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
-        if (list != null && list.size() > 0) {
-            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
-        }
-        return null;
-    }
-
-    @Override
-    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
-        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("site_executive_id", siteExecutiveIds);
-        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.selectList(queryWrapper);
     }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
index 351ee29..f796007 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
@@ -3,16 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
  * 现场检测记录表
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Data
@@ -27,66 +29,77 @@
     /**
      * 现场检测记录单编号
      */
+    @ApiModelProperty(value = "现场检测记录单编号", dataType = "String")
     @TableField("log_no")
     private String logNo;
 
     /**
      * 现场检测id
      */
+    @ApiModelProperty(value = "现场检测id", dataType = "String")
     @TableField("site_executive_id")
     private String siteExecutiveId;
 
     /**
      * 联系人
      */
+    @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
 
     /**
      * 电话
      */
+    @ApiModelProperty(value = "电话", dataType = "String")
     @TableField("contact_hone")
     private String contactHone;
 
     /**
      * 现场工作地点
      */
+    @ApiModelProperty(value = "现场工作地点", dataType = "String")
     @TableField("executive_address")
     private String executiveAddress;
 
     /**
      * 输出电压
      */
+    @ApiModelProperty(value = "输出电压", dataType = "String")
     @TableField("output_voltage")
     private String outputVoltage;
 
     /**
      * 零地电压
      */
+    @ApiModelProperty(value = "零地电压", dataType = "String")
     @TableField("zero_ground_voltage")
     private String zeroGroundVoltage;
 
     /**
      * 温度
      */
+    @ApiModelProperty(value = "温度", dataType = "String")
     @TableField("temperature")
     private String temperature;
 
     /**
      * 湿度
      */
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 删除标记
      */
+    @ApiModelProperty(value = "删除标记", dataType = "String")
     @TableField("is_del")
     private String isDel;
 
@@ -102,5 +115,40 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user")
+    private Long createUser;
 
+    /**
+     * 记录人
+     */
+    @ApiModelProperty(value = "记录人", dataType = "Long")
+    @TableField("recorder")
+    private Long recorder;
+
+    /**
+     * 记录时间
+     */
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @TableField("record_time")
+    private String recordTime;
+
+    /**
+     * 实验室
+     */
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    @TableField("laboratory_id")
+    private String laboratoryId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "携带仪器设备", dataType = "List")
+    private List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "记录人名称", dataType = "String")
+    private String recorderName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String laboratoryName;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
index 2aff98d..2acfbeb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,12 +28,14 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 计量人员id
      */
+    @ApiModelProperty(value = "计量人员id", dataType = "Long")
     @TableField("staff_id")
     private Long staffId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
index 10759c0..64e11f7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
@@ -12,7 +11,6 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,44 +28,47 @@
     private IEquipmentFixedAssetsService equipmentFixedAssetsService;
 
     @Override
-    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+    public boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> equipmentInfoList) {
         //先删除所有的绑定关系
-        deleteBySiteExecutiveId(siteExecutiveId);
+        deleteBySiteExecutiveLogId(siteExecutiveLogId);
         //新写入绑定关系
         List<BusinessSiteExecutiveEquipmentRelation> list = new ArrayList<>();
         equipmentInfoList.forEach(assets -> {
             BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation();
-            siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId());
             siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo());
             siteExecutiveEquipmentRelation.setEquipmentId(assets.getId());
+            siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId());
+            siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId());
             list.add(siteExecutiveEquipmentRelation);
         });
         return this.saveBatch(list);
     }
 
+    @Override
+    public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) {
+        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
 
     @Override
-    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+    public Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
+        queryWrapper.in("site_executive_log_id", siteExecutiveLogIds);
         return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
     }
 
     @Override
-    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+    public List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
-        List<BusinessSiteExecutiveEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
-        if (list != null && list.size() > 0) {
-            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
-        }
-        return null;
-    }
-
-    @Override
-    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
-        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("site_executive_id", siteExecutiveIds);
-        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.selectList(queryWrapper);
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
index f8bd8eb..361b98c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
+import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
+import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,47 @@
 @Service
 public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl<BusinessSiteExecutiveInfoEquipmentRelationMapper, BusinessSiteExecutiveInfoEquipmentRelation> implements IBusinessSiteExecutiveInfoEquipmentRelationService {
 
+    @Resource
+    private IEquipmentFixedAssetsService equipmentFixedAssetsService;
+
+    @Override
+    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+        //先删除所有的绑定关系
+        deleteBySiteExecutiveId(siteExecutiveId);
+        //新写入绑定关系
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = new ArrayList<>();
+        equipmentInfoList.forEach(assets -> {
+            BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation();
+            siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId);
+            siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId());
+            list.add(siteExecutiveInfoEquipmentRelation);
+        });
+        return this.saveBatch(list);
+    }
+
+    @Override
+    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+
+    @Override
+    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("site_executive_info_id", siteExecutiveIds);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+    @Override
+    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
+        if (list != null && list.size() > 0) {
+            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
+        }
+        return null;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
index 351ee29..f796007 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
@@ -3,16 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
  * 现场检测记录表
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Data
@@ -27,66 +29,77 @@
     /**
      * 现场检测记录单编号
      */
+    @ApiModelProperty(value = "现场检测记录单编号", dataType = "String")
     @TableField("log_no")
     private String logNo;
 
     /**
      * 现场检测id
      */
+    @ApiModelProperty(value = "现场检测id", dataType = "String")
     @TableField("site_executive_id")
     private String siteExecutiveId;
 
     /**
      * 联系人
      */
+    @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
 
     /**
      * 电话
      */
+    @ApiModelProperty(value = "电话", dataType = "String")
     @TableField("contact_hone")
     private String contactHone;
 
     /**
      * 现场工作地点
      */
+    @ApiModelProperty(value = "现场工作地点", dataType = "String")
     @TableField("executive_address")
     private String executiveAddress;
 
     /**
      * 输出电压
      */
+    @ApiModelProperty(value = "输出电压", dataType = "String")
     @TableField("output_voltage")
     private String outputVoltage;
 
     /**
      * 零地电压
      */
+    @ApiModelProperty(value = "零地电压", dataType = "String")
     @TableField("zero_ground_voltage")
     private String zeroGroundVoltage;
 
     /**
      * 温度
      */
+    @ApiModelProperty(value = "温度", dataType = "String")
     @TableField("temperature")
     private String temperature;
 
     /**
      * 湿度
      */
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 删除标记
      */
+    @ApiModelProperty(value = "删除标记", dataType = "String")
     @TableField("is_del")
     private String isDel;
 
@@ -102,5 +115,40 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user")
+    private Long createUser;
 
+    /**
+     * 记录人
+     */
+    @ApiModelProperty(value = "记录人", dataType = "Long")
+    @TableField("recorder")
+    private Long recorder;
+
+    /**
+     * 记录时间
+     */
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @TableField("record_time")
+    private String recordTime;
+
+    /**
+     * 实验室
+     */
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    @TableField("laboratory_id")
+    private String laboratoryId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "携带仪器设备", dataType = "List")
+    private List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "记录人名称", dataType = "String")
+    private String recorderName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String laboratoryName;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
index 2aff98d..2acfbeb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,12 +28,14 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 计量人员id
      */
+    @ApiModelProperty(value = "计量人员id", dataType = "Long")
     @TableField("staff_id")
     private Long staffId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
index 10759c0..64e11f7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
@@ -12,7 +11,6 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,44 +28,47 @@
     private IEquipmentFixedAssetsService equipmentFixedAssetsService;
 
     @Override
-    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+    public boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> equipmentInfoList) {
         //先删除所有的绑定关系
-        deleteBySiteExecutiveId(siteExecutiveId);
+        deleteBySiteExecutiveLogId(siteExecutiveLogId);
         //新写入绑定关系
         List<BusinessSiteExecutiveEquipmentRelation> list = new ArrayList<>();
         equipmentInfoList.forEach(assets -> {
             BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation();
-            siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId());
             siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo());
             siteExecutiveEquipmentRelation.setEquipmentId(assets.getId());
+            siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId());
+            siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId());
             list.add(siteExecutiveEquipmentRelation);
         });
         return this.saveBatch(list);
     }
 
+    @Override
+    public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) {
+        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
 
     @Override
-    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+    public Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
+        queryWrapper.in("site_executive_log_id", siteExecutiveLogIds);
         return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
     }
 
     @Override
-    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+    public List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
-        List<BusinessSiteExecutiveEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
-        if (list != null && list.size() > 0) {
-            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
-        }
-        return null;
-    }
-
-    @Override
-    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
-        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("site_executive_id", siteExecutiveIds);
-        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.selectList(queryWrapper);
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
index f8bd8eb..361b98c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
+import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
+import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,47 @@
 @Service
 public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl<BusinessSiteExecutiveInfoEquipmentRelationMapper, BusinessSiteExecutiveInfoEquipmentRelation> implements IBusinessSiteExecutiveInfoEquipmentRelationService {
 
+    @Resource
+    private IEquipmentFixedAssetsService equipmentFixedAssetsService;
+
+    @Override
+    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+        //先删除所有的绑定关系
+        deleteBySiteExecutiveId(siteExecutiveId);
+        //新写入绑定关系
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = new ArrayList<>();
+        equipmentInfoList.forEach(assets -> {
+            BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation();
+            siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId);
+            siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId());
+            list.add(siteExecutiveInfoEquipmentRelation);
+        });
+        return this.saveBatch(list);
+    }
+
+    @Override
+    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+
+    @Override
+    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("site_executive_info_id", siteExecutiveIds);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+    @Override
+    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
+        if (list != null && list.size() > 0) {
+            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
+        }
+        return null;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 319cbad..48ff287 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -25,7 +25,7 @@
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
 import com.casic.missiles.service.flowable.ApprovalOperateService;
@@ -64,7 +64,7 @@
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
-    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+    private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService;
     @Autowired
     private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService;
 
@@ -203,8 +203,8 @@
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
             siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id));
-            if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){
-                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource()));
+            if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) {
+                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource()));
             }
         }
         return siteExecutiveInfo;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
index 351ee29..f796007 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
@@ -3,16 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
  * 现场检测记录表
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Data
@@ -27,66 +29,77 @@
     /**
      * 现场检测记录单编号
      */
+    @ApiModelProperty(value = "现场检测记录单编号", dataType = "String")
     @TableField("log_no")
     private String logNo;
 
     /**
      * 现场检测id
      */
+    @ApiModelProperty(value = "现场检测id", dataType = "String")
     @TableField("site_executive_id")
     private String siteExecutiveId;
 
     /**
      * 联系人
      */
+    @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
 
     /**
      * 电话
      */
+    @ApiModelProperty(value = "电话", dataType = "String")
     @TableField("contact_hone")
     private String contactHone;
 
     /**
      * 现场工作地点
      */
+    @ApiModelProperty(value = "现场工作地点", dataType = "String")
     @TableField("executive_address")
     private String executiveAddress;
 
     /**
      * 输出电压
      */
+    @ApiModelProperty(value = "输出电压", dataType = "String")
     @TableField("output_voltage")
     private String outputVoltage;
 
     /**
      * 零地电压
      */
+    @ApiModelProperty(value = "零地电压", dataType = "String")
     @TableField("zero_ground_voltage")
     private String zeroGroundVoltage;
 
     /**
      * 温度
      */
+    @ApiModelProperty(value = "温度", dataType = "String")
     @TableField("temperature")
     private String temperature;
 
     /**
      * 湿度
      */
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 删除标记
      */
+    @ApiModelProperty(value = "删除标记", dataType = "String")
     @TableField("is_del")
     private String isDel;
 
@@ -102,5 +115,40 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user")
+    private Long createUser;
 
+    /**
+     * 记录人
+     */
+    @ApiModelProperty(value = "记录人", dataType = "Long")
+    @TableField("recorder")
+    private Long recorder;
+
+    /**
+     * 记录时间
+     */
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @TableField("record_time")
+    private String recordTime;
+
+    /**
+     * 实验室
+     */
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    @TableField("laboratory_id")
+    private String laboratoryId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "携带仪器设备", dataType = "List")
+    private List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "记录人名称", dataType = "String")
+    private String recorderName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String laboratoryName;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
index 2aff98d..2acfbeb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,12 +28,14 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 计量人员id
      */
+    @ApiModelProperty(value = "计量人员id", dataType = "Long")
     @TableField("staff_id")
     private Long staffId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
index 10759c0..64e11f7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
@@ -12,7 +11,6 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,44 +28,47 @@
     private IEquipmentFixedAssetsService equipmentFixedAssetsService;
 
     @Override
-    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+    public boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> equipmentInfoList) {
         //先删除所有的绑定关系
-        deleteBySiteExecutiveId(siteExecutiveId);
+        deleteBySiteExecutiveLogId(siteExecutiveLogId);
         //新写入绑定关系
         List<BusinessSiteExecutiveEquipmentRelation> list = new ArrayList<>();
         equipmentInfoList.forEach(assets -> {
             BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation();
-            siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId());
             siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo());
             siteExecutiveEquipmentRelation.setEquipmentId(assets.getId());
+            siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId());
+            siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId());
             list.add(siteExecutiveEquipmentRelation);
         });
         return this.saveBatch(list);
     }
 
+    @Override
+    public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) {
+        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
 
     @Override
-    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+    public Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
+        queryWrapper.in("site_executive_log_id", siteExecutiveLogIds);
         return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
     }
 
     @Override
-    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+    public List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
-        List<BusinessSiteExecutiveEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
-        if (list != null && list.size() > 0) {
-            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
-        }
-        return null;
-    }
-
-    @Override
-    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
-        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("site_executive_id", siteExecutiveIds);
-        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.selectList(queryWrapper);
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
index f8bd8eb..361b98c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
+import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
+import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,47 @@
 @Service
 public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl<BusinessSiteExecutiveInfoEquipmentRelationMapper, BusinessSiteExecutiveInfoEquipmentRelation> implements IBusinessSiteExecutiveInfoEquipmentRelationService {
 
+    @Resource
+    private IEquipmentFixedAssetsService equipmentFixedAssetsService;
+
+    @Override
+    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+        //先删除所有的绑定关系
+        deleteBySiteExecutiveId(siteExecutiveId);
+        //新写入绑定关系
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = new ArrayList<>();
+        equipmentInfoList.forEach(assets -> {
+            BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation();
+            siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId);
+            siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId());
+            list.add(siteExecutiveInfoEquipmentRelation);
+        });
+        return this.saveBatch(list);
+    }
+
+    @Override
+    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+
+    @Override
+    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("site_executive_info_id", siteExecutiveIds);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+    @Override
+    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
+        if (list != null && list.size() > 0) {
+            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
+        }
+        return null;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 319cbad..48ff287 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -25,7 +25,7 @@
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
 import com.casic.missiles.service.flowable.ApprovalOperateService;
@@ -64,7 +64,7 @@
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
-    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+    private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService;
     @Autowired
     private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService;
 
@@ -203,8 +203,8 @@
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
             siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id));
-            if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){
-                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource()));
+            if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) {
+                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource()));
             }
         }
         return siteExecutiveInfo;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
index 85b919a..bee53cc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
@@ -1,20 +1,108 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper;
+import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 /**
  * <p>
  * 现场检测记录表 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Service
 public class BusinessSiteExecutiveLogServiceImpl extends ServiceImpl<BusinessSiteExecutiveLogMapper, BusinessSiteExecutiveLog> implements IBusinessSiteExecutiveLogService {
 
+    @Autowired
+    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+
+    @Override
+    public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) {
+        initBusinessSiteExecutiveLog(siteExecutiveLog);
+        if (baseMapper.insert(siteExecutiveLog) > 0) {
+            //加入所用设备绑定关系
+            if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) {
+                siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList());
+            }
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO deleteSiteExecutiveLog(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //清除监测设备绑定关系
+            siteExecutiveEquipmentRelationService.deleteBySiteExecutiveLogId(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog) {
+        if (this.baseMapper.updateById(businessSiteExecutiveLog) > 0) {
+
+            //加入所用设备绑定修改
+            if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) {
+                siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList());
+            }
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) {
+        BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id);
+        if (businessSiteExecutiveLog != null) {
+            //查询是否有关联的监测设备
+            businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id));
+        }
+        return businessSiteExecutiveLog;
+    }
+
+    @Override
+    public Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, SiteExecuteLogRequest request) {
+        // 获取列表
+        Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request);
+        if (!CollectionUtils.isEmpty(siteExecutiveLogListPage.getRecords())) {
+
+        }
+        return siteExecutiveLogListPage;
+    }
+
+    private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) {
+        Long maxNo = this.baseMapper.selectMaxCode();
+        String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo);
+        AuthUser authUser = ShiroKit.getUser();
+        siteExecutiveLog.setCreateUser(authUser.getId());
+        siteExecutiveLog.setLogNo(originNo);
+    }
+
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
index 351ee29..f796007 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
@@ -3,16 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
  * 现场检测记录表
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Data
@@ -27,66 +29,77 @@
     /**
      * 现场检测记录单编号
      */
+    @ApiModelProperty(value = "现场检测记录单编号", dataType = "String")
     @TableField("log_no")
     private String logNo;
 
     /**
      * 现场检测id
      */
+    @ApiModelProperty(value = "现场检测id", dataType = "String")
     @TableField("site_executive_id")
     private String siteExecutiveId;
 
     /**
      * 联系人
      */
+    @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
 
     /**
      * 电话
      */
+    @ApiModelProperty(value = "电话", dataType = "String")
     @TableField("contact_hone")
     private String contactHone;
 
     /**
      * 现场工作地点
      */
+    @ApiModelProperty(value = "现场工作地点", dataType = "String")
     @TableField("executive_address")
     private String executiveAddress;
 
     /**
      * 输出电压
      */
+    @ApiModelProperty(value = "输出电压", dataType = "String")
     @TableField("output_voltage")
     private String outputVoltage;
 
     /**
      * 零地电压
      */
+    @ApiModelProperty(value = "零地电压", dataType = "String")
     @TableField("zero_ground_voltage")
     private String zeroGroundVoltage;
 
     /**
      * 温度
      */
+    @ApiModelProperty(value = "温度", dataType = "String")
     @TableField("temperature")
     private String temperature;
 
     /**
      * 湿度
      */
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 删除标记
      */
+    @ApiModelProperty(value = "删除标记", dataType = "String")
     @TableField("is_del")
     private String isDel;
 
@@ -102,5 +115,40 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user")
+    private Long createUser;
 
+    /**
+     * 记录人
+     */
+    @ApiModelProperty(value = "记录人", dataType = "Long")
+    @TableField("recorder")
+    private Long recorder;
+
+    /**
+     * 记录时间
+     */
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @TableField("record_time")
+    private String recordTime;
+
+    /**
+     * 实验室
+     */
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    @TableField("laboratory_id")
+    private String laboratoryId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "携带仪器设备", dataType = "List")
+    private List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "记录人名称", dataType = "String")
+    private String recorderName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String laboratoryName;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
index 2aff98d..2acfbeb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,12 +28,14 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 计量人员id
      */
+    @ApiModelProperty(value = "计量人员id", dataType = "Long")
     @TableField("staff_id")
     private Long staffId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
index 10759c0..64e11f7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
@@ -12,7 +11,6 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,44 +28,47 @@
     private IEquipmentFixedAssetsService equipmentFixedAssetsService;
 
     @Override
-    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+    public boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> equipmentInfoList) {
         //先删除所有的绑定关系
-        deleteBySiteExecutiveId(siteExecutiveId);
+        deleteBySiteExecutiveLogId(siteExecutiveLogId);
         //新写入绑定关系
         List<BusinessSiteExecutiveEquipmentRelation> list = new ArrayList<>();
         equipmentInfoList.forEach(assets -> {
             BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation();
-            siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId());
             siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo());
             siteExecutiveEquipmentRelation.setEquipmentId(assets.getId());
+            siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId());
+            siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId());
             list.add(siteExecutiveEquipmentRelation);
         });
         return this.saveBatch(list);
     }
 
+    @Override
+    public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) {
+        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
 
     @Override
-    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+    public Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
+        queryWrapper.in("site_executive_log_id", siteExecutiveLogIds);
         return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
     }
 
     @Override
-    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+    public List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
-        List<BusinessSiteExecutiveEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
-        if (list != null && list.size() > 0) {
-            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
-        }
-        return null;
-    }
-
-    @Override
-    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
-        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("site_executive_id", siteExecutiveIds);
-        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.selectList(queryWrapper);
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
index f8bd8eb..361b98c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
+import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
+import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,47 @@
 @Service
 public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl<BusinessSiteExecutiveInfoEquipmentRelationMapper, BusinessSiteExecutiveInfoEquipmentRelation> implements IBusinessSiteExecutiveInfoEquipmentRelationService {
 
+    @Resource
+    private IEquipmentFixedAssetsService equipmentFixedAssetsService;
+
+    @Override
+    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+        //先删除所有的绑定关系
+        deleteBySiteExecutiveId(siteExecutiveId);
+        //新写入绑定关系
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = new ArrayList<>();
+        equipmentInfoList.forEach(assets -> {
+            BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation();
+            siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId);
+            siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId());
+            list.add(siteExecutiveInfoEquipmentRelation);
+        });
+        return this.saveBatch(list);
+    }
+
+    @Override
+    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+
+    @Override
+    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("site_executive_info_id", siteExecutiveIds);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+    @Override
+    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
+        if (list != null && list.size() > 0) {
+            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
+        }
+        return null;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 319cbad..48ff287 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -25,7 +25,7 @@
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
 import com.casic.missiles.service.flowable.ApprovalOperateService;
@@ -64,7 +64,7 @@
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
-    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+    private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService;
     @Autowired
     private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService;
 
@@ -203,8 +203,8 @@
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
             siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id));
-            if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){
-                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource()));
+            if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) {
+                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource()));
             }
         }
         return siteExecutiveInfo;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
index 85b919a..bee53cc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
@@ -1,20 +1,108 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper;
+import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 /**
  * <p>
  * 现场检测记录表 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Service
 public class BusinessSiteExecutiveLogServiceImpl extends ServiceImpl<BusinessSiteExecutiveLogMapper, BusinessSiteExecutiveLog> implements IBusinessSiteExecutiveLogService {
 
+    @Autowired
+    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+
+    @Override
+    public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) {
+        initBusinessSiteExecutiveLog(siteExecutiveLog);
+        if (baseMapper.insert(siteExecutiveLog) > 0) {
+            //加入所用设备绑定关系
+            if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) {
+                siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList());
+            }
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO deleteSiteExecutiveLog(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //清除监测设备绑定关系
+            siteExecutiveEquipmentRelationService.deleteBySiteExecutiveLogId(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog) {
+        if (this.baseMapper.updateById(businessSiteExecutiveLog) > 0) {
+
+            //加入所用设备绑定修改
+            if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) {
+                siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList());
+            }
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) {
+        BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id);
+        if (businessSiteExecutiveLog != null) {
+            //查询是否有关联的监测设备
+            businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id));
+        }
+        return businessSiteExecutiveLog;
+    }
+
+    @Override
+    public Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, SiteExecuteLogRequest request) {
+        // 获取列表
+        Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request);
+        if (!CollectionUtils.isEmpty(siteExecutiveLogListPage.getRecords())) {
+
+        }
+        return siteExecutiveLogListPage;
+    }
+
+    private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) {
+        Long maxNo = this.baseMapper.selectMaxCode();
+        String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo);
+        AuthUser authUser = ShiroKit.getUser();
+        siteExecutiveLog.setCreateUser(authUser.getId());
+        siteExecutiveLog.setLogNo(originNo);
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
index 7869717..ad1cc40 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveStaffRelationMapper;
 import com.casic.missiles.mapper.meter.MeterStaffMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
 import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
@@ -20,7 +19,7 @@
  * 外场检测-计量人员关联表 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Service

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
index 351ee29..f796007 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
@@ -3,16 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
  * 现场检测记录表
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Data
@@ -27,66 +29,77 @@
     /**
      * 现场检测记录单编号
      */
+    @ApiModelProperty(value = "现场检测记录单编号", dataType = "String")
     @TableField("log_no")
     private String logNo;
 
     /**
      * 现场检测id
      */
+    @ApiModelProperty(value = "现场检测id", dataType = "String")
     @TableField("site_executive_id")
     private String siteExecutiveId;
 
     /**
      * 联系人
      */
+    @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
 
     /**
      * 电话
      */
+    @ApiModelProperty(value = "电话", dataType = "String")
     @TableField("contact_hone")
     private String contactHone;
 
     /**
      * 现场工作地点
      */
+    @ApiModelProperty(value = "现场工作地点", dataType = "String")
     @TableField("executive_address")
     private String executiveAddress;
 
     /**
      * 输出电压
      */
+    @ApiModelProperty(value = "输出电压", dataType = "String")
     @TableField("output_voltage")
     private String outputVoltage;
 
     /**
      * 零地电压
      */
+    @ApiModelProperty(value = "零地电压", dataType = "String")
     @TableField("zero_ground_voltage")
     private String zeroGroundVoltage;
 
     /**
      * 温度
      */
+    @ApiModelProperty(value = "温度", dataType = "String")
     @TableField("temperature")
     private String temperature;
 
     /**
      * 湿度
      */
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 删除标记
      */
+    @ApiModelProperty(value = "删除标记", dataType = "String")
     @TableField("is_del")
     private String isDel;
 
@@ -102,5 +115,40 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user")
+    private Long createUser;
 
+    /**
+     * 记录人
+     */
+    @ApiModelProperty(value = "记录人", dataType = "Long")
+    @TableField("recorder")
+    private Long recorder;
+
+    /**
+     * 记录时间
+     */
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @TableField("record_time")
+    private String recordTime;
+
+    /**
+     * 实验室
+     */
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    @TableField("laboratory_id")
+    private String laboratoryId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "携带仪器设备", dataType = "List")
+    private List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "记录人名称", dataType = "String")
+    private String recorderName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String laboratoryName;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
index 2aff98d..2acfbeb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,12 +28,14 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 计量人员id
      */
+    @ApiModelProperty(value = "计量人员id", dataType = "Long")
     @TableField("staff_id")
     private Long staffId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
index 10759c0..64e11f7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
@@ -12,7 +11,6 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,44 +28,47 @@
     private IEquipmentFixedAssetsService equipmentFixedAssetsService;
 
     @Override
-    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+    public boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> equipmentInfoList) {
         //先删除所有的绑定关系
-        deleteBySiteExecutiveId(siteExecutiveId);
+        deleteBySiteExecutiveLogId(siteExecutiveLogId);
         //新写入绑定关系
         List<BusinessSiteExecutiveEquipmentRelation> list = new ArrayList<>();
         equipmentInfoList.forEach(assets -> {
             BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation();
-            siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId());
             siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo());
             siteExecutiveEquipmentRelation.setEquipmentId(assets.getId());
+            siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId());
+            siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId());
             list.add(siteExecutiveEquipmentRelation);
         });
         return this.saveBatch(list);
     }
 
+    @Override
+    public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) {
+        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
 
     @Override
-    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+    public Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
+        queryWrapper.in("site_executive_log_id", siteExecutiveLogIds);
         return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
     }
 
     @Override
-    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+    public List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
-        List<BusinessSiteExecutiveEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
-        if (list != null && list.size() > 0) {
-            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
-        }
-        return null;
-    }
-
-    @Override
-    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
-        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("site_executive_id", siteExecutiveIds);
-        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.selectList(queryWrapper);
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
index f8bd8eb..361b98c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
+import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
+import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,47 @@
 @Service
 public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl<BusinessSiteExecutiveInfoEquipmentRelationMapper, BusinessSiteExecutiveInfoEquipmentRelation> implements IBusinessSiteExecutiveInfoEquipmentRelationService {
 
+    @Resource
+    private IEquipmentFixedAssetsService equipmentFixedAssetsService;
+
+    @Override
+    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+        //先删除所有的绑定关系
+        deleteBySiteExecutiveId(siteExecutiveId);
+        //新写入绑定关系
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = new ArrayList<>();
+        equipmentInfoList.forEach(assets -> {
+            BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation();
+            siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId);
+            siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId());
+            list.add(siteExecutiveInfoEquipmentRelation);
+        });
+        return this.saveBatch(list);
+    }
+
+    @Override
+    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+
+    @Override
+    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("site_executive_info_id", siteExecutiveIds);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+    @Override
+    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
+        if (list != null && list.size() > 0) {
+            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
+        }
+        return null;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 319cbad..48ff287 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -25,7 +25,7 @@
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
 import com.casic.missiles.service.flowable.ApprovalOperateService;
@@ -64,7 +64,7 @@
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
-    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+    private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService;
     @Autowired
     private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService;
 
@@ -203,8 +203,8 @@
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
             siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id));
-            if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){
-                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource()));
+            if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) {
+                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource()));
             }
         }
         return siteExecutiveInfo;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
index 85b919a..bee53cc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
@@ -1,20 +1,108 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper;
+import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 /**
  * <p>
  * 现场检测记录表 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Service
 public class BusinessSiteExecutiveLogServiceImpl extends ServiceImpl<BusinessSiteExecutiveLogMapper, BusinessSiteExecutiveLog> implements IBusinessSiteExecutiveLogService {
 
+    @Autowired
+    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+
+    @Override
+    public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) {
+        initBusinessSiteExecutiveLog(siteExecutiveLog);
+        if (baseMapper.insert(siteExecutiveLog) > 0) {
+            //加入所用设备绑定关系
+            if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) {
+                siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList());
+            }
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO deleteSiteExecutiveLog(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //清除监测设备绑定关系
+            siteExecutiveEquipmentRelationService.deleteBySiteExecutiveLogId(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog) {
+        if (this.baseMapper.updateById(businessSiteExecutiveLog) > 0) {
+
+            //加入所用设备绑定修改
+            if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) {
+                siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList());
+            }
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) {
+        BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id);
+        if (businessSiteExecutiveLog != null) {
+            //查询是否有关联的监测设备
+            businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id));
+        }
+        return businessSiteExecutiveLog;
+    }
+
+    @Override
+    public Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, SiteExecuteLogRequest request) {
+        // 获取列表
+        Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request);
+        if (!CollectionUtils.isEmpty(siteExecutiveLogListPage.getRecords())) {
+
+        }
+        return siteExecutiveLogListPage;
+    }
+
+    private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) {
+        Long maxNo = this.baseMapper.selectMaxCode();
+        String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo);
+        AuthUser authUser = ShiroKit.getUser();
+        siteExecutiveLog.setCreateUser(authUser.getId());
+        siteExecutiveLog.setLogNo(originNo);
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
index 7869717..ad1cc40 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveStaffRelationMapper;
 import com.casic.missiles.mapper.meter.MeterStaffMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
 import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
@@ -20,7 +19,7 @@
  * 外场检测-计量人员关联表 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Service
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java
index aa58548..247920b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 
 import java.util.List;
 
@@ -16,11 +15,12 @@
  */
 public interface IBusinessSiteExecutiveEquipmentRelationService extends IService<BusinessSiteExecutiveEquipmentRelation> {
 
-    boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList);
+    boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList);
 
-    List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId);
+    Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId);
 
-    Boolean deleteBySiteExecutiveId(Long siteExecutiveId);
+    Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds);
 
-    Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds);
+    List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId);
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
index 351ee29..f796007 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
@@ -3,16 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
  * 现场检测记录表
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Data
@@ -27,66 +29,77 @@
     /**
      * 现场检测记录单编号
      */
+    @ApiModelProperty(value = "现场检测记录单编号", dataType = "String")
     @TableField("log_no")
     private String logNo;
 
     /**
      * 现场检测id
      */
+    @ApiModelProperty(value = "现场检测id", dataType = "String")
     @TableField("site_executive_id")
     private String siteExecutiveId;
 
     /**
      * 联系人
      */
+    @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
 
     /**
      * 电话
      */
+    @ApiModelProperty(value = "电话", dataType = "String")
     @TableField("contact_hone")
     private String contactHone;
 
     /**
      * 现场工作地点
      */
+    @ApiModelProperty(value = "现场工作地点", dataType = "String")
     @TableField("executive_address")
     private String executiveAddress;
 
     /**
      * 输出电压
      */
+    @ApiModelProperty(value = "输出电压", dataType = "String")
     @TableField("output_voltage")
     private String outputVoltage;
 
     /**
      * 零地电压
      */
+    @ApiModelProperty(value = "零地电压", dataType = "String")
     @TableField("zero_ground_voltage")
     private String zeroGroundVoltage;
 
     /**
      * 温度
      */
+    @ApiModelProperty(value = "温度", dataType = "String")
     @TableField("temperature")
     private String temperature;
 
     /**
      * 湿度
      */
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 删除标记
      */
+    @ApiModelProperty(value = "删除标记", dataType = "String")
     @TableField("is_del")
     private String isDel;
 
@@ -102,5 +115,40 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user")
+    private Long createUser;
 
+    /**
+     * 记录人
+     */
+    @ApiModelProperty(value = "记录人", dataType = "Long")
+    @TableField("recorder")
+    private Long recorder;
+
+    /**
+     * 记录时间
+     */
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @TableField("record_time")
+    private String recordTime;
+
+    /**
+     * 实验室
+     */
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    @TableField("laboratory_id")
+    private String laboratoryId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "携带仪器设备", dataType = "List")
+    private List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "记录人名称", dataType = "String")
+    private String recorderName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String laboratoryName;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
index 2aff98d..2acfbeb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,12 +28,14 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 计量人员id
      */
+    @ApiModelProperty(value = "计量人员id", dataType = "Long")
     @TableField("staff_id")
     private Long staffId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
index 10759c0..64e11f7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
@@ -12,7 +11,6 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,44 +28,47 @@
     private IEquipmentFixedAssetsService equipmentFixedAssetsService;
 
     @Override
-    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+    public boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> equipmentInfoList) {
         //先删除所有的绑定关系
-        deleteBySiteExecutiveId(siteExecutiveId);
+        deleteBySiteExecutiveLogId(siteExecutiveLogId);
         //新写入绑定关系
         List<BusinessSiteExecutiveEquipmentRelation> list = new ArrayList<>();
         equipmentInfoList.forEach(assets -> {
             BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation();
-            siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId());
             siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo());
             siteExecutiveEquipmentRelation.setEquipmentId(assets.getId());
+            siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId());
+            siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId());
             list.add(siteExecutiveEquipmentRelation);
         });
         return this.saveBatch(list);
     }
 
+    @Override
+    public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) {
+        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
 
     @Override
-    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+    public Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
+        queryWrapper.in("site_executive_log_id", siteExecutiveLogIds);
         return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
     }
 
     @Override
-    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+    public List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
-        List<BusinessSiteExecutiveEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
-        if (list != null && list.size() > 0) {
-            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
-        }
-        return null;
-    }
-
-    @Override
-    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
-        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("site_executive_id", siteExecutiveIds);
-        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.selectList(queryWrapper);
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
index f8bd8eb..361b98c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
+import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
+import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,47 @@
 @Service
 public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl<BusinessSiteExecutiveInfoEquipmentRelationMapper, BusinessSiteExecutiveInfoEquipmentRelation> implements IBusinessSiteExecutiveInfoEquipmentRelationService {
 
+    @Resource
+    private IEquipmentFixedAssetsService equipmentFixedAssetsService;
+
+    @Override
+    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+        //先删除所有的绑定关系
+        deleteBySiteExecutiveId(siteExecutiveId);
+        //新写入绑定关系
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = new ArrayList<>();
+        equipmentInfoList.forEach(assets -> {
+            BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation();
+            siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId);
+            siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId());
+            list.add(siteExecutiveInfoEquipmentRelation);
+        });
+        return this.saveBatch(list);
+    }
+
+    @Override
+    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+
+    @Override
+    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("site_executive_info_id", siteExecutiveIds);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+    @Override
+    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
+        if (list != null && list.size() > 0) {
+            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
+        }
+        return null;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 319cbad..48ff287 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -25,7 +25,7 @@
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
 import com.casic.missiles.service.flowable.ApprovalOperateService;
@@ -64,7 +64,7 @@
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
-    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+    private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService;
     @Autowired
     private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService;
 
@@ -203,8 +203,8 @@
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
             siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id));
-            if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){
-                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource()));
+            if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) {
+                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource()));
             }
         }
         return siteExecutiveInfo;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
index 85b919a..bee53cc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
@@ -1,20 +1,108 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper;
+import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 /**
  * <p>
  * 现场检测记录表 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Service
 public class BusinessSiteExecutiveLogServiceImpl extends ServiceImpl<BusinessSiteExecutiveLogMapper, BusinessSiteExecutiveLog> implements IBusinessSiteExecutiveLogService {
 
+    @Autowired
+    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+
+    @Override
+    public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) {
+        initBusinessSiteExecutiveLog(siteExecutiveLog);
+        if (baseMapper.insert(siteExecutiveLog) > 0) {
+            //加入所用设备绑定关系
+            if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) {
+                siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList());
+            }
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO deleteSiteExecutiveLog(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //清除监测设备绑定关系
+            siteExecutiveEquipmentRelationService.deleteBySiteExecutiveLogId(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog) {
+        if (this.baseMapper.updateById(businessSiteExecutiveLog) > 0) {
+
+            //加入所用设备绑定修改
+            if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) {
+                siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList());
+            }
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) {
+        BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id);
+        if (businessSiteExecutiveLog != null) {
+            //查询是否有关联的监测设备
+            businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id));
+        }
+        return businessSiteExecutiveLog;
+    }
+
+    @Override
+    public Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, SiteExecuteLogRequest request) {
+        // 获取列表
+        Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request);
+        if (!CollectionUtils.isEmpty(siteExecutiveLogListPage.getRecords())) {
+
+        }
+        return siteExecutiveLogListPage;
+    }
+
+    private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) {
+        Long maxNo = this.baseMapper.selectMaxCode();
+        String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo);
+        AuthUser authUser = ShiroKit.getUser();
+        siteExecutiveLog.setCreateUser(authUser.getId());
+        siteExecutiveLog.setLogNo(originNo);
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
index 7869717..ad1cc40 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveStaffRelationMapper;
 import com.casic.missiles.mapper.meter.MeterStaffMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
 import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
@@ -20,7 +19,7 @@
  * 外场检测-计量人员关联表 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Service
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java
index aa58548..247920b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 
 import java.util.List;
 
@@ -16,11 +15,12 @@
  */
 public interface IBusinessSiteExecutiveEquipmentRelationService extends IService<BusinessSiteExecutiveEquipmentRelation> {
 
-    boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList);
+    boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList);
 
-    List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId);
+    Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId);
 
-    Boolean deleteBySiteExecutiveId(Long siteExecutiveId);
+    Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds);
 
-    Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds);
+    List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java
index 1da43da..5238c18 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java
@@ -1,16 +1,26 @@
 package com.casic.missiles.service.business;
 
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+
+import java.util.List;
 
 /**
  * <p>
  *  服务类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 public interface IBusinessSiteExecutiveInfoEquipmentRelationService extends IService<BusinessSiteExecutiveInfoEquipmentRelation> {
 
+    boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList);
+
+    Boolean deleteBySiteExecutiveId(Long siteExecutiveId);
+
+    Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds);
+
+    List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
index 79d3d6f..2084f55 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java
@@ -2,19 +2,19 @@
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.originRecord.OriginRecordRequest;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
-import com.casic.missiles.service.business.IBusinessOriginalRecordService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -35,61 +34,62 @@
  * @author zt
  * @since 2023-03-25
  */
+@Api(tags = "现场检测记录模块")
 @RestController
 @RequestMapping("/business/siteExecutive/log")
-public class BusinessSiteExecutiveLogController {
+public class BusinessSiteExecutiveLogController extends ExportController {
     @Resource
     private IBusinessSiteExecutiveLogService siteExecutiveLogService;
 
-//    @ApiOperation("现场检测记录表查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<BusinessOriginalRecord>> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        Page<BusinessOriginalRecord> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request)));
-//    }
-//
-//
-//    @ApiOperation("现场检测记录表详情")
-//    @PostMapping("/detail")
-//    public ReturnDTO<BusinessOriginalRecord> originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId()));
-//    }
-//
-//    @ApiOperation("现场检测记录表更新")
-//    @PostMapping("/update")
-//    public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) {
-//        Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord));
-//    }
+    @ApiOperation("现场检测记录表查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<BusinessSiteExecutiveLog>> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult)  {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<BusinessSiteExecutiveLog> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request)));
+    }
 
-//    @ApiOperation("现场检测记录表新增")
-//    @PostMapping("/add")
-//    public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
-//        Assert.isFalse(bindingResult.hasErrors(), () -> {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog));
-//    }
 
-//    @ApiOperation("现场检测记录表删除")
-//    @PostMapping("/delete")
-//    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
-//        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-//        });
-//        return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId()));
-//    }
+    @ApiOperation("现场检测记录表详情")
+    @PostMapping("/detail")
+    public ReturnDTO<BusinessSiteExecutiveLog> originalDetail(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId()));
+    }
+
+    @ApiOperation("现场检测记录表更新")
+    @PostMapping("/update")
+    public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表新增")
+    @PostMapping("/add")
+    public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog));
+    }
+
+    @ApiOperation("现场检测记录表删除")
+    @PostMapping("/delete")
+    public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) {
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId()));
+    }
 //
 //    @ApiOperation("现场检测记录表导出")
 //    @PostMapping("/export")
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index 2d56cf5..2b55435 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -53,6 +53,8 @@
     String OUTSOURCE_PROJECT_PREFIX = "fbxm";
     //现场检测
     String SITE_EXECUTIVE_PREFIX = "xcjc";
+    //现场登记
+    String SITE_EXECUTIVE_LOG_PREFIX = "xcdj";
 
     //下载中心
     String DOWNLOAD_NO = "xzzx";
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
index fcccbc7..3701d42 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java
@@ -1,7 +1,11 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +17,8 @@
  */
 public interface BusinessSiteExecutiveLogMapper extends BaseMapper<BusinessSiteExecutiveLog> {
 
+    @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from  business_site_executive_log")
+    Long selectMaxCode();
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, @Param("request") SiteExecuteLogRequest request);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
index 7babc7d..fd336aa 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -25,4 +25,24 @@
         id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time
     </sql>
 
+
+    <select id="siteExecutiveLogListPage" resultType="com.casic.missiles.model.business.BusinessSiteExecutiveLog">
+        SELECT
+        sel.id as id,su.name  AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo
+        FROM
+        business_site_executive_log sel
+        LEFT JOIN ( SELECT id, organize_name FROM meter_organize WHERE is_del = 0 AND is_lab = 1 ) lab ON lab.id = sel.laboratory_id
+        LEFT JOIN sys_user su ON su.id = sel.recorder where 1=1
+        <if test="request.logNo != null and request.logNo !=''">
+            and sel.log_no like concat('%', #{request.logNo}, '%')
+        </if>
+        <if test="request.recorderName != null and request.recorderName !=''">
+            and su.name like concat('%', #{request.recorderName}, '%')
+        </if>
+        <if test="request.laboratoryName != null and request.laboratoryName !=''">
+            and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+        </if>
+        order  by sel.update_time desc
+    </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
new file mode 100644
index 0000000..4bbe0b0
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java
@@ -0,0 +1,110 @@
+package com.casic.missiles.dto.business.siteExecutive;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zt
+ * @since 2023-3-07
+ */
+
+@ApiModel
+@Data
+public class EquipmentFixedAssetsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", dataType = "Long", required = true)
+    private Long id;
+
+    /**
+     * 资产编号
+     */
+    @ExcelProperty("固定资产编号")
+    @ApiModelProperty(value = "资产编号", dataType = "String", required = true)
+    private String assetNo;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", dataType = "String", required = true)
+    private String equipmentNo;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    @ApiModelProperty(value = "设备名称", dataType = "String", required = true)
+    private String equipmentName;
+
+
+    /**
+     * 型号
+     */
+    @ExcelProperty("型号")
+    @NotBlank(message = "型号不能为空")
+    @ApiModelProperty(value = "型号", dataType = "String", required = true)
+    private String modelNo;
+
+    /**
+     * 工作开始前外观及功能检查
+     */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
+    private String beforeWorkCheck;
+
+    /**
+     * 工作开始前指标测试结果
+     */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
+    private String beforeWorkResult;
+
+    /**
+     * 工作开始前记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
+    private Long beforeWorkRecorderId;
+
+    /**
+     * 工作开始前记录日期
+     */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
+    private String beforeWorkRecorderDate;
+
+    /**
+     * 工作完成后外观及功能检查
+     */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
+    private String afterWorkCheck;
+
+    /**
+     * 工作完成后指标测试结果
+     */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
+    private String afterWorkResult;
+
+    /**
+     * 工作完成后记录人-计量人员id
+     */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
+    private Long afterWorkRecorderId;
+
+    /**
+     * 工作完成后记录日期
+     */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
+    private String afterWorkRecorderDate;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
index f6b2bd6..1915916 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java
@@ -10,17 +10,14 @@
 @ApiModel
 public class SiteExecuteLogRequest {
 
-    @ApiModelProperty(value = "现场检测编号", dataType = "String")
-    private String siteExecutiveNo;
+    @ApiModelProperty(value = "记录编号", dataType = "String")
+    private String logNo;
 
-    @ApiModelProperty(value = "委托方名称", dataType = "String")
-    private String customerName;
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    private String recorderName;
 
-    @ApiModelProperty(value = "负责人", dataType = "String")
-    private String directorName;
-
-    @ApiModelProperty(value = "委托书id", dataType = "Long")
-    private Long id;
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    private String laboratoryName;
 
     @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
     private List<Long> ids;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
index 186526f..eaa8d65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,72 +28,91 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测记录id", dataType = "Long")
+    @TableField("site_executive_log_id")
+    private Long siteExecutiveLogId;
+
+    /**
+     * 外场检测id
+     */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 测量设备id
      */
+    @ApiModelProperty(value = "测量设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
     /**
      * 测量设备编号
      */
+    @ApiModelProperty(value = "测量设备编号", dataType = "String")
     @TableField("equipment_no")
     private String equipmentNo;
 
     /**
      * 测量设备型号
      */
+    @ApiModelProperty(value = "测量设备型号", dataType = "String")
     @TableField("equipment_model")
     private String equipmentModel;
 
     /**
      * 工作开始前外观及功能检查
      */
+    @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String")
     @TableField("before_work_check")
     private String beforeWorkCheck;
 
     /**
      * 工作开始前指标测试结果
      */
+    @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String")
     @TableField("before_work_result")
     private String beforeWorkResult;
 
     /**
      * 工作开始前记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long")
     @TableField("before_work_recorder_id")
     private Long beforeWorkRecorderId;
 
     /**
      * 工作开始前记录日期
      */
+    @ApiModelProperty(value = "工作开始前记录日期", dataType = "String")
     @TableField("before_work_recorder_date")
     private String beforeWorkRecorderDate;
 
     /**
      * 工作完成后外观及功能检查
      */
+    @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String")
     @TableField("after_work_check")
     private String afterWorkCheck;
 
     /**
      * 工作完成后指标测试结果
      */
+    @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String")
     @TableField("after_work_result")
     private String afterWorkResult;
 
     /**
      * 工作完成后记录人-计量人员id
      */
+    @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long")
     @TableField("after_work_recorder_id")
     private Long afterWorkRecorderId;
 
     /**
      * 工作完成后记录日期
      */
+    @ApiModelProperty(value = "工作完成后记录日期", dataType = "String")
     @TableField("after_work_recorder_date")
     private String afterWorkRecorderDate;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
index 7c266af..b05af2a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@
  * 
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 @Data
@@ -29,12 +30,14 @@
     /**
      * 现场检测审批id
      */
+    @ApiModelProperty(value = "现场检测审批id", dataType = "Long")
     @TableField("site_executive_info_id")
     private Long siteExecutiveInfoId;
 
     /**
      * 检测设备id
      */
+    @ApiModelProperty(value = "检测设备id", dataType = "Long")
     @TableField("equipment_id")
     private Long equipmentId;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
index 351ee29..f796007 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java
@@ -3,16 +3,18 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
  * 现场检测记录表
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Data
@@ -27,66 +29,77 @@
     /**
      * 现场检测记录单编号
      */
+    @ApiModelProperty(value = "现场检测记录单编号", dataType = "String")
     @TableField("log_no")
     private String logNo;
 
     /**
      * 现场检测id
      */
+    @ApiModelProperty(value = "现场检测id", dataType = "String")
     @TableField("site_executive_id")
     private String siteExecutiveId;
 
     /**
      * 联系人
      */
+    @ApiModelProperty(value = "联系人", dataType = "String")
     @TableField("contacts")
     private String contacts;
 
     /**
      * 电话
      */
+    @ApiModelProperty(value = "电话", dataType = "String")
     @TableField("contact_hone")
     private String contactHone;
 
     /**
      * 现场工作地点
      */
+    @ApiModelProperty(value = "现场工作地点", dataType = "String")
     @TableField("executive_address")
     private String executiveAddress;
 
     /**
      * 输出电压
      */
+    @ApiModelProperty(value = "输出电压", dataType = "String")
     @TableField("output_voltage")
     private String outputVoltage;
 
     /**
      * 零地电压
      */
+    @ApiModelProperty(value = "零地电压", dataType = "String")
     @TableField("zero_ground_voltage")
     private String zeroGroundVoltage;
 
     /**
      * 温度
      */
+    @ApiModelProperty(value = "温度", dataType = "String")
     @TableField("temperature")
     private String temperature;
 
     /**
      * 湿度
      */
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
     /**
      * 备注
      */
+    @ApiModelProperty(value = "备注", dataType = "String")
     @TableField("remark")
     private String remark;
 
     /**
      * 删除标记
      */
+    @ApiModelProperty(value = "删除标记", dataType = "String")
     @TableField("is_del")
     private String isDel;
 
@@ -102,5 +115,40 @@
     @TableField("update_time")
     private String updateTime;
 
+    @ApiModelProperty(hidden = true)
+    @TableField("create_user")
+    private Long createUser;
 
+    /**
+     * 记录人
+     */
+    @ApiModelProperty(value = "记录人", dataType = "Long")
+    @TableField("recorder")
+    private Long recorder;
+
+    /**
+     * 记录时间
+     */
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @TableField("record_time")
+    private String recordTime;
+
+    /**
+     * 实验室
+     */
+    @ApiModelProperty(value = "实验室", dataType = "String")
+    @TableField("laboratory_id")
+    private String laboratoryId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "携带仪器设备", dataType = "List")
+    private List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "记录人名称", dataType = "String")
+    private String recorderName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "实验室名称", dataType = "String")
+    private String laboratoryName;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
index 2aff98d..2acfbeb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,12 +28,14 @@
     /**
      * 外场检测id
      */
+    @ApiModelProperty(value = "外场检测id", dataType = "Long")
     @TableField("site_executive_id")
     private Long siteExecutiveId;
 
     /**
      * 计量人员id
      */
+    @ApiModelProperty(value = "计量人员id", dataType = "Long")
     @TableField("staff_id")
     private Long staffId;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
index 10759c0..64e11f7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
@@ -12,7 +11,6 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -30,44 +28,47 @@
     private IEquipmentFixedAssetsService equipmentFixedAssetsService;
 
     @Override
-    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+    public boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> equipmentInfoList) {
         //先删除所有的绑定关系
-        deleteBySiteExecutiveId(siteExecutiveId);
+        deleteBySiteExecutiveLogId(siteExecutiveLogId);
         //新写入绑定关系
         List<BusinessSiteExecutiveEquipmentRelation> list = new ArrayList<>();
         equipmentInfoList.forEach(assets -> {
             BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation();
-            siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId);
+            siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId());
             siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo());
             siteExecutiveEquipmentRelation.setEquipmentId(assets.getId());
+            siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId());
+            siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate());
+            siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId());
             list.add(siteExecutiveEquipmentRelation);
         });
         return this.saveBatch(list);
     }
 
+    @Override
+    public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) {
+        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
 
     @Override
-    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+    public Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
+        queryWrapper.in("site_executive_log_id", siteExecutiveLogIds);
         return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
     }
 
     @Override
-    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+    public List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) {
         QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site_executive_id", siteExecutiveId);
-        List<BusinessSiteExecutiveEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
-        if (list != null && list.size() > 0) {
-            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
-        }
-        return null;
-    }
-
-    @Override
-    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
-        QueryWrapper<BusinessSiteExecutiveEquipmentRelation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("site_executive_id", siteExecutiveIds);
-        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+        queryWrapper.eq("site_executive_log_id", siteExecutiveLogId);
+        return this.baseMapper.selectList(queryWrapper);
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
index f8bd8eb..361b98c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java
@@ -1,11 +1,20 @@
 package com.casic.missiles.service.Impl.business;
 
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
-import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper;
+import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
+import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
+import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,47 @@
 @Service
 public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl<BusinessSiteExecutiveInfoEquipmentRelationMapper, BusinessSiteExecutiveInfoEquipmentRelation> implements IBusinessSiteExecutiveInfoEquipmentRelationService {
 
+    @Resource
+    private IEquipmentFixedAssetsService equipmentFixedAssetsService;
+
+    @Override
+    public boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList) {
+        //先删除所有的绑定关系
+        deleteBySiteExecutiveId(siteExecutiveId);
+        //新写入绑定关系
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = new ArrayList<>();
+        equipmentInfoList.forEach(assets -> {
+            BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation();
+            siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId);
+            siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId());
+            list.add(siteExecutiveInfoEquipmentRelation);
+        });
+        return this.saveBatch(list);
+    }
+
+    @Override
+    public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+
+    @Override
+    public Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("site_executive_info_id", siteExecutiveIds);
+        return this.baseMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
+    @Override
+    public List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId) {
+        QueryWrapper<BusinessSiteExecutiveInfoEquipmentRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("site_executive_info_id", siteExecutiveId);
+        List<BusinessSiteExecutiveInfoEquipmentRelation> list = this.baseMapper.selectList(queryWrapper);
+        if (list != null && list.size() > 0) {
+            return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList()));
+        }
+        return null;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 319cbad..48ff287 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -25,7 +25,7 @@
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
-import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
 import com.casic.missiles.service.flowable.ApprovalOperateService;
@@ -64,7 +64,7 @@
     @Autowired
     private ApprovalOperateService approvalOperateService;
     @Autowired
-    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+    private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService;
     @Autowired
     private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService;
 
@@ -203,8 +203,8 @@
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
             siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id));
-            if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){
-                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource()));
+            if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) {
+                siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource()));
             }
         }
         return siteExecutiveInfo;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
index 85b919a..bee53cc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
@@ -1,20 +1,108 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper;
+import com.casic.missiles.model.business.BusinessOriginalRecord;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService;
+import com.casic.missiles.utils.DictCodeUtils;
+import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 /**
  * <p>
  * 现场检测记录表 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Service
 public class BusinessSiteExecutiveLogServiceImpl extends ServiceImpl<BusinessSiteExecutiveLogMapper, BusinessSiteExecutiveLog> implements IBusinessSiteExecutiveLogService {
 
+    @Autowired
+    private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService;
+
+    @Override
+    public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) {
+        initBusinessSiteExecutiveLog(siteExecutiveLog);
+        if (baseMapper.insert(siteExecutiveLog) > 0) {
+            //加入所用设备绑定关系
+            if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) {
+                siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList());
+            }
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO deleteSiteExecutiveLog(Long id) {
+        if (this.baseMapper.deleteById(id) > 0) {
+            //清除监测设备绑定关系
+            siteExecutiveEquipmentRelationService.deleteBySiteExecutiveLogId(id);
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog) {
+        if (this.baseMapper.updateById(businessSiteExecutiveLog) > 0) {
+
+            //加入所用设备绑定修改
+            if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) {
+                siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList());
+            }
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) {
+        BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id);
+        if (businessSiteExecutiveLog != null) {
+            //查询是否有关联的监测设备
+            businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id));
+        }
+        return businessSiteExecutiveLog;
+    }
+
+    @Override
+    public Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, SiteExecuteLogRequest request) {
+        // 获取列表
+        Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request);
+        if (!CollectionUtils.isEmpty(siteExecutiveLogListPage.getRecords())) {
+
+        }
+        return siteExecutiveLogListPage;
+    }
+
+    private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) {
+        Long maxNo = this.baseMapper.selectMaxCode();
+        String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo);
+        AuthUser authUser = ShiroKit.getUser();
+        siteExecutiveLog.setCreateUser(authUser.getId());
+        siteExecutiveLog.setLogNo(originNo);
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
index 7869717..ad1cc40 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
@@ -4,7 +4,6 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.mapper.business.BusinessSiteExecutiveStaffRelationMapper;
 import com.casic.missiles.mapper.meter.MeterStaffMapper;
-import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
 import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
@@ -20,7 +19,7 @@
  * 外场检测-计量人员关联表 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-03-23
  */
 @Service
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java
index aa58548..247920b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation;
-import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 
 import java.util.List;
 
@@ -16,11 +15,12 @@
  */
 public interface IBusinessSiteExecutiveEquipmentRelationService extends IService<BusinessSiteExecutiveEquipmentRelation> {
 
-    boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList);
+    boolean saveBatch(Long siteExecutiveLogId, List<BusinessSiteExecutiveEquipmentRelation> siteExecutiveEquipmentRelationList);
 
-    List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId);
+    Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId);
 
-    Boolean deleteBySiteExecutiveId(Long siteExecutiveId);
+    Boolean deleteBySiteExecutiveLogIds(List<Long> siteExecutiveLogIds);
 
-    Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds);
+    List<BusinessSiteExecutiveEquipmentRelation> getEquipmentsByExecutiveLogId(Long siteExecutiveLogId);
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java
index 1da43da..5238c18 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java
@@ -1,16 +1,26 @@
 package com.casic.missiles.service.business;
 
-import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+
+import java.util.List;
 
 /**
  * <p>
  *  服务类
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-04-03
  */
 public interface IBusinessSiteExecutiveInfoEquipmentRelationService extends IService<BusinessSiteExecutiveInfoEquipmentRelation> {
 
+    boolean saveBatch(Long siteExecutiveId, List<EquipmentFixedAssets> equipmentInfoList);
+
+    Boolean deleteBySiteExecutiveId(Long siteExecutiveId);
+
+    Boolean deleteBySiteExecutiveIds(List<Long> siteExecutiveIds);
+
+    List<EquipmentFixedAssets> getEquipmentsByExecutiveInfoId(Long siteExecutiveId);
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveLogService.java
index 3902009..e5acc79 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveLogService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveLogService.java
@@ -1,6 +1,9 @@
 package com.casic.missiles.service.business;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest;
 import com.casic.missiles.model.business.BusinessSiteExecutiveLog;
 
 /**
@@ -13,4 +16,13 @@
  */
 public interface IBusinessSiteExecutiveLogService extends IService<BusinessSiteExecutiveLog> {
 
+    ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog);
+
+    ReturnDTO deleteSiteExecutiveLog(Long id);
+
+    ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog);
+
+    BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id);
+
+    Page<BusinessSiteExecutiveLog> siteExecutiveLogListPage(Page<BusinessSiteExecutiveLog> page, SiteExecuteLogRequest request);
 }