list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 28c6344..8e875f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -20,12 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.Objects;
/**
@@ -52,6 +51,14 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
+ @ApiOperation("设备批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ equipmentInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("设备保存至草稿箱")
@PostMapping("/save")
public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 28c6344..8e875f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -20,12 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.Objects;
/**
@@ -52,6 +51,14 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
+ @ApiOperation("设备批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ equipmentInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("设备保存至草稿箱")
@PostMapping("/save")
public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
index f5a13dc..b99cd1c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.lang.Assert;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskApproverRequest;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskRequest;
import com.casic.missiles.dto.flowable.ApprovalAgreeRequest;
import com.casic.missiles.dto.flowable.ApprovalLogResponse;
import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -13,7 +15,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -67,4 +68,24 @@
* 审批操作-删除
* 该功能需要具体业务的删除，放在各业务controller中处理，提供公共flowable删除处理service:approvalOperateService
*/
+
+ /**
+ * 审批操作-动态增加节点(后加签)，流程中不存在的节点增加，后期储备使用
+ * @param request
+ * @return
+ */
+ @ApiOperation("审批操作-动态增加节点")
+ @PostMapping("/addTask")
+ @ResponseBody
+ public ReturnDTO addTask(@RequestBody @Valid ApprovalAddTaskRequest request) {
+ return approvalOperateService.addTask(request);
+ }
+
+ @ApiOperation("审批操作-动态增加审批人")
+ @PostMapping("/addTaskApprover")
+ @ResponseBody
+ public ReturnDTO addTaskApprover(@RequestBody @Valid ApprovalAddTaskApproverRequest request) {
+ return approvalOperateService.addTaskApprover(request);
+ }
+
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 28c6344..8e875f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -20,12 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.Objects;
/**
@@ -52,6 +51,14 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
+ @ApiOperation("设备批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ equipmentInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("设备保存至草稿箱")
@PostMapping("/save")
public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
index f5a13dc..b99cd1c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.lang.Assert;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskApproverRequest;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskRequest;
import com.casic.missiles.dto.flowable.ApprovalAgreeRequest;
import com.casic.missiles.dto.flowable.ApprovalLogResponse;
import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -13,7 +15,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -67,4 +68,24 @@
* 审批操作-删除
* 该功能需要具体业务的删除，放在各业务controller中处理，提供公共flowable删除处理service:approvalOperateService
*/
+
+ /**
+ * 审批操作-动态增加节点(后加签)，流程中不存在的节点增加，后期储备使用
+ * @param request
+ * @return
+ */
+ @ApiOperation("审批操作-动态增加节点")
+ @PostMapping("/addTask")
+ @ResponseBody
+ public ReturnDTO addTask(@RequestBody @Valid ApprovalAddTaskRequest request) {
+ return approvalOperateService.addTask(request);
+ }
+
+ @ApiOperation("审批操作-动态增加审批人")
+ @PostMapping("/addTaskApprover")
+ @ResponseBody
+ public ReturnDTO addTaskApprover(@RequestBody @Valid ApprovalAddTaskApproverRequest request) {
+ return approvalOperateService.addTaskApprover(request);
+ }
+
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 7b4fdde..32462d3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -18,13 +18,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.List;
import java.util.Objects;
@@ -48,11 +47,18 @@
@ApiOperation("人员登记列表&基础信息（分页）")
@PostMapping("/listPage")
public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception {
-
Page page = PageFactory.defaultPage();
return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
}
+ @ApiOperation("人员登记批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ staffInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("人员登记导出")
@PostMapping("/listExport")
public void exportList(@RequestBody StaffListRequest request) throws Exception {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 28c6344..8e875f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -20,12 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.Objects;
/**
@@ -52,6 +51,14 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
+ @ApiOperation("设备批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ equipmentInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("设备保存至草稿箱")
@PostMapping("/save")
public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
index f5a13dc..b99cd1c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.lang.Assert;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskApproverRequest;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskRequest;
import com.casic.missiles.dto.flowable.ApprovalAgreeRequest;
import com.casic.missiles.dto.flowable.ApprovalLogResponse;
import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -13,7 +15,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -67,4 +68,24 @@
* 审批操作-删除
* 该功能需要具体业务的删除，放在各业务controller中处理，提供公共flowable删除处理service:approvalOperateService
*/
+
+ /**
+ * 审批操作-动态增加节点(后加签)，流程中不存在的节点增加，后期储备使用
+ * @param request
+ * @return
+ */
+ @ApiOperation("审批操作-动态增加节点")
+ @PostMapping("/addTask")
+ @ResponseBody
+ public ReturnDTO addTask(@RequestBody @Valid ApprovalAddTaskRequest request) {
+ return approvalOperateService.addTask(request);
+ }
+
+ @ApiOperation("审批操作-动态增加审批人")
+ @PostMapping("/addTaskApprover")
+ @ResponseBody
+ public ReturnDTO addTaskApprover(@RequestBody @Valid ApprovalAddTaskApproverRequest request) {
+ return approvalOperateService.addTaskApprover(request);
+ }
+
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 7b4fdde..32462d3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -18,13 +18,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.List;
import java.util.Objects;
@@ -48,11 +47,18 @@
@ApiOperation("人员登记列表&基础信息（分页）")
@PostMapping("/listPage")
public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception {
-
Page page = PageFactory.defaultPage();
return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
}
+ @ApiOperation("人员登记批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ staffInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("人员登记导出")
@PostMapping("/listExport")
public void exportList(@RequestBody StaffListRequest request) throws Exception {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 49909c8..a9107db 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
#作者
author: wangpeng
#待生成对象表名
- table-name: biz_equipment_standard_technology_index_relation
+ table-name: biz_equipment_standard_check_modify_record
reminder:
#节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 28c6344..8e875f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -20,12 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.Objects;
/**
@@ -52,6 +51,14 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
+ @ApiOperation("设备批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ equipmentInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("设备保存至草稿箱")
@PostMapping("/save")
public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
index f5a13dc..b99cd1c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.lang.Assert;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskApproverRequest;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskRequest;
import com.casic.missiles.dto.flowable.ApprovalAgreeRequest;
import com.casic.missiles.dto.flowable.ApprovalLogResponse;
import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -13,7 +15,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -67,4 +68,24 @@
* 审批操作-删除
* 该功能需要具体业务的删除，放在各业务controller中处理，提供公共flowable删除处理service:approvalOperateService
*/
+
+ /**
+ * 审批操作-动态增加节点(后加签)，流程中不存在的节点增加，后期储备使用
+ * @param request
+ * @return
+ */
+ @ApiOperation("审批操作-动态增加节点")
+ @PostMapping("/addTask")
+ @ResponseBody
+ public ReturnDTO addTask(@RequestBody @Valid ApprovalAddTaskRequest request) {
+ return approvalOperateService.addTask(request);
+ }
+
+ @ApiOperation("审批操作-动态增加审批人")
+ @PostMapping("/addTaskApprover")
+ @ResponseBody
+ public ReturnDTO addTaskApprover(@RequestBody @Valid ApprovalAddTaskApproverRequest request) {
+ return approvalOperateService.addTaskApprover(request);
+ }
+
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 7b4fdde..32462d3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -18,13 +18,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.List;
import java.util.Objects;
@@ -48,11 +47,18 @@
@ApiOperation("人员登记列表&基础信息（分页）")
@PostMapping("/listPage")
public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception {
-
Page page = PageFactory.defaultPage();
return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
}
+ @ApiOperation("人员登记批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ staffInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("人员登记导出")
@PostMapping("/listExport")
public void exportList(@RequestBody StaffListRequest request) throws Exception {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 49909c8..a9107db 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
#作者
author: wangpeng
#待生成对象表名
- table-name: biz_equipment_standard_technology_index_relation
+ table-name: biz_equipment_standard_check_modify_record
reminder:
#节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
index 3f292f0..2cba29b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
@@ -58,6 +58,7 @@
EQUIPMENT_LEND_APPROVAL = 'sbyzzsbjcgl', // 设备借出管理
EQUIPMENT_BORROW_APPROVAL = 'sbyzzsbjygl', // 设备借用管理
EXCEPTION_HANDLING_APPROVAL = 'sbyzzycqkczgl', // 异常情况处置管理
+ CHECK_RECORD_APPROVAL = 'sbyzzhcjlgl', // 核查记录管理
// 计量检定业务
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 证书审批管理(检定审批管理)
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 28c6344..8e875f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -20,12 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.Objects;
/**
@@ -52,6 +51,14 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
+ @ApiOperation("设备批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ equipmentInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("设备保存至草稿箱")
@PostMapping("/save")
public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
index f5a13dc..b99cd1c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.lang.Assert;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskApproverRequest;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskRequest;
import com.casic.missiles.dto.flowable.ApprovalAgreeRequest;
import com.casic.missiles.dto.flowable.ApprovalLogResponse;
import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -13,7 +15,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -67,4 +68,24 @@
* 审批操作-删除
* 该功能需要具体业务的删除，放在各业务controller中处理，提供公共flowable删除处理service:approvalOperateService
*/
+
+ /**
+ * 审批操作-动态增加节点(后加签)，流程中不存在的节点增加，后期储备使用
+ * @param request
+ * @return
+ */
+ @ApiOperation("审批操作-动态增加节点")
+ @PostMapping("/addTask")
+ @ResponseBody
+ public ReturnDTO addTask(@RequestBody @Valid ApprovalAddTaskRequest request) {
+ return approvalOperateService.addTask(request);
+ }
+
+ @ApiOperation("审批操作-动态增加审批人")
+ @PostMapping("/addTaskApprover")
+ @ResponseBody
+ public ReturnDTO addTaskApprover(@RequestBody @Valid ApprovalAddTaskApproverRequest request) {
+ return approvalOperateService.addTaskApprover(request);
+ }
+
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 7b4fdde..32462d3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -18,13 +18,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.List;
import java.util.Objects;
@@ -48,11 +47,18 @@
@ApiOperation("人员登记列表&基础信息（分页）")
@PostMapping("/listPage")
public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception {
-
Page page = PageFactory.defaultPage();
return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
}
+ @ApiOperation("人员登记批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ staffInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("人员登记导出")
@PostMapping("/listExport")
public void exportList(@RequestBody StaffListRequest request) throws Exception {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 49909c8..a9107db 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
#作者
author: wangpeng
#待生成对象表名
- table-name: biz_equipment_standard_technology_index_relation
+ table-name: biz_equipment_standard_check_modify_record
reminder:
#节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
index 3f292f0..2cba29b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
@@ -58,6 +58,7 @@
EQUIPMENT_LEND_APPROVAL = 'sbyzzsbjcgl', // 设备借出管理
EQUIPMENT_BORROW_APPROVAL = 'sbyzzsbjygl', // 设备借用管理
EXCEPTION_HANDLING_APPROVAL = 'sbyzzycqkczgl', // 异常情况处置管理
+ CHECK_RECORD_APPROVAL = 'sbyzzhcjlgl', // 核查记录管理
// 计量检定业务
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 证书审批管理(检定审批管理)
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index ee8289a..6633ab8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -41,6 +41,7 @@
STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"),
EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"),
STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"),
+ CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"),
/**
* 资源管理模块
@@ -75,6 +76,7 @@
OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
OUTSOURCE_NOTICE_SAVE_FAILED(2614, "测试、校准或检定工作分包通知书保存至草稿箱失败"),
+ MEASURE_APPROVAL_SAVE_FAILED(2615, "检定审批保存至草稿箱失败"),
/**
* 历史遗留备用
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 28c6344..8e875f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -20,12 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.Objects;
/**
@@ -52,6 +51,14 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
+ @ApiOperation("设备批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ equipmentInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("设备保存至草稿箱")
@PostMapping("/save")
public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
index f5a13dc..b99cd1c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.lang.Assert;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskApproverRequest;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskRequest;
import com.casic.missiles.dto.flowable.ApprovalAgreeRequest;
import com.casic.missiles.dto.flowable.ApprovalLogResponse;
import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -13,7 +15,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -67,4 +68,24 @@
* 审批操作-删除
* 该功能需要具体业务的删除，放在各业务controller中处理，提供公共flowable删除处理service:approvalOperateService
*/
+
+ /**
+ * 审批操作-动态增加节点(后加签)，流程中不存在的节点增加，后期储备使用
+ * @param request
+ * @return
+ */
+ @ApiOperation("审批操作-动态增加节点")
+ @PostMapping("/addTask")
+ @ResponseBody
+ public ReturnDTO addTask(@RequestBody @Valid ApprovalAddTaskRequest request) {
+ return approvalOperateService.addTask(request);
+ }
+
+ @ApiOperation("审批操作-动态增加审批人")
+ @PostMapping("/addTaskApprover")
+ @ResponseBody
+ public ReturnDTO addTaskApprover(@RequestBody @Valid ApprovalAddTaskApproverRequest request) {
+ return approvalOperateService.addTaskApprover(request);
+ }
+
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 7b4fdde..32462d3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -18,13 +18,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.List;
import java.util.Objects;
@@ -48,11 +47,18 @@
@ApiOperation("人员登记列表&基础信息（分页）")
@PostMapping("/listPage")
public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception {
-
Page page = PageFactory.defaultPage();
return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
}
+ @ApiOperation("人员登记批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ staffInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("人员登记导出")
@PostMapping("/listExport")
public void exportList(@RequestBody StaffListRequest request) throws Exception {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 49909c8..a9107db 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
#作者
author: wangpeng
#待生成对象表名
- table-name: biz_equipment_standard_technology_index_relation
+ table-name: biz_equipment_standard_check_modify_record
reminder:
#节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
index 3f292f0..2cba29b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
@@ -58,6 +58,7 @@
EQUIPMENT_LEND_APPROVAL = 'sbyzzsbjcgl', // 设备借出管理
EQUIPMENT_BORROW_APPROVAL = 'sbyzzsbjygl', // 设备借用管理
EXCEPTION_HANDLING_APPROVAL = 'sbyzzycqkczgl', // 异常情况处置管理
+ CHECK_RECORD_APPROVAL = 'sbyzzhcjlgl', // 核查记录管理
// 计量检定业务
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 证书审批管理(检定审批管理)
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index ee8289a..6633ab8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -41,6 +41,7 @@
STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"),
EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"),
STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"),
+ CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"),
/**
* 资源管理模块
@@ -75,6 +76,7 @@
OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
OUTSOURCE_NOTICE_SAVE_FAILED(2614, "测试、校准或检定工作分包通知书保存至草稿箱失败"),
+ MEASURE_APPROVAL_SAVE_FAILED(2615, "检定审批保存至草稿箱失败"),
/**
* 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 4b1c3a4..1822b7d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -40,6 +40,8 @@
MEASURE_ITEM("measureItem", "检定项", "检定项"),
MEASURE_INFO("measureInfo", "检定数据", "检定数据"),
MEASURE_APPROVAL("measureApproval", "检定审批", "检定审批"),
+ CHECK_INFO("checkInfo", "核查数据", "核查数据"),
+ CHECK_RECORD("checkRecord", "核查记录", "核查记录"),
/**
* 设备与装置
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 28c6344..8e875f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -20,12 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.Objects;
/**
@@ -52,6 +51,14 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
+ @ApiOperation("设备批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ equipmentInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("设备保存至草稿箱")
@PostMapping("/save")
public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
index f5a13dc..b99cd1c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.lang.Assert;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskApproverRequest;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskRequest;
import com.casic.missiles.dto.flowable.ApprovalAgreeRequest;
import com.casic.missiles.dto.flowable.ApprovalLogResponse;
import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -13,7 +15,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -67,4 +68,24 @@
* 审批操作-删除
* 该功能需要具体业务的删除，放在各业务controller中处理，提供公共flowable删除处理service:approvalOperateService
*/
+
+ /**
+ * 审批操作-动态增加节点(后加签)，流程中不存在的节点增加，后期储备使用
+ * @param request
+ * @return
+ */
+ @ApiOperation("审批操作-动态增加节点")
+ @PostMapping("/addTask")
+ @ResponseBody
+ public ReturnDTO addTask(@RequestBody @Valid ApprovalAddTaskRequest request) {
+ return approvalOperateService.addTask(request);
+ }
+
+ @ApiOperation("审批操作-动态增加审批人")
+ @PostMapping("/addTaskApprover")
+ @ResponseBody
+ public ReturnDTO addTaskApprover(@RequestBody @Valid ApprovalAddTaskApproverRequest request) {
+ return approvalOperateService.addTaskApprover(request);
+ }
+
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 7b4fdde..32462d3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -18,13 +18,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.List;
import java.util.Objects;
@@ -48,11 +47,18 @@
@ApiOperation("人员登记列表&基础信息（分页）")
@PostMapping("/listPage")
public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception {
-
Page page = PageFactory.defaultPage();
return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
}
+ @ApiOperation("人员登记批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ staffInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("人员登记导出")
@PostMapping("/listExport")
public void exportList(@RequestBody StaffListRequest request) throws Exception {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 49909c8..a9107db 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
#作者
author: wangpeng
#待生成对象表名
- table-name: biz_equipment_standard_technology_index_relation
+ table-name: biz_equipment_standard_check_modify_record
reminder:
#节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
index 3f292f0..2cba29b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
@@ -58,6 +58,7 @@
EQUIPMENT_LEND_APPROVAL = 'sbyzzsbjcgl', // 设备借出管理
EQUIPMENT_BORROW_APPROVAL = 'sbyzzsbjygl', // 设备借用管理
EXCEPTION_HANDLING_APPROVAL = 'sbyzzycqkczgl', // 异常情况处置管理
+ CHECK_RECORD_APPROVAL = 'sbyzzhcjlgl', // 核查记录管理
// 计量检定业务
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 证书审批管理(检定审批管理)
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index ee8289a..6633ab8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -41,6 +41,7 @@
STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"),
EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"),
STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"),
+ CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"),
/**
* 资源管理模块
@@ -75,6 +76,7 @@
OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
OUTSOURCE_NOTICE_SAVE_FAILED(2614, "测试、校准或检定工作分包通知书保存至草稿箱失败"),
+ MEASURE_APPROVAL_SAVE_FAILED(2615, "检定审批保存至草稿箱失败"),
/**
* 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 4b1c3a4..1822b7d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -40,6 +40,8 @@
MEASURE_ITEM("measureItem", "检定项", "检定项"),
MEASURE_INFO("measureInfo", "检定数据", "检定数据"),
MEASURE_APPROVAL("measureApproval", "检定审批", "检定审批"),
+ CHECK_INFO("checkInfo", "核查数据", "核查数据"),
+ CHECK_RECORD("checkRecord", "核查记录", "核查记录"),
/**
* 设备与装置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java
index 91834ba..c357f35 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java
@@ -32,4 +32,22 @@
String X = "223";
String Y = "224";
String Z = "225";
+ //核查记录相关
+ String AA = "317";
+ String BB = "320";
+ String CC = "332";
+ String DD = "326";
+ String EE = "308";
+ String FF = "302";
+ String GG = "311";
+ String HH = "341";
+ String II = "344";
+ String JJ = "338";
+ String KK = "305";
+ String LL = "314";
+ String MM = "352";
+ String NN = "354";
+ String OO = "323";
+ String PP = "366";
+ String QQ = "329";
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 28c6344..8e875f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -20,12 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.Objects;
/**
@@ -52,6 +51,14 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
+ @ApiOperation("设备批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ equipmentInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("设备保存至草稿箱")
@PostMapping("/save")
public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
index f5a13dc..b99cd1c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.lang.Assert;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskApproverRequest;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskRequest;
import com.casic.missiles.dto.flowable.ApprovalAgreeRequest;
import com.casic.missiles.dto.flowable.ApprovalLogResponse;
import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -13,7 +15,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -67,4 +68,24 @@
* 审批操作-删除
* 该功能需要具体业务的删除，放在各业务controller中处理，提供公共flowable删除处理service:approvalOperateService
*/
+
+ /**
+ * 审批操作-动态增加节点(后加签)，流程中不存在的节点增加，后期储备使用
+ * @param request
+ * @return
+ */
+ @ApiOperation("审批操作-动态增加节点")
+ @PostMapping("/addTask")
+ @ResponseBody
+ public ReturnDTO addTask(@RequestBody @Valid ApprovalAddTaskRequest request) {
+ return approvalOperateService.addTask(request);
+ }
+
+ @ApiOperation("审批操作-动态增加审批人")
+ @PostMapping("/addTaskApprover")
+ @ResponseBody
+ public ReturnDTO addTaskApprover(@RequestBody @Valid ApprovalAddTaskApproverRequest request) {
+ return approvalOperateService.addTaskApprover(request);
+ }
+
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 7b4fdde..32462d3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -18,13 +18,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.List;
import java.util.Objects;
@@ -48,11 +47,18 @@
@ApiOperation("人员登记列表&基础信息（分页）")
@PostMapping("/listPage")
public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception {
-
Page page = PageFactory.defaultPage();
return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
}
+ @ApiOperation("人员登记批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ staffInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("人员登记导出")
@PostMapping("/listExport")
public void exportList(@RequestBody StaffListRequest request) throws Exception {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 49909c8..a9107db 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
#作者
author: wangpeng
#待生成对象表名
- table-name: biz_equipment_standard_technology_index_relation
+ table-name: biz_equipment_standard_check_modify_record
reminder:
#节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
index 3f292f0..2cba29b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
@@ -58,6 +58,7 @@
EQUIPMENT_LEND_APPROVAL = 'sbyzzsbjcgl', // 设备借出管理
EQUIPMENT_BORROW_APPROVAL = 'sbyzzsbjygl', // 设备借用管理
EXCEPTION_HANDLING_APPROVAL = 'sbyzzycqkczgl', // 异常情况处置管理
+ CHECK_RECORD_APPROVAL = 'sbyzzhcjlgl', // 核查记录管理
// 计量检定业务
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 证书审批管理(检定审批管理)
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index ee8289a..6633ab8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -41,6 +41,7 @@
STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"),
EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"),
STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"),
+ CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"),
/**
* 资源管理模块
@@ -75,6 +76,7 @@
OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
OUTSOURCE_NOTICE_SAVE_FAILED(2614, "测试、校准或检定工作分包通知书保存至草稿箱失败"),
+ MEASURE_APPROVAL_SAVE_FAILED(2615, "检定审批保存至草稿箱失败"),
/**
* 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 4b1c3a4..1822b7d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -40,6 +40,8 @@
MEASURE_ITEM("measureItem", "检定项", "检定项"),
MEASURE_INFO("measureInfo", "检定数据", "检定数据"),
MEASURE_APPROVAL("measureApproval", "检定审批", "检定审批"),
+ CHECK_INFO("checkInfo", "核查数据", "核查数据"),
+ CHECK_RECORD("checkRecord", "核查记录", "核查记录"),
/**
* 设备与装置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java
index 91834ba..c357f35 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java
@@ -32,4 +32,22 @@
String X = "223";
String Y = "224";
String Z = "225";
+ //核查记录相关
+ String AA = "317";
+ String BB = "320";
+ String CC = "332";
+ String DD = "326";
+ String EE = "308";
+ String FF = "302";
+ String GG = "311";
+ String HH = "341";
+ String II = "344";
+ String JJ = "338";
+ String KK = "305";
+ String LL = "314";
+ String MM = "352";
+ String NN = "354";
+ String OO = "323";
+ String PP = "366";
+ String QQ = "329";
}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 1cd549a..9a417f1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -106,4 +106,11 @@
String EQUIPMENT_SUPPLIER_EVALUATE = "06";
//合格供方名录
String SUPPLIER_INFO = "07";
+
+ //主要是电学：多功能校准源标准装置/直流稳压电源检定装置
+ String ELECTRICITY_INFO = "01";
+ //主要是压力：二等铂电阻温度计标准装置/0.02级活塞式压力计标准装置
+ String PRESSURE_INFO = "01";
+ //主要是无线电：频谱分析仪检定装置等
+ String RADIO_INFO = "01";
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO> carryOutItemListPage(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
index 28c6344..8e875f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java
@@ -20,12 +20,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.Objects;
/**
@@ -52,6 +51,14 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
+ @ApiOperation("设备批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ equipmentInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("设备保存至草稿箱")
@PostMapping("/save")
public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
index f5a13dc..b99cd1c 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.lang.Assert;
import com.casic.missiles.dto.ReturnDTO;
import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskApproverRequest;
+import com.casic.missiles.dto.flowable.ApprovalAddTaskRequest;
import com.casic.missiles.dto.flowable.ApprovalAgreeRequest;
import com.casic.missiles.dto.flowable.ApprovalLogResponse;
import com.casic.missiles.enums.BusinessExceptionEnum;
@@ -13,7 +15,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@@ -67,4 +68,24 @@
* 审批操作-删除
* 该功能需要具体业务的删除，放在各业务controller中处理，提供公共flowable删除处理service:approvalOperateService
*/
+
+ /**
+ * 审批操作-动态增加节点(后加签)，流程中不存在的节点增加，后期储备使用
+ * @param request
+ * @return
+ */
+ @ApiOperation("审批操作-动态增加节点")
+ @PostMapping("/addTask")
+ @ResponseBody
+ public ReturnDTO addTask(@RequestBody @Valid ApprovalAddTaskRequest request) {
+ return approvalOperateService.addTask(request);
+ }
+
+ @ApiOperation("审批操作-动态增加审批人")
+ @PostMapping("/addTaskApprover")
+ @ResponseBody
+ public ReturnDTO addTaskApprover(@RequestBody @Valid ApprovalAddTaskApproverRequest request) {
+ return approvalOperateService.addTaskApprover(request);
+ }
+
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
index 7b4fdde..32462d3 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java
@@ -18,13 +18,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
import java.util.List;
import java.util.Objects;
@@ -48,11 +47,18 @@
@ApiOperation("人员登记列表&基础信息（分页）")
@PostMapping("/listPage")
public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception {
-
Page page = PageFactory.defaultPage();
return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request)));
}
+ @ApiOperation("人员登记批量导入")
+ @PostMapping("/import")
+ @ResponseBody
+ public ReturnDTO infoImport(@RequestParam("file") MultipartFile file) throws IOException {
+ staffInfoService.infoImport(file);
+ return ReturnUtil.success();
+ }
+
@ApiOperation("人员登记导出")
@PostMapping("/listExport")
public void exportList(@RequestBody StaffListRequest request) throws Exception {
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 49909c8..a9107db 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -126,7 +126,7 @@
#作者
author: wangpeng
#待生成对象表名
- table-name: biz_equipment_standard_technology_index_relation
+ table-name: biz_equipment_standard_check_modify_record
reminder:
#节点--common模块config包 ReminderNodeConfig配置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
index 3f292f0..2cba29b 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/formIdDict.ts
@@ -58,6 +58,7 @@
EQUIPMENT_LEND_APPROVAL = 'sbyzzsbjcgl', // 设备借出管理
EQUIPMENT_BORROW_APPROVAL = 'sbyzzsbjygl', // 设备借用管理
EXCEPTION_HANDLING_APPROVAL = 'sbyzzycqkczgl', // 异常情况处置管理
+ CHECK_RECORD_APPROVAL = 'sbyzzhcjlgl', // 核查记录管理
// 计量检定业务
CERTIFICATE_APPROVAL = 'jljdywzsspgl', // 证书审批管理(检定审批管理)
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index ee8289a..6633ab8 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -41,6 +41,7 @@
STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"),
EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"),
STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"),
+ CHECK_APPROVAL_SAVE_FAILED(2412, "核查记录审批保存至草稿箱失败"),
/**
* 资源管理模块
@@ -75,6 +76,7 @@
OUTSOURCE_ACCESS_SAVE_FAILED(2612, "测试、校准或检定工作分包评审表保存至草稿箱失败"),
OUTSOURCE_PROTOCOL_SAVE_FAILED(2613, "测试、校准或检定工作分包协议书保存至草稿箱失败"),
OUTSOURCE_NOTICE_SAVE_FAILED(2614, "测试、校准或检定工作分包通知书保存至草稿箱失败"),
+ MEASURE_APPROVAL_SAVE_FAILED(2615, "检定审批保存至草稿箱失败"),
/**
* 历史遗留备用
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 4b1c3a4..1822b7d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -40,6 +40,8 @@
MEASURE_ITEM("measureItem", "检定项", "检定项"),
MEASURE_INFO("measureInfo", "检定数据", "检定数据"),
MEASURE_APPROVAL("measureApproval", "检定审批", "检定审批"),
+ CHECK_INFO("checkInfo", "核查数据", "核查数据"),
+ CHECK_RECORD("checkRecord", "核查记录", "核查记录"),
/**
* 设备与装置
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java
index 91834ba..c357f35 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateFileCodeEnum.java
@@ -32,4 +32,22 @@
String X = "223";
String Y = "224";
String Z = "225";
+ //核查记录相关
+ String AA = "317";
+ String BB = "320";
+ String CC = "332";
+ String DD = "326";
+ String EE = "308";
+ String FF = "302";
+ String GG = "311";
+ String HH = "341";
+ String II = "344";
+ String JJ = "338";
+ String KK = "305";
+ String LL = "314";
+ String MM = "352";
+ String NN = "354";
+ String OO = "323";
+ String PP = "366";
+ String QQ = "329";
}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
index 1cd549a..9a417f1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/NoGenerateRecordTypeCodeEnum.java
@@ -106,4 +106,11 @@
String EQUIPMENT_SUPPLIER_EVALUATE = "06";
//合格供方名录
String SUPPLIER_INFO = "07";
+
+ //主要是电学：多功能校准源标准装置/直流稳压电源检定装置
+ String ELECTRICITY_INFO = "01";
+ //主要是压力：二等铂电阻温度计标准装置/0.02级活塞式压力计标准装置
+ String PRESSURE_INFO = "01";
+ //主要是无线电：频谱分析仪检定装置等
+ String RADIO_INFO = "01";
}
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 b21208b..954e0c7 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
@@ -19,6 +19,8 @@
String MEASURE_ITEM_CATEGORY_PREFIX = "jdxfl";
//检定数据
String MEASURE_INFO_PREFIX = "jdsj";
+ //核查数据
+ String CHECK_INFO_PREFIX = "hcsj";
//模块类型
String MODULE_TYPE_PREFIX = "mklx";
@@ -27,6 +29,7 @@
/*************设备与装置模块**************/
String EQUIPMENT_PREFIX = "sbtz";
+ String EQUIPMENT_IMPORT_PREFIX = "sbtzdr";
String EQUIPMENT_STATUS_PREFIX = "sbztwh";
String STANDARD_BUILD_PREFIX = "bzjl";
String STANDARD_STATS_PREFIX = "bzztwh";
@@ -35,6 +38,8 @@
String MAINTAIN_PREFIX = "whby";
String MONITOR_EQUIPMENT_PREFIX = "jcsb";
String MONITOR_RADIO_LIBRARY_PREFIX = "wxdk";
+ //核查项分类
+ String CHECK_ITEM_CATEGORY_PREFIX = "hcxfl";
/*************资源管理模块**************/
String SUPPLIER_PREFIX = "hggf";
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
index 0993e94..5dbe969 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java
@@ -44,7 +44,8 @@
super(baseApprovalService);
}
- // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，显示在检定审批管理新建页面
+ // TODO: 2023/10/10 柴壮：检定数据管理中点击生成原始记录和检定证书(生成证书和原始记录编号，二者编号相同)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在检定审批管理新建页面
@ApiOperation("草稿箱-保存")
@PostMapping("/save")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
index 2e2451d..8882ba5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureInfoController.java
@@ -4,9 +4,9 @@
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.deviceMeasure.MeasureInfoDetailRequest;
import com.casic.missiles.dto.business.deviceMeasure.MeasureInfoListRequest;
import com.casic.missiles.enums.ExportEnum;
import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo;
@@ -60,8 +60,8 @@
@ApiOperation("详情")
@PostMapping("/detail")
- public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
- return measureInfoService.detail(idDTO.getId());
+ public ReturnDTO detail(@RequestBody @Valid MeasureInfoDetailRequest request) throws Exception {
+ return measureInfoService.detail(request);
}
@ApiOperation("导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
index ea54aa9..7440780 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureItemInfoController.java
@@ -55,7 +55,7 @@
return measureItemInfoService.addMeasureInfo(measureItemInfo);
}
- @ApiOperation("列表页操作更新/上传模板（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
+ @ApiOperation("列表页操作更新（更新时根据是否有id判断是否为首次更新，首次更新保证第一次初始化和受检设备规格型号表绑定）")
@PostMapping("/update")
public ReturnDTO updateMeasureInfo(@RequestBody @Valid BizBusinessDeviceMeasureItemInfo measureItemInfo) {
return measureItemInfoService.updateMeasureInfo(measureItemInfo);
@@ -67,7 +67,7 @@
return measureItemInfoService.configMeasureInfo(measureItemConfigRequest);
}
- @ApiOperation("详情（传入字典code和id，后台根据字典值判断取哪套的检定项）")
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
@PostMapping("/detail")
public ReturnDTO detail(@RequestBody @Valid MeasureItemDetailRequest request) throws Exception {
return measureItemInfoService.detail(request);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
new file mode 100644
index 0000000..a3fa042
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckInfoController.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckInfoListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckInfo;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据基本信息表 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理")
+@RestController
+@RequestMapping("/standard/check/info")
+public class BizEquipmentStandardCheckInfoController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckInfoService checkInfoService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> CheckInfoListPage(@RequestBody @Valid CheckInfoListRequest request) {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkInfoService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/add")
+ public ReturnDTO addCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.addCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckInfo(@RequestBody @Valid BizEquipmentStandardCheckInfo checkInfo) {
+ return checkInfoService.updateCheckInfo(checkInfo);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkInfoService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckInfoListRequest request) throws Exception {
+ List list;
+ if (!CollectionUtils.isEmpty(request.getIds())) {
+ list = checkInfoService.checkInfoListByIds(request.getIds());
+ } else {
+ list = checkInfoService.list(request);
+ }
+ super.exportExcel(BizEquipmentStandardCheckInfo.class, list, ExportEnum.CHECK_INFO.getSheetName());
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
new file mode 100644
index 0000000..3c02477
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemCategoryController.java
@@ -0,0 +1,61 @@
+package com.casic.missiles.controller.equipment;
+
+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.equipment.CheckItemCategoryListRequest;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckItemCategory;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项分类 前端控制器
+ * @author wangpeng
+ * @since 2023-10-13
+ */
+@Api(tags = "标准装置管理-核查项分类")
+@RestController
+@RequestMapping("/standard/check/itemCategory")
+public class BizEquipmentStandardCheckItemCategoryController extends ExportController {
+ @Autowired
+ private IBizEquipmentStandardCheckItemCategoryService checkItemCategoryService;
+
+ @ApiOperation("列表")
+ @PostMapping("/listPage")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid CheckItemCategoryListRequest request) throws Exception {
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(checkItemCategoryService.listPage(page, request)));
+ }
+
+ @ApiOperation("新增（系统管理员初始化维护使用）")
+ @PostMapping("/add")
+ public ReturnDTO addCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.addCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("更新")
+ @PostMapping("/update")
+ public ReturnDTO updateCheckItemCategory(@RequestBody @Valid BizEquipmentStandardCheckItemCategory checkItemCategory) {
+ return checkItemCategoryService.updateCheckItemCategory(checkItemCategory);
+ }
+
+ @ApiOperation("删除")
+ @PostMapping("/delete")
+ public ReturnDTO deleteCheckItemCategory(@RequestBody @Valid IdDTO idDTO) {
+ return checkItemCategoryService.deleteCheckItemCategory(idDTO.getId());
+ }
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
new file mode 100644
index 0000000..9c76d97
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -0,0 +1,45 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckItemConfigRequest;
+import com.casic.missiles.dto.equipment.CheckItemDataDetailResponse;
+import com.casic.missiles.dto.equipment.CheckItemDetailRequest;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckItemDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查项数据(包含字典的字段都存为字典value) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查项数据")
+@RestController
+@RequestMapping("/standard/check/itemData")
+public class BizEquipmentStandardCheckItemDataController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckItemDataService checkItemDataService;
+
+ @ApiOperation("配置核查项")
+ @PostMapping("/config")
+ public ReturnDTO configMeasureInfo(@RequestBody @Valid CheckItemConfigRequest checkItemConfigRequest) {
+ return checkItemDataService.config(checkItemConfigRequest);
+ }
+
+ @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
+ return checkItemDataService.detail(request);
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
new file mode 100644
index 0000000..be510e3
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckModifyRecordController.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckModifyRecord;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckModifyRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-16
+ */
+@Api(tags = "标准装置管理-核查数据管理核查数据历史修改记录")
+@RestController
+@RequestMapping("/standard/checkModifyRecord")
+public class BizEquipmentStandardCheckModifyRecordController {
+ @Autowired
+ private IBizEquipmentStandardCheckModifyRecordService checkModifyRecordService;
+
+ @ApiOperation("列表（根据核查数据基本信息表id查询）")
+ @PostMapping("/list")
+ public ReturnDTO> itemCategoryListPage(@RequestBody @Valid IdDTO idDTO) {
+ HashMap map = new HashMap<>();
+ map.put("data_id", idDTO.getId());
+ return ReturnUtil.success(checkModifyRecordService.listByMap(map));
+ }
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
new file mode 100644
index 0000000..2163f55
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java
@@ -0,0 +1,68 @@
+package com.casic.missiles.controller.equipment;
+
+import com.casic.missiles.controller.GeneralApprovalController;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
+import com.casic.missiles.dto.IdDTO;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.equipment.CheckApprovalListRequest;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval;
+import com.casic.missiles.service.IGeneralApprovalService;
+import com.casic.missiles.service.equipment.IBizEquipmentStandardCheckRecordApprovalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ *
+ * 设备与装置-标准装置管理-核查记录审批表(类别检定审批表) 前端控制器
+ *
+ *
+ * @author wangpeng
+ * @since 2023-10-14
+ */
+@Api(tags = "标准装置管理-核查记录管理")
+@RestController
+@RequestMapping("/standard/check/recordApproval")
+public class BizEquipmentStandardCheckRecordApprovalController extends GeneralApprovalController {
+
+ @Autowired
+ private IBizEquipmentStandardCheckRecordApprovalService checkRecordApprovalService;
+
+ public BizEquipmentStandardCheckRecordApprovalController(IGeneralApprovalService baseApprovalService) {
+ super(baseApprovalService);
+ }
+
+ // TODO: 2023/10/18 柴壮：核查数据管理中点击生成核查记录(生成核查记录编号)，找到模板、填充模板，调用草稿箱保存接口后(保证编号填充时和保存草稿一致)，
+ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑，最后提供查询接口显示在核查记录管理新建页面
+
+ @ApiOperation("草稿箱-保存")
+ @PostMapping("/save")
+ public ReturnDTO addCheckApproval(@RequestBody @Valid BizEquipmentStandardCheckRecordApproval checkRecordApproval) {
+ return checkRecordApprovalService.addCheckApproval(checkRecordApproval);
+ }
+
+ @ApiOperation("详情")
+ @PostMapping("/detail")
+ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception {
+ return checkRecordApprovalService.detail(idDTO.getId());
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/listExport")
+ public void export(@RequestBody @Valid CheckApprovalListRequest request) throws Exception {
+ List list = super.exportList(request);
+ super.exportExcel(BizEquipmentStandardCheckRecordApproval.class, list, ExportEnum.CHECK_RECORD.getSheetName());
+ }
+
+ // TODO: 2023/8/14 标准装置详情中核查记录Tab：历次核查数据变化趋势、单次核查数据分析
+
+
+}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
index 60b5209..64e4143 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java
@@ -45,8 +45,6 @@
@Autowired
private IBizEquipmentStandardStaffRelationService staffRelationService;
@Autowired
- private IBizEquipmentStandardCheckRecordService checkRecordService;
- @Autowired
private IBizEquipmentStandardTechnicalTargetLogService technicalTargetLogService;
@Autowired
private IBizEquipmentStandardCarryoutItemService carryoutItemService;
@@ -198,39 +196,6 @@
return ReturnUtil.success(super.packForBT(responsePage));
}
- /**************************************************核查记录管理*****************************************************/
-
- @ApiOperation("核查记录列表（分页），标准装置详情-核查记录也使用该接口")
- @PostMapping("/check/record/listPage")
- public ReturnDTO> checkRecordListPage(@RequestBody @Valid CheckRecordListRequest request) {
- Page page = PageFactory.defaultPage();
- Page responsePage = checkRecordService.listPage(page, request);
- return ReturnUtil.success(super.packForBT(responsePage));
- }
-
- @ApiOperation("核查记录新增")
- @PostMapping("/check/record/add")
- public ReturnDTO checkRecordAdd(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.add(checkRecord);
- }
-
- @ApiOperation("核查记录编辑")
- @PostMapping("/check/record/update")
- public ReturnDTO checkRecordUpdate(@RequestBody BizEquipmentStandardCheckRecord checkRecord) {
- return checkRecordService.update(checkRecord);
- }
-
- @ApiOperation("核查记录详情")
- @PostMapping("/check/record/detail")
- public ReturnDTO checkRecordDetail(@RequestBody @Valid IdDTO idDTO) {
- Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
- throw new BusinessException(BusinessExceptionEnum.ID_NULL);
- });
- return checkRecordService.detail(idDTO.getId());
- }
-
- // TODO: 2023/8/14 核查记录：历次核查数据变化趋势、单次核查数据分析
-
@ApiOperation("开展的检定或校准项目列表（分页，入参为标准装置id）")
@PostMapping("/carryOut/listPage")
public ReturnDTO