-更新log title

master/src/main/java/com/ruoyi/project/base/controller/TBaseDeviceController.java

@@ -73,7 +73,7 @@ public class TBaseDeviceController extends BaseController
      * 导出设备/管线列表
      */
     @PreAuthorize("@ss.hasPermi('base:device:export')")
-    @Log(title = "设备/管线", businessType = BusinessType.EXPORT)
+    @Log(title = "设备/管线导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TBaseDevice tBaseDevice)
     {
@@ -96,7 +96,7 @@ public class TBaseDeviceController extends BaseController
      * 新增设备/管线
      */
     @PreAuthorize("@ss.hasPermi('base:device:add')")
-    @Log(title = "设备/管线", businessType = BusinessType.INSERT)
+    @Log(title = "设备/管线新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TBaseDevice tBaseDevice)
     {
@@ -117,7 +117,7 @@ public class TBaseDeviceController extends BaseController
      * 修改设备/管线
      */
     @PreAuthorize("@ss.hasPermi('base:device:edit')")
-    @Log(title = "设备/管线", businessType = BusinessType.UPDATE)
+    @Log(title = "设备/管线修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TBaseDevice tBaseDevice)
     {
@@ -127,6 +127,7 @@ public class TBaseDeviceController extends BaseController
     }
 
     @PutMapping("/handleApprove")
+    @Log(title = "设备/管线审核", businessType = BusinessType.APPROVE)
     public AjaxResult handleApprove(@RequestBody TBaseDevice tBaseDevice)
     {
         tBaseDevice.setApproveTime(new Date());
@@ -137,7 +138,7 @@ public class TBaseDeviceController extends BaseController
      * 删除设备/管线
      */
     @PreAuthorize("@ss.hasPermi('base:device:remove')")
-    @Log(title = "设备/管线", businessType = BusinessType.DELETE)
+    @Log(title = "设备/管线删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

master/src/main/java/com/ruoyi/project/base/controller/TBasePlantController.java

@@ -64,7 +64,7 @@ public class TBasePlantController extends BaseController
      * 导出装置列表
      */
     @PreAuthorize("@ss.hasPermi('base:plant:export')")
-    @Log(title = "装置", businessType = BusinessType.EXPORT)
+    @Log(title = "装置导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TBasePlant tBasePlant)
     {
@@ -87,7 +87,7 @@ public class TBasePlantController extends BaseController
      * 新增装置
      */
     @PreAuthorize("@ss.hasPermi('base:plant:add')")
-    @Log(title = "装置", businessType = BusinessType.INSERT)
+    @Log(title = "装置新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TBasePlant tBasePlant)
     {
@@ -105,7 +105,7 @@ public class TBasePlantController extends BaseController
      * 修改装置
      */
     @PreAuthorize("@ss.hasPermi('base:plant:edit')")
-    @Log(title = "装置", businessType = BusinessType.UPDATE)
+    @Log(title = "装置修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TBasePlant tBasePlant)
     {
@@ -118,7 +118,7 @@ public class TBasePlantController extends BaseController
      * 删除装置
      */
     @PreAuthorize("@ss.hasPermi('base:plant:remove')")
-    @Log(title = "装置", businessType = BusinessType.DELETE)
+    @Log(title = "装置删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
@@ -126,6 +126,7 @@ public class TBasePlantController extends BaseController
     }
 
     @PutMapping("/handleApprove")
+    @Log(title = "装置审核", businessType = BusinessType.APPROVE)
     public AjaxResult handleApprove(@RequestBody TBasePlant tBasePlant){
         tBasePlant.setApproveTime(new Date());
         int i = tBasePlantService.updateTBasePlantByPlantIds(tBasePlant);

master/src/main/java/com/ruoyi/project/base/controller/TBasePointController.java

@@ -84,7 +84,7 @@ public class TBasePointController extends BaseController {
      * 导出密封点列表
      */
     @PreAuthorize("@ss.hasPermi('base:point:export')")
-    @Log(title = "密封点", businessType = BusinessType.EXPORT)
+    @Log(title = "密封点导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TBasePoint tBasePoint) {
         List<TBasePoint> list = tBasePointService.selectTBasePointList(tBasePoint);
@@ -105,7 +105,7 @@ public class TBasePointController extends BaseController {
      * 新增密封点
      */
     @PreAuthorize("@ss.hasPermi('base:point:add')")
-    @Log(title = "密封点", businessType = BusinessType.INSERT)
+    @Log(title = "密封点新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TBasePoint tBasePoint) {
         try {
@@ -132,7 +132,7 @@ public class TBasePointController extends BaseController {
      * 修改密封点
      */
     @PreAuthorize("@ss.hasPermi('base:point:edit')")
-    @Log(title = "密封点", businessType = BusinessType.UPDATE)
+    @Log(title = "密封点修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TBasePoint tBasePoint) {
         TBasePoint point = tBasePointService.selectTBasePointByGroupCodeAndExtendCode(tBasePoint);
@@ -146,12 +146,14 @@ public class TBasePointController extends BaseController {
     }
 
     @PutMapping("/handleApprove")
+    @Log(title = "密封点审核", businessType = BusinessType.APPROVE)
     public AjaxResult handleApprove(@RequestBody TBasePoint tBasePoint) {
         tBasePoint.setApproveTime(new Date());
         return toAjax(tBasePointService.updateTBasePointByPointIds(tBasePoint));
     }
 
     @PutMapping("/handleApproveAll")
+    @Log(title = "密封点审核所有", businessType = BusinessType.APPROVE)
     public AjaxResult handleApproveAll(@RequestBody TBasePoint tBasePoint) {
         long status = tBasePoint.getApproveStatus();
         tBasePoint.setApproveStatus(null);
@@ -174,6 +176,7 @@ public class TBasePointController extends BaseController {
     }
 
     @PutMapping("/handleUpload")
+    @Log(title = "密封点上传文件修改", businessType = BusinessType.UPDATE)
     public AjaxResult handleUpload(@RequestBody TBasePoint tBasePoint) {
         tBasePoint.setUpdaterCode(getUserId());
         if ((tBasePointService.updateTBasePointByUploadFile(tBasePoint) > 0))
@@ -186,7 +189,7 @@ public class TBasePointController extends BaseController {
      * 删除密封点
      */
     @PreAuthorize("@ss.hasPermi('base:point:remove')")
-    @Log(title = "密封点", businessType = BusinessType.DELETE)
+    @Log(title = "密封点删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tBasePointService.deleteTBasePointByIds(ids));
@@ -366,7 +369,7 @@ public class TBasePointController extends BaseController {
         return AjaxResult.success(String.valueOf(successNumber.get()), failRow);
     }
 
-    @Log(title = "文件上传", businessType = BusinessType.UPDATE)
+    @Log(title = "密封点文件上传", businessType = BusinessType.UPDATE)
     @PostMapping("/uploadFile")
     public AjaxResult uploadFile(@RequestParam("file") MultipartFile file) throws IOException {
         if (!file.isEmpty()) {

master/src/main/java/com/ruoyi/project/base/controller/TBaseRegionController.java

@@ -65,7 +65,7 @@ public class TBaseRegionController extends BaseController {
      * 导出区域列表
      */
     @PreAuthorize("@ss.hasPermi('base:region:export')")
-    @Log(title = "区域", businessType = BusinessType.EXPORT)
+    @Log(title = "区域导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TBaseRegion tBaseRegion) {
         List<TBaseRegion> list = tBaseRegionService.selectTBaseRegionList(tBaseRegion);
@@ -86,7 +86,7 @@ public class TBaseRegionController extends BaseController {
      * 新增区域
      */
     @PreAuthorize("@ss.hasPermi('base:region:add')")
-    @Log(title = "区域", businessType = BusinessType.INSERT)
+    @Log(title = "区域新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TBaseRegion tBaseRegion) {
         TBaseRegion region = tBaseRegionService.selectTBaseRegionByName(tBaseRegion.getRegionName(), tBaseRegion.getPlantId());
@@ -103,7 +103,7 @@ public class TBaseRegionController extends BaseController {
      * 修改区域
      */
     @PreAuthorize("@ss.hasPermi('base:region:edit')")
-    @Log(title = "区域", businessType = BusinessType.UPDATE)
+    @Log(title = "区域修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TBaseRegion tBaseRegion) {
         tBaseRegion.setUpdaterCode(getUserId());
@@ -112,6 +112,7 @@ public class TBaseRegionController extends BaseController {
     }
 
     @PutMapping("/handleApprove")
+    @Log(title = "区域审核", businessType = BusinessType.APPROVE)
     public AjaxResult handleApprove(@RequestBody TBaseRegion tBaseRegion) {
         tBaseRegion.setApproveTime(new Date());
         return toAjax(tBaseRegionService.updateTBaseRegionByRegionIds(tBaseRegion));
@@ -121,7 +122,7 @@ public class TBaseRegionController extends BaseController {
      * 删除区域
      */
     @PreAuthorize("@ss.hasPermi('base:region:remove')")
-    @Log(title = "区域", businessType = BusinessType.DELETE)
+    @Log(title = "区域删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tBaseRegionService.deleteTBaseRegionByIds(ids));

master/src/main/java/com/ruoyi/project/check/controller/TCheckCalibrationController.java

@@ -69,7 +69,7 @@ public class TCheckCalibrationController extends BaseController {
      * 导出检测仪器校准列表
      */
     @PreAuthorize("@ss.hasPermi('check:calibration:export')")
-    @Log(title = "检测仪器校准", businessType = BusinessType.EXPORT)
+    @Log(title = "检测仪器校准导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TCheckCalibration tCheckCalibration) {
         List<TCheckCalibration> list = tCheckCalibrationService.selectTCheckCalibrationList(tCheckCalibration);
@@ -90,7 +90,7 @@ public class TCheckCalibrationController extends BaseController {
      * 新增检测仪器校准
      */
     @PreAuthorize("@ss.hasPermi('check:calibration:add')")
-    @Log(title = "检测仪器校准", businessType = BusinessType.INSERT)
+    @Log(title = "检测仪器校准新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TCheckCalibration tCheckCalibration) {
         tCheckCalibration.setCreaterCode(getUserId());
@@ -101,7 +101,7 @@ public class TCheckCalibrationController extends BaseController {
      * 修改检测仪器校准
      */
     @PreAuthorize("@ss.hasPermi('check:calibration:edit')")
-    @Log(title = "检测仪器校准", businessType = BusinessType.UPDATE)
+    @Log(title = "检测仪器校准修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TCheckCalibration tCheckCalibration) {
         tCheckCalibration.setUpdaterCode(getUserId());
@@ -112,7 +112,7 @@ public class TCheckCalibrationController extends BaseController {
      * 删除检测仪器校准
      */
     @PreAuthorize("@ss.hasPermi('check:calibration:remove')")
-    @Log(title = "检测仪器校准", businessType = BusinessType.DELETE)
+    @Log(title = "检测仪器校准删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tCheckCalibrationService.deleteTCheckCalibrationByIds(ids));

master/src/main/java/com/ruoyi/project/check/controller/TCheckCheckpointsController.java

@@ -93,7 +93,7 @@ public class TCheckCheckpointsController extends BaseController {
      * 导出检测点列表
      */
 //    @PreAuthorize("@ss.hasPermi('check:checkpoints:export')")
-    @Log(title = "检测点", businessType = BusinessType.EXPORT)
+    @Log(title = "检测点导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TCheckCheckpoints tCheckCheckpoints) {
         List<TCheckCheckpoints> list = tCheckCheckpointsService.selectTCheckCheckpointsList(tCheckCheckpoints);
@@ -114,7 +114,7 @@ public class TCheckCheckpointsController extends BaseController {
      * 新增检测点
      */
 //    @PreAuthorize("@ss.hasPermi('check:checkpoints:add')")
-    @Log(title = "检测点", businessType = BusinessType.INSERT)
+    @Log(title = "检测点新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TCheckCheckpoints tCheckCheckpoints) {
         return toAjax(tCheckCheckpointsService.insertTCheckCheckpoints(tCheckCheckpoints));
@@ -124,21 +124,21 @@ public class TCheckCheckpointsController extends BaseController {
      * 修改检测点
      */
 //    @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
-    @Log(title = "检测点", businessType = BusinessType.UPDATE)
+    @Log(title = "检测点修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TCheckCheckpoints tCheckCheckpoints) {
         return toAjax(tCheckCheckpointsService.updateTCheckCheckpointsByCheckIds(tCheckCheckpoints));
     }
 
     @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
-    @Log(title = "审核检测结果", businessType = BusinessType.UPDATE)
+    @Log(title = "审核检测结果", businessType = BusinessType.APPROVE)
     @PostMapping("/toApprove")
     public AjaxResult toApprove(@RequestBody TCheckCheckpoints tCheckCheckpoints) {
         return tCheckCheckpointsService.toApprove(tCheckCheckpoints);
     }
 
     @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
-    @Log(title = "审核检测结果", businessType = BusinessType.UPDATE)
+    @Log(title = "审核所有检测结果", businessType = BusinessType.APPROVE)
     @PostMapping("/approveAll")
     public AjaxResult approveAll(@RequestBody TCheckCheckpoints tCheckCheckpoints) {
         return tCheckCheckpointsService.approveAll(tCheckCheckpoints);
@@ -148,7 +148,7 @@ public class TCheckCheckpointsController extends BaseController {
      * 删除检测点
      */
 //    @PreAuthorize("@ss.hasPermi('check:checkpoints:remove')")
-    @Log(title = "检测点", businessType = BusinessType.DELETE)
+    @Log(title = "检测点删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{checkIds}")
     public AjaxResult remove(@PathVariable Long[] checkIds) {
         return toAjax(tCheckCheckpointsService.deleteTCheckCheckpointsByCheckIds(checkIds));

master/src/main/java/com/ruoyi/project/check/controller/TCheckEnvironmentController.java

@@ -70,7 +70,7 @@ public class TCheckEnvironmentController extends BaseController {
      * 导出环境本底值记录列表
      */
     @PreAuthorize("@ss.hasPermi('check:environment:export')")
-    @Log(title = "环境本底值记录", businessType = BusinessType.EXPORT)
+    @Log(title = "环境本底值记录导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TCheckEnvironment tCheckEnvironment) {
         List<TCheckEnvironment> list = tCheckEnvironmentService.selectTCheckEnvironmentList(tCheckEnvironment);
@@ -91,7 +91,7 @@ public class TCheckEnvironmentController extends BaseController {
      * 新增环境本底值记录
      */
     @PreAuthorize("@ss.hasPermi('check:environment:add')")
-    @Log(title = "环境本底值记录", businessType = BusinessType.INSERT)
+    @Log(title = "环境本底值记录新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TCheckEnvironment tCheckEnvironment) {
         TCheckCalibration calibration = new TCheckCalibration();
@@ -111,7 +111,7 @@ public class TCheckEnvironmentController extends BaseController {
      * 修改环境本底值记录
      */
     @PreAuthorize("@ss.hasPermi('check:environment:edit')")
-    @Log(title = "环境本底值记录", businessType = BusinessType.UPDATE)
+    @Log(title = "环境本底值记录修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TCheckEnvironment tCheckEnvironment) {
         tCheckEnvironment.setUpdatedate(new Date());
@@ -123,7 +123,7 @@ public class TCheckEnvironmentController extends BaseController {
      * 删除环境本底值记录
      */
     @PreAuthorize("@ss.hasPermi('check:environment:remove')")
-    @Log(title = "环境本底值记录", businessType = BusinessType.DELETE)
+    @Log(title = "环境本底值记录删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tCheckEnvironmentService.deleteTCheckEnvironmentByIds(ids));

master/src/main/java/com/ruoyi/project/check/controller/TCheckInstrumentController.java

@@ -57,7 +57,7 @@ public class TCheckInstrumentController extends BaseController
      * 导出仪器列表
      */
     @PreAuthorize("@ss.hasPermi('check:instrument:export')")
-    @Log(title = "仪器", businessType = BusinessType.EXPORT)
+    @Log(title = "仪器导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TCheckInstrument tCheckInstrument)
     {
@@ -80,7 +80,7 @@ public class TCheckInstrumentController extends BaseController
      * 新增仪器
      */
     @PreAuthorize("@ss.hasPermi('check:instrument:add')")
-    @Log(title = "仪器", businessType = BusinessType.INSERT)
+    @Log(title = "仪器新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TCheckInstrument tCheckInstrument)
     {
@@ -94,7 +94,7 @@ public class TCheckInstrumentController extends BaseController
      * 修改仪器
      */
     @PreAuthorize("@ss.hasPermi('check:instrument:edit')")
-    @Log(title = "仪器", businessType = BusinessType.UPDATE)
+    @Log(title = "仪器修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TCheckInstrument tCheckInstrument)
     {
@@ -107,7 +107,7 @@ public class TCheckInstrumentController extends BaseController
      * 删除仪器
      */
     @PreAuthorize("@ss.hasPermi('check:instrument:remove')")
-    @Log(title = "仪器", businessType = BusinessType.DELETE)
+    @Log(title = "仪器删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

master/src/main/java/com/ruoyi/project/check/controller/TCheckInstrumentRecordController.java

@@ -50,7 +50,7 @@ public class TCheckInstrumentRecordController extends BaseController
      * 导出仪器维护记录列表
      */
     @PreAuthorize("@ss.hasPermi('check:record:export')")
-    @Log(title = "仪器维护记录", businessType = BusinessType.EXPORT)
+    @Log(title = "仪器维护记录导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TCheckInstrumentRecord tCheckInstrumentRecord)
     {
@@ -73,7 +73,7 @@ public class TCheckInstrumentRecordController extends BaseController
      * 新增仪器维护记录
      */
     @PreAuthorize("@ss.hasPermi('check:record:add')")
-    @Log(title = "仪器维护记录", businessType = BusinessType.INSERT)
+    @Log(title = "仪器维护记录新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TCheckInstrumentRecord tCheckInstrumentRecord)
     {
@@ -85,7 +85,7 @@ public class TCheckInstrumentRecordController extends BaseController
      * 修改仪器维护记录
      */
     @PreAuthorize("@ss.hasPermi('check:record:edit')")
-    @Log(title = "仪器维护记录", businessType = BusinessType.UPDATE)
+    @Log(title = "仪器维护记录修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TCheckInstrumentRecord tCheckInstrumentRecord)
     {
@@ -97,7 +97,7 @@ public class TCheckInstrumentRecordController extends BaseController
      * 删除仪器维护记录
      */
     @PreAuthorize("@ss.hasPermi('check:record:remove')")
-    @Log(title = "仪器维护记录", businessType = BusinessType.DELETE)
+    @Log(title = "仪器维护记录删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

master/src/main/java/com/ruoyi/project/check/controller/TCheckLawitemsController.java

@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 法规项Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-11-28
  */
@@ -50,7 +50,7 @@ public class TCheckLawitemsController extends BaseController
      * 导出法规项列表
      */
     @PreAuthorize("@ss.hasPermi('check:lawitems:export')")
-    @Log(title = "法规项", businessType = BusinessType.EXPORT)
+    @Log(title = "法规项导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TCheckLawitems tCheckLawitems)
     {
@@ -73,7 +73,7 @@ public class TCheckLawitemsController extends BaseController
      * 新增法规项
      */
     @PreAuthorize("@ss.hasPermi('check:lawitems:add')")
-    @Log(title = "法规项", businessType = BusinessType.INSERT)
+    @Log(title = "法规项新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TCheckLawitems tCheckLawitems)
     {
@@ -84,7 +84,7 @@ public class TCheckLawitemsController extends BaseController
      * 修改法规项
      */
     @PreAuthorize("@ss.hasPermi('check:lawitems:edit')")
-    @Log(title = "法规项", businessType = BusinessType.UPDATE)
+    @Log(title = "法规项修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TCheckLawitems tCheckLawitems)
     {
@@ -95,7 +95,7 @@ public class TCheckLawitemsController extends BaseController
      * 删除法规项
      */
     @PreAuthorize("@ss.hasPermi('check:lawitems:remove')")
-    @Log(title = "法规项", businessType = BusinessType.DELETE)
+    @Log(title = "法规项删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

master/src/main/java/com/ruoyi/project/check/controller/TCheckLawsController.java

@@ -62,7 +62,7 @@ public class TCheckLawsController extends BaseController {
      * 导出法规列表
      */
     @PreAuthorize("@ss.hasPermi('check:laws:export')")
-    @Log(title = "法规", businessType = BusinessType.EXPORT)
+    @Log(title = "法规导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TCheckLaws tCheckLaws) {
         List<TCheckLaws> list = tCheckLawsService.selectTCheckLawsList(tCheckLaws);
@@ -83,7 +83,7 @@ public class TCheckLawsController extends BaseController {
      * 新增法规
      */
     @PreAuthorize("@ss.hasPermi('check:laws:add')")
-    @Log(title = "法规", businessType = BusinessType.INSERT)
+    @Log(title = "法规新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TCheckLaws tCheckLaws) {
         tCheckLaws.setCreaterCode(getUserId());
@@ -127,7 +127,7 @@ public class TCheckLawsController extends BaseController {
      * 修改法规
      */
     @PreAuthorize("@ss.hasPermi('check:laws:edit')")
-    @Log(title = "法规", businessType = BusinessType.UPDATE)
+    @Log(title = "法规修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TCheckLaws tCheckLaws) {
         tCheckLaws.setUpdatedate(new Date());
@@ -150,7 +150,7 @@ public class TCheckLawsController extends BaseController {
      * 删除法规
      */
     @PreAuthorize("@ss.hasPermi('check:laws:remove')")
-    @Log(title = "法规", businessType = BusinessType.DELETE)
+    @Log(title = "法规删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tCheckLawsService.deleteTCheckLawsByIds(ids));

master/src/main/java/com/ruoyi/project/check/controller/TCheckRepairpointsController.java

@@ -75,7 +75,7 @@ public class TCheckRepairpointsController extends BaseController {
      * 导出维修点列表
      */
 //    @PreAuthorize("@ss.hasPermi('check:repairpoints:export')")
-    @Log(title = "维修点", businessType = BusinessType.EXPORT)
+    @Log(title = "维修点导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TCheckRepairpoints tCheckRepairpoints) {
         List<TCheckRepairpoints> list = tCheckRepairpointsService.selectTCheckRepairpointsList(tCheckRepairpoints);
@@ -100,7 +100,7 @@ public class TCheckRepairpointsController extends BaseController {
     }
 
     @PreAuthorize("@ss.hasPermi('check:checkpoints:edit')")
-    @Log(title = "审核维修结果", businessType = BusinessType.UPDATE)
+    @Log(title = "审核维修结果", businessType = BusinessType.APPROVE)
     @PutMapping("/toApprove")
     public AjaxResult toApprove(@RequestBody TCheckRepairpoints tCheckRepairpoints) {
         int i = tCheckRepairpointsService.updateApproveStatusByIds(tCheckRepairpoints);
@@ -147,7 +147,7 @@ public class TCheckRepairpointsController extends BaseController {
      * 新增维修点
      */
 //    @PreAuthorize("@ss.hasPermi('check:repairpoints:add')")
-    @Log(title = "维修点", businessType = BusinessType.INSERT)
+    @Log(title = "维修点新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TCheckRepairpoints tCheckRepairpoints) {
         return toAjax(tCheckRepairpointsService.insertTCheckRepairpoints(tCheckRepairpoints));
@@ -157,7 +157,7 @@ public class TCheckRepairpointsController extends BaseController {
      * 修改维修点
      */
 //    @PreAuthorize("@ss.hasPermi('check:repairpoints:edit')")
-    @Log(title = "维修点", businessType = BusinessType.UPDATE)
+    @Log(title = "维修点修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TCheckRepairpoints tCheckRepairpoints) {
         return toAjax(tCheckRepairpointsService.updateTCheckRepairpointsByCheckIds(tCheckRepairpoints));
@@ -167,7 +167,7 @@ public class TCheckRepairpointsController extends BaseController {
      * 删除维修点
      */
 //    @PreAuthorize("@ss.hasPermi('check:repairpoints:remove')")
-    @Log(title = "维修点", businessType = BusinessType.DELETE)
+    @Log(title = "维修点删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{checkIds}")
     public AjaxResult remove(@PathVariable Long[] checkIds) {
         return toAjax(tCheckRepairpointsService.deleteTCheckRepairpointsByCheckIds(checkIds));

master/src/main/java/com/ruoyi/project/check/controller/TCheckStandardgasesController.java

@@ -1,26 +1,20 @@
 package com.ruoyi.project.check.controller;
 
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.project.check.domain.TCheckStandardgases;
 import com.ruoyi.project.check.service.ITCheckStandardgasesService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 标准气体Controller
@@ -30,8 +24,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/check/standardgases")
-public class TCheckStandardgasesController extends BaseController
-{
+public class TCheckStandardgasesController extends BaseController {
     @Autowired
     private ITCheckStandardgasesService tCheckStandardgasesService;
 
@@ -40,16 +33,14 @@ public class TCheckStandardgasesController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('check:standardgases:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TCheckStandardgases tCheckStandardgases)
-    {
+    public TableDataInfo list(TCheckStandardgases tCheckStandardgases) {
         startPage();
         List<TCheckStandardgases> list = tCheckStandardgasesService.selectTCheckStandardgasesList(tCheckStandardgases);
         return getDataTable(list);
     }
 
     @GetMapping("/allStandardgases")
-    public AjaxResult allStandardgases()
-    {
+    public AjaxResult allStandardgases() {
         return AjaxResult.success(tCheckStandardgasesService.selectAllStandardgases());
     }
 
@@ -57,10 +48,9 @@ public class TCheckStandardgasesController extends BaseController
      * 导出标准气体列表
      */
     @PreAuthorize("@ss.hasPermi('check:standardgases:export')")
-    @Log(title = "标准气体", businessType = BusinessType.EXPORT)
+    @Log(title = "标准气体导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TCheckStandardgases tCheckStandardgases)
-    {
+    public void export(HttpServletResponse response, TCheckStandardgases tCheckStandardgases) {
         List<TCheckStandardgases> list = tCheckStandardgasesService.selectTCheckStandardgasesList(tCheckStandardgases);
         ExcelUtil<TCheckStandardgases> util = new ExcelUtil<TCheckStandardgases>(TCheckStandardgases.class);
         util.exportExcel(response, list, "标准气体数据");
@@ -71,8 +61,7 @@ public class TCheckStandardgasesController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('check:standardgases:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tCheckStandardgasesService.selectTCheckStandardgasesById(id));
     }
 
@@ -80,10 +69,9 @@ public class TCheckStandardgasesController extends BaseController
      * 新增标准气体
      */
     @PreAuthorize("@ss.hasPermi('check:standardgases:add')")
-    @Log(title = "标准气体", businessType = BusinessType.INSERT)
+    @Log(title = "标准气体新增", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TCheckStandardgases tCheckStandardgases)
-    {
+    public AjaxResult add(@RequestBody TCheckStandardgases tCheckStandardgases) {
         tCheckStandardgases.setUpdatedate(new Date());
         tCheckStandardgases.setUpdaterCode(getUserId());
         tCheckStandardgases.setCreaterCode(getUserId());
@@ -94,10 +82,9 @@ public class TCheckStandardgasesController extends BaseController
      * 修改标准气体
      */
     @PreAuthorize("@ss.hasPermi('check:standardgases:edit')")
-    @Log(title = "标准气体", businessType = BusinessType.UPDATE)
+    @Log(title = "标准气体修改", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TCheckStandardgases tCheckStandardgases)
-    {
+    public AjaxResult edit(@RequestBody TCheckStandardgases tCheckStandardgases) {
         tCheckStandardgases.setUpdatedate(new Date());
         tCheckStandardgases.setUpdaterCode(getUserId());
         return toAjax(tCheckStandardgasesService.updateTCheckStandardgases(tCheckStandardgases));
@@ -107,10 +94,9 @@ public class TCheckStandardgasesController extends BaseController
      * 删除标准气体
      */
     @PreAuthorize("@ss.hasPermi('check:standardgases:remove')")
-    @Log(title = "标准气体", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @Log(title = "标准气体删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tCheckStandardgasesService.deleteTCheckStandardgasesByIds(ids));
     }
 }

master/src/main/java/com/ruoyi/project/statistics/controller/StatisticsController.java

@@ -98,7 +98,7 @@ public class StatisticsController extends BaseController {
                 }
             }
 //            未检测数量统计
-            result.setWjcCount(result.getPointCount() - result.getWxlCount() - result.getYbxlCount() - result.getYzxlCount());
+            result.setWjcCount((result.getPointCount() - result.getWxlCount() - result.getYbxlCount() - result.getYzxlCount()));
 //            总数统记
             result.setXlcdCount(result.getPointCount());
 //            查询所有检测点的净检测值

master/src/main/java/com/ruoyi/project/task/controller/TTaskInspectionController.java

@@ -74,7 +74,7 @@ public class TTaskInspectionController extends BaseController {
      * 导出检测任务列表
      */
     @PreAuthorize("@ss.hasPermi('task:inspection:export')")
-    @Log(title = "检测任务", businessType = BusinessType.EXPORT)
+    @Log(title = "检测任务导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TTaskInspection tTaskInspection) {
         List<TTaskInspection> list = tTaskInspectionService.selectTTaskInspectionList(tTaskInspection);
@@ -95,7 +95,7 @@ public class TTaskInspectionController extends BaseController {
      * 新增检测任务
      */
     @PreAuthorize("@ss.hasPermi('task:inspection:add')")
-    @Log(title = "检测任务", businessType = BusinessType.INSERT)
+    @Log(title = "检测任务新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TTaskInspection tTaskInspection) {
         if ("1".equals(tTaskInspection.getTaskType())) {
@@ -110,7 +110,7 @@ public class TTaskInspectionController extends BaseController {
      * 修改检测任务
      */
     @PreAuthorize("@ss.hasPermi('task:inspection:edit')")
-    @Log(title = "检测任务", businessType = BusinessType.UPDATE)
+    @Log(title = "检测任务修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTaskInspection tTaskInspection) {
         if ("1".equals(tTaskInspection.getTaskType())) {
@@ -125,7 +125,7 @@ public class TTaskInspectionController extends BaseController {
      * 删除检测任务
      */
     @PreAuthorize("@ss.hasPermi('task:inspection:remove')")
-    @Log(title = "检测任务", businessType = BusinessType.DELETE)
+    @Log(title = "检测任务删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         QueryWrapper<TCheckCheckpoints> wrapper = new QueryWrapper<>();

master/src/main/java/com/ruoyi/project/task/controller/TTaskInspectionPlanController.java

@@ -123,7 +123,7 @@ public class TTaskInspectionPlanController extends BaseController {
      * 导出检测计划列表
      */
     @PreAuthorize("@ss.hasPermi('task:plan:export')")
-    @Log(title = "检测计划", businessType = BusinessType.EXPORT)
+    @Log(title = "检测计划导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TTaskInspectionPlan tTaskInspectionPlan) {
         List<TTaskInspectionPlan> list = tTaskInspectionPlanService.selectTTaskInspectionPlanList(tTaskInspectionPlan);
@@ -144,7 +144,7 @@ public class TTaskInspectionPlanController extends BaseController {
      * 新增检测计划
      */
     @PreAuthorize("@ss.hasPermi('task:plan:add')")
-    @Log(title = "检测计划", businessType = BusinessType.INSERT)
+    @Log(title = "检测计划新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TTaskInspectionPlan tTaskInspectionPlan) {
         tTaskInspectionPlan.setCreaterCode(getUserId());
@@ -210,6 +210,7 @@ public class TTaskInspectionPlanController extends BaseController {
     }
 
     @PostMapping("/addCheckpoints")
+    @Log(title = "检测计划新增临时计划添加检测点", businessType = BusinessType.INSERT)
     public AjaxResult addCheckpoints(@RequestBody TTaskInspectionPlan tTaskInspectionPlan) {
         TTaskInspection tTaskInspection = new TTaskInspection();
         tTaskInspection.setPlanId(tTaskInspectionPlan.getId());
@@ -259,6 +260,7 @@ public class TTaskInspectionPlanController extends BaseController {
 
 
     @DeleteMapping("/removeCheckPoints")
+    @Log(title = "检测计划删除", businessType = BusinessType.DELETE)
     public AjaxResult removeCheckPoints(@RequestBody TCheckCheckpoints tCheckCheckpoints) {
         tCheckCheckpointsService.deleteCheckpoints(tCheckCheckpoints);
         QueryWrapper<TCheckCheckpoints> wrapper = new QueryWrapper<TCheckCheckpoints>().eq("plan_id", tCheckCheckpoints.getPlanId());
@@ -385,7 +387,7 @@ public class TTaskInspectionPlanController extends BaseController {
      * 修改检测计划
      */
     @PreAuthorize("@ss.hasPermi('task:plan:edit')")
-    @Log(title = "检测计划", businessType = BusinessType.UPDATE)
+    @Log(title = "检测计划修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTaskInspectionPlan tTaskInspectionPlan) {
         tTaskInspectionPlan.setUpdaterCode(getUserId());
@@ -396,7 +398,7 @@ public class TTaskInspectionPlanController extends BaseController {
      * 删除检测计划
      */
     @PreAuthorize("@ss.hasPermi('task:plan:remove')")
-    @Log(title = "检测计划", businessType = BusinessType.DELETE)
+    @Log(title = "检测计划删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         for (Long id : ids) {

master/src/main/java/com/ruoyi/project/task/controller/TTaskRepairController.java

@@ -78,7 +78,7 @@ public class TTaskRepairController extends BaseController
      * 导出维修任务列表
      */
     @PreAuthorize("@ss.hasPermi('task:repair:export')")
-    @Log(title = "维修任务", businessType = BusinessType.EXPORT)
+    @Log(title = "维修任务导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, TTaskRepair tTaskRepair)
     {
@@ -101,7 +101,7 @@ public class TTaskRepairController extends BaseController
      * 新增维修任务
      */
     @PreAuthorize("@ss.hasPermi('task:repair:add')")
-    @Log(title = "维修任务", businessType = BusinessType.INSERT)
+    @Log(title = "维修任务新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TTaskRepair tTaskRepair)
     {
@@ -113,7 +113,7 @@ public class TTaskRepairController extends BaseController
      * 修改维修任务
      */
     @PreAuthorize("@ss.hasPermi('task:repair:edit')")
-    @Log(title = "维修任务", businessType = BusinessType.UPDATE)
+    @Log(title = "维修任务修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTaskRepair tTaskRepair)
     {
@@ -125,7 +125,7 @@ public class TTaskRepairController extends BaseController
      * 删除维修任务
      */
     @PreAuthorize("@ss.hasPermi('task:repair:remove')")
-    @Log(title = "维修任务", businessType = BusinessType.DELETE)
+    @Log(title = "维修任务删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

master/src/main/resources/mybatis/statistics/StatisticsMapper.xml

@@ -18,6 +18,7 @@
         select plant_name, plant_id, count(1) num
         from t_base_plant d
         <where>
+            <if test="plantId!=null">and plant_id = #{plantId} </if>
             and approve_status = 2
             and del_flag = 0
             <if test="company!=null and company!=''">and company like concat('%',#{company},'%')</if>

ui/src/views/statistics/index.vue

@@ -66,14 +66,14 @@
                              :show-overflow-tooltip="true"/>
             <el-table-column label="严重泄漏(个)" align="center" prop="yzxlCount" width="100"
                              :show-overflow-tooltip="true"/>
-            <el-table-column label="未检测(个)" align="center" prop="wjcCount" width="100"
-                             :show-overflow-tooltip="true"/>
+<!--            <el-table-column label="未检测(个)" align="center" prop="wjcCount" width="100"-->
+<!--                             :show-overflow-tooltip="true"/>-->
             <el-table-column label="合计(个)" align="center" prop="xlcdCount" width="80" :show-overflow-tooltip="true"/>
           </el-table-column>
           <el-table-column label="排放量核算" align="center">
             <el-table-column label="泄漏量(t/a)" align="center" prop="xll" width="130"
                              :show-overflow-tooltip="true"/>
-            <el-table-column label="减排量(t/a" align="center" prop="jpl" width="130"
+            <el-table-column label="减排量(t/a)" align="center" prop="jpl" width="130"
                              :show-overflow-tooltip="true"/>
             <el-table-column label="排放量(t/a)" align="center" prop="pfl" width="130"
                              :show-overflow-tooltip="true"/>