-修改导出列表

-修复了一些bug

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

@@ -15,6 +15,7 @@ import com.ruoyi.project.base.domain.TBaseRegion;
 import com.ruoyi.project.base.service.ITBasePlantService;
 import com.ruoyi.project.base.service.ITBaseRegionService;
 import com.ruoyi.system.service.ISysDictTypeService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -99,6 +100,13 @@ public class TBaseDeviceController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TBaseDevice tBaseDevice)
     {
+        TBaseDevice device = new TBaseDevice();
+        device.setDevCode(tBaseDevice.getDevCode());
+        device.setPlantId(tBaseDevice.getPlantId());
+        List<TBaseDevice> tBaseDevices = tBaseDeviceService.selectTBaseDeviceList(device);
+        if (CollectionUtils.isNotEmpty(tBaseDevices)){
+            return AjaxResult.success("当前装置下已存在该设备！");
+        }
         tBaseDevice.setUpdaterCode(getUserId());
         tBaseDevice.setCreaterCode(getUserId());
         tBaseDevice.setUpdatedate(new Date());
@@ -118,6 +126,13 @@ public class TBaseDeviceController extends BaseController
         return toAjax(tBaseDeviceService.updateTBaseDevice(tBaseDevice));
     }
 
+    @PutMapping("/handleApprove")
+    public AjaxResult handleApprove(@RequestBody TBaseDevice tBaseDevice)
+    {
+        tBaseDevice.setApproveTime(new Date());
+        return toAjax(tBaseDeviceService.updateTBaseDeviceByDevIds(tBaseDevice));
+    }
+
     /**
      * 删除设备/管线
      */

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

@@ -84,6 +84,10 @@ public class TBasePlantController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TBasePlant tBasePlant)
     {
+        TBasePlant plant = tBasePlantService.selectTBasePlantByName(tBasePlant.getPlantName());
+        if (plant != null){
+            return AjaxResult.success("当前装置已存在!");
+        }
         tBasePlant.setUpdatedate(new Date());
         tBasePlant.setUpdaterCode(getUserId());
         tBasePlant.setCreaterCode(getUserId());
@@ -113,4 +117,10 @@ public class TBasePlantController extends BaseController
     {
         return toAjax(tBasePlantService.deleteTBasePlantByIds(ids));
     }
+
+    @PutMapping("/handleApprove")
+    public AjaxResult handleApprove(@RequestBody TBasePlant tBasePlant){
+        tBasePlant.setApproveTime(new Date());
+        return toAjax(tBasePlantService.updateTBasePlantByPlantIds(tBasePlant));
+    }
 }

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

@@ -23,10 +23,12 @@ import com.ruoyi.project.base.service.ITBaseDeviceService;
 import com.ruoyi.project.base.service.ITBasePlantService;
 import com.ruoyi.project.base.service.ITBaseRegionService;
 import com.ruoyi.system.service.ISysDictTypeService;
+import org.apache.ibatis.exceptions.TooManyResultsException;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.mybatis.spring.MyBatisSystemException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -108,14 +110,22 @@ public class TBasePointController extends BaseController {
     @Log(title = "密封点", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TBasePoint tBasePoint) {
-        TBasePoint point = tBasePointService.selectTBasePointByGroupCodeAndExtendCode(tBasePoint);
-        if (point == null) {
-            tBasePoint.setUpdatedate(new Date());
-            tBasePoint.setUpdaterCode(getUserId());
-            tBasePoint.setCreaterCode(getUserId());
-        return toAjax(tBasePointService.insertTBasePoint(tBasePoint));
-        }else{
-            return AjaxResult.error("当前数据已存在!");
+        try {
+            TBasePoint point = tBasePointService.selectTBasePointByGroupCodeAndExtendCode(tBasePoint);
+            if (point == null) {
+                tBasePoint.setUpdatedate(new Date());
+                tBasePoint.setUpdaterCode(getUserId());
+                tBasePoint.setCreaterCode(getUserId());
+            return toAjax(tBasePointService.insertTBasePoint(tBasePoint));
+            }else{
+                return AjaxResult.success("当前装置下的密封点已存在该群组编号和扩展编码!",0);
+            }
+        } catch (MyBatisSystemException e) {
+            e.printStackTrace();
+            return AjaxResult.success("当前装置下的密封点已存在该群组编号和扩展编码!",0);
+        }catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error();
         }
 
     }
@@ -137,6 +147,12 @@ public class TBasePointController extends BaseController {
         }
     }
 
+    @PutMapping("/handleApprove")
+    public AjaxResult handleApprove(@RequestBody TBasePoint tBasePoint) {
+            tBasePoint.setApproveTime(new Date());
+            return toAjax(tBasePointService.updateTBasePointByPointIds(tBasePoint));
+    }
+
     /**
      * 删除密封点
      */

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

@@ -24,8 +24,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/base/region")
-public class TBaseRegionController extends BaseController
-{
+public class TBaseRegionController extends BaseController {
     @Autowired
     private ITBaseRegionService tBaseRegionService;
 
@@ -34,16 +33,14 @@ public class TBaseRegionController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('base:region:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TBaseRegion tBaseRegion)
-    {
+    public TableDataInfo list(TBaseRegion tBaseRegion) {
         startPage();
         List<TBaseRegion> list = tBaseRegionService.selectTBaseRegionList(tBaseRegion);
         return getDataTable(list);
     }
 
     @GetMapping("/allRegion/{plantId}")
-    public AjaxResult allRegion(@PathVariable("plantId") Long plantId)
-    {
+    public AjaxResult allRegion(@PathVariable("plantId") Long plantId) {
         return AjaxResult.success(tBaseRegionService.selectAllRegionByPlantId(plantId));
     }
 
@@ -53,8 +50,7 @@ public class TBaseRegionController extends BaseController
     @PreAuthorize("@ss.hasPermi('base:region:export')")
     @Log(title = "区域", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, TBaseRegion tBaseRegion)
-    {
+    public void export(HttpServletResponse response, TBaseRegion tBaseRegion) {
         List<TBaseRegion> list = tBaseRegionService.selectTBaseRegionList(tBaseRegion);
         ExcelUtil<TBaseRegion> util = new ExcelUtil<TBaseRegion>(TBaseRegion.class);
         util.exportExcel(response, list, "区域数据");
@@ -65,8 +61,7 @@ public class TBaseRegionController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('base:region:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(tBaseRegionService.selectTBaseRegionById(id));
     }
 
@@ -76,8 +71,11 @@ public class TBaseRegionController extends BaseController
     @PreAuthorize("@ss.hasPermi('base:region:add')")
     @Log(title = "区域", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TBaseRegion tBaseRegion)
-    {
+    public AjaxResult add(@RequestBody TBaseRegion tBaseRegion) {
+        TBaseRegion region = tBaseRegionService.selectTBaseRegionByName(tBaseRegion.getRegionName(), tBaseRegion.getPlantId());
+        if (region != null) {
+            return AjaxResult.success("当前装置下已存在该区域!");
+        }
         tBaseRegion.setCreaterCode(getUserId());
         tBaseRegion.setUpdaterCode(getUserId());
         tBaseRegion.setUpdatedate(new Date());
@@ -90,21 +88,25 @@ public class TBaseRegionController extends BaseController
     @PreAuthorize("@ss.hasPermi('base:region:edit')")
     @Log(title = "区域", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TBaseRegion tBaseRegion)
-    {
+    public AjaxResult edit(@RequestBody TBaseRegion tBaseRegion) {
         tBaseRegion.setUpdaterCode(getUserId());
         tBaseRegion.setUpdatedate(new Date());
         return toAjax(tBaseRegionService.updateTBaseRegion(tBaseRegion));
     }
 
+    @PutMapping("/handleApprove")
+    public AjaxResult handleApprove(@RequestBody TBaseRegion tBaseRegion) {
+        tBaseRegion.setApproveTime(new Date());
+        return toAjax(tBaseRegionService.updateTBaseRegionByRegionIds(tBaseRegion));
+    }
+
     /**
      * 删除区域
      */
     @PreAuthorize("@ss.hasPermi('base:region:remove')")
     @Log(title = "区域", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tBaseRegionService.deleteTBaseRegionByIds(ids));
     }
 }

master/src/main/java/com/ruoyi/project/base/domain/TBaseDevice.java

@@ -22,6 +22,7 @@ public class TBaseDevice extends BaseEntity {
      * 唯一标识id
      */
     private Long devId;
+    private Long[] devIds;
 
     /**
      * 装置id
@@ -138,6 +139,14 @@ public class TBaseDevice extends BaseEntity {
     @Excel(name = "备注")
     private String remarks;
 
+    public Long[] getDevIds() {
+        return devIds;
+    }
+
+    public void setDevIds(Long[] devIds) {
+        this.devIds = devIds;
+    }
+
     public String getRemarks() {
         return remarks;
     }

master/src/main/java/com/ruoyi/project/base/domain/TBasePlant.java

@@ -33,7 +33,7 @@ public class TBasePlant extends BaseEntity
     private String proAbility;
 
     /** 类别 */
-    @Excel(name = "类别")
+    @Excel(name = "类别",dictType = "plant_type")
     private String plantType;
 
     /** 描述 */
@@ -41,7 +41,7 @@ public class TBasePlant extends BaseEntity
     private String remarks;
 
     /** 审核状态 */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态",dictType = "base_approve_status")
     private Long approveStatus;
 
     /** 最新申请时间 */
@@ -72,6 +72,16 @@ public class TBasePlant extends BaseEntity
     @Excel(name = "维护时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
+    private Long[] plantIds;
+
+    public Long[] getPlantIds() {
+        return plantIds;
+    }
+
+    public void setPlantIds(Long[] plantIds) {
+        this.plantIds = plantIds;
+    }
+
     public String getUpdater() {
         return updater;
     }

master/src/main/java/com/ruoyi/project/base/domain/TBasePoint.java

@@ -22,6 +22,7 @@ public class TBasePoint extends BaseEntity {
      * 唯一标识id
      */
     private Long pointId;
+    private Long[] pointIds;
 
     /**
      * 检测净值
@@ -32,7 +33,7 @@ public class TBasePoint extends BaseEntity {
     /**
      * 泄漏程度
      */
-    @Excel(name = "泄漏程度", dictType = "leakage_degree")
+    @Excel(name = "泄漏程度",readConverterExp = "1=不漏,2=一般泄露,3=严重泄漏")
     private String leakageDegree;
 
 
@@ -44,7 +45,7 @@ public class TBasePoint extends BaseEntity {
     @TableField(exist = false)
     private String plantCode;
 
-    @Excel(name = "装置类别" ,dictType = "plant_type")
+    @Excel(name = "装置类别")
     @TableField(exist = false)
     private String plantType;
 
@@ -89,13 +90,13 @@ public class TBasePoint extends BaseEntity {
     /**
      * 介质状态
      */
-    @Excel(name = "介质状态",dictType= "medium_type")
+    @Excel(name = "介质状态")
     private String mediumType;
 
     /**
      * 密封点类型
      */
-    @Excel(name = "密封点类型",dictType = "point_type")
+    @Excel(name = "密封点类型")
     private String pointType;
 
     /**
@@ -143,7 +144,7 @@ public class TBasePoint extends BaseEntity {
     /**
      * 是否不可达点
      */
-    @Excel(name = "是否不可达点",dictType = "yes_no")
+    @Excel(name = "是否不可达点")
     private String unarrive;
 
     /**
@@ -155,7 +156,7 @@ public class TBasePoint extends BaseEntity {
     /**
      * 是否保温/保冷
      */
-    @Excel(name = "是否保温/保冷",dictType = "yes_no")
+    @Excel(name = "是否保温/保冷")
     private String keepWarm;
 
     /**
@@ -223,7 +224,7 @@ public class TBasePoint extends BaseEntity {
     /**
      * 审核状态
      */
-    @Excel(name = "审核状态" ,dictType = "base_approve_status")
+    @Excel(name = "审核状态" ,readConverterExp = "0=未审核,1=已送审,2=已审核")
     private Long approveStatus;
 
     /**
@@ -276,6 +277,14 @@ public class TBasePoint extends BaseEntity {
     @Excel(name = "描述")
     private String remarks;
 
+    public Long[] getPointIds() {
+        return pointIds;
+    }
+
+    public void setPointIds(Long[] pointIds) {
+        this.pointIds = pointIds;
+    }
+
     public String getRegionCode() {
         return regionCode;
     }

master/src/main/java/com/ruoyi/project/base/domain/TBaseRegion.java

@@ -22,17 +22,29 @@ public class TBaseRegion extends BaseEntity {
      * 唯一标识id
      */
     private Long regionId;
+    private Long[] regionIds;
 
     /**
      * 装置id
      */
-    @Excel(name = "装置id")
     private Long plantId;
 
+    @Excel(name = "装置名称")
+    @TableField(exist = false)
+    private String plantName;
+
+    @Excel(name = "装置编码")
+    @TableField(exist = false)
+    private String plantCode;
+
+    @Excel(name = "装置类别",dictType = "plant_type")
+    @TableField(exist = false)
+    private String plantType;
+
     /**
      * 区域编码
      */
-    @Excel(name = "区域编码")
+    @Excel(name = "区域编号")
     private String regionCode;
 
     /**
@@ -50,20 +62,18 @@ public class TBaseRegion extends BaseEntity {
     /**
      * 审核状态
      */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态",dictType = "base_approve_status")
     private Long approveStatus;
 
     /**
      * 最新申请时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "最新申请时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date approveTime;
 
     /**
      * 部门编号
      */
-    @Excel(name = "部门编号")
     private Long deptId;
 
     /**
@@ -74,14 +84,12 @@ public class TBaseRegion extends BaseEntity {
     /**
      * 创建人
      */
-    @Excel(name = "创建人")
     private Long createrCode;
 
     /**
      * 创建时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdate;
 
     /**
@@ -91,17 +99,13 @@ public class TBaseRegion extends BaseEntity {
     private String updater;
     private Long updaterCode;
 
-    @Excel(name = "装置名称")
-    @TableField(exist = false)
-    private String plantName;
-
-    @Excel(name = "装置编码")
-    @TableField(exist = false)
-    private String plantCode;
+    public Long[] getRegionIds() {
+        return regionIds;
+    }
 
-    @Excel(name = "装置类别")
-    @TableField(exist = false)
-    private String plantType;
+    public void setRegionIds(Long[] regionIds) {
+        this.regionIds = regionIds;
+    }
 
     public String getUpdater() {
         return updater;

master/src/main/java/com/ruoyi/project/base/mapper/TBaseDeviceMapper.java

@@ -47,6 +47,7 @@ public interface TBaseDeviceMapper
      * @return 结果
      */
     public int updateTBaseDevice(TBaseDevice tBaseDevice);
+    public int updateTBaseDeviceByDevIds(TBaseDevice tBaseDevice);
 
     /**
      * 删除设备/管线

master/src/main/java/com/ruoyi/project/base/mapper/TBasePlantMapper.java

@@ -44,6 +44,7 @@ public interface TBasePlantMapper
      * @return 结果
      */
     public int updateTBasePlant(TBasePlant tBasePlant);
+    public int updateTBasePlantByPlantIds(TBasePlant tBasePlant);
 
     /**
      * 删除装置

master/src/main/java/com/ruoyi/project/base/mapper/TBasePointMapper.java

@@ -46,6 +46,7 @@ public interface TBasePointMapper extends BaseMapper<TBasePoint>
      * @return 结果
      */
     public int updateTBasePoint(TBasePoint tBasePoint);
+    public int updateTBasePointByPointIds(TBasePoint tBasePoint);
 
     /**
      * 删除密封点

master/src/main/java/com/ruoyi/project/base/mapper/TBaseRegionMapper.java

@@ -45,6 +45,7 @@ public interface TBaseRegionMapper
      * @return 结果
      */
     public int updateTBaseRegion(TBaseRegion tBaseRegion);
+    public int updateTBaseRegionByRegionIds(TBaseRegion tBaseRegion);
 
     /**
      * 删除区域

master/src/main/java/com/ruoyi/project/base/service/ITBaseDeviceService.java

@@ -44,6 +44,7 @@ public interface ITBaseDeviceService
      * @return 结果
      */
     public int updateTBaseDevice(TBaseDevice tBaseDevice);
+    public int updateTBaseDeviceByDevIds(TBaseDevice tBaseDevice);
 
     /**
      * 批量删除设备/管线

master/src/main/java/com/ruoyi/project/base/service/ITBasePlantService.java

@@ -44,6 +44,7 @@ public interface ITBasePlantService
      * @return 结果
      */
     public int updateTBasePlant(TBasePlant tBasePlant);
+    public int updateTBasePlantByPlantIds(TBasePlant tBasePlant);
 
     /**
      * 批量删除装置

master/src/main/java/com/ruoyi/project/base/service/ITBasePointService.java

@@ -47,6 +47,7 @@ public interface ITBasePointService {
      * @return 结果
      */
     public int updateTBasePoint(TBasePoint tBasePoint);
+    public int updateTBasePointByPointIds(TBasePoint tBasePoint);
 
     /**
      * 批量删除密封点

master/src/main/java/com/ruoyi/project/base/service/ITBaseRegionService.java

@@ -44,6 +44,7 @@ public interface ITBaseRegionService
      * @return 结果
      */
     public int updateTBaseRegion(TBaseRegion tBaseRegion);
+    public int updateTBaseRegionByRegionIds(TBaseRegion tBaseRegion);
 
     /**
      * 批量删除区域

master/src/main/java/com/ruoyi/project/base/service/impl/TBaseDeviceServiceImpl.java

@@ -76,6 +76,11 @@ public class TBaseDeviceServiceImpl implements ITBaseDeviceService
     {
         return tBaseDeviceMapper.updateTBaseDevice(tBaseDevice);
     }
+    @Override
+    public int updateTBaseDeviceByDevIds(TBaseDevice tBaseDevice)
+    {
+        return tBaseDeviceMapper.updateTBaseDeviceByDevIds(tBaseDevice);
+    }
 
     /**
      * 批量删除设备/管线

master/src/main/java/com/ruoyi/project/base/service/impl/TBasePlantServiceImpl.java

@@ -78,6 +78,12 @@ public class TBasePlantServiceImpl implements ITBasePlantService
         return tBasePlantMapper.updateTBasePlant(tBasePlant);
     }
 
+    @Override
+    public int updateTBasePlantByPlantIds(TBasePlant tBasePlant)
+    {
+        return tBasePlantMapper.updateTBasePlantByPlantIds(tBasePlant);
+    }
+
     /**
      * 批量删除装置
      *

master/src/main/java/com/ruoyi/project/base/service/impl/TBasePointServiceImpl.java

@@ -67,6 +67,10 @@ public class TBasePointServiceImpl implements ITBasePointService {
     public int updateTBasePoint(TBasePoint tBasePoint) {
         return tBasePointMapper.updateTBasePoint(tBasePoint);
     }
+    @Override
+    public int updateTBasePointByPointIds(TBasePoint tBasePoint) {
+        return tBasePointMapper.updateTBasePointByPointIds(tBasePoint);
+    }
 
     /**
      * 批量删除密封点

master/src/main/java/com/ruoyi/project/base/service/impl/TBaseRegionServiceImpl.java

@@ -76,6 +76,11 @@ public class TBaseRegionServiceImpl implements ITBaseRegionService
     {
         return tBaseRegionMapper.updateTBaseRegion(tBaseRegion);
     }
+    @Override
+    public int updateTBaseRegionByRegionIds(TBaseRegion tBaseRegion)
+    {
+        return tBaseRegionMapper.updateTBaseRegionByRegionIds(tBaseRegion);
+    }
 
     /**
      * 批量删除区域

master/src/main/java/com/ruoyi/project/check/domain/TCheckCheckpoints.java

@@ -41,13 +41,11 @@ public class TCheckCheckpoints extends BaseEntity {
     /**
      * 密封点id
      */
-    @Excel(name = "密封点id")
     private Long pointId;
 
     /**
      * 仪器id
      */
-    @Excel(name = "仪器id")
     private Long instrumentId;
 
     private Long inspectionId;
@@ -139,7 +137,7 @@ public class TCheckCheckpoints extends BaseEntity {
     /**
      * 泄漏程度
      */
-    @Excel(name = "泄漏程度")
+    @Excel(name = "泄漏程度",readConverterExp = "1=不漏,2=一般泄露,3=严重泄漏")
     private String leakageDegree;
 
     /**
@@ -151,20 +149,18 @@ public class TCheckCheckpoints extends BaseEntity {
     /**
      * 审核状态
      */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态",readConverterExp = "0=未审核,1=已送审,2=已审核")
     private Long approveStatus;
 
     /**
      * 审核时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date approveTime;
 
     /**
      * 部门编号
      */
-    @Excel(name = "部门编号")
     private Long deptId;
 
 
@@ -178,27 +174,23 @@ public class TCheckCheckpoints extends BaseEntity {
     /**
      * 创建人
      */
-    @Excel(name = "创建人")
     private Long createrCode;
 
     /**
      * 创建时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdate;
 
     /**
      * 维护人
      */
-    @Excel(name = "维护人")
     private Long updaterCode;
 
     /**
      * 维护时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "维护时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
     @TableField(exist = false)

master/src/main/java/com/ruoyi/project/check/domain/TCheckLaws.java

@@ -33,7 +33,7 @@ public class TCheckLaws extends BaseEntity
     private String type;
 
     /** 匹配状态 */
-    @Excel(name = "匹配状态")
+    @Excel(name = "匹配状态", readConverterExp="0=未匹配,1=匹配中")
     private String status;
 
     /** 匹配开始时间 */
@@ -55,18 +55,15 @@ public class TCheckLaws extends BaseEntity
     private Long createrCode;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createdate;
 
     /** 维护人 */
 
     private Long updaterCode;
-    @Excel(name = "维护人")
     private String updater;
 
     /** 维护时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "维护时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
     public String getUpdater() {

master/src/main/java/com/ruoyi/project/check/domain/TCheckRepairpoints.java

@@ -23,11 +23,9 @@ public class TCheckRepairpoints extends BaseEntity
     private Long checkId;
 
     /** 密封点id */
-    @Excel(name = "密封点id")
     private Long pointId;
 
     /** 维修任务id */
-    @Excel(name = "维修任务id")
     private Long repairId;
 
     /** 净检测值 */
@@ -96,7 +94,7 @@ public class TCheckRepairpoints extends BaseEntity
     private Date repairDate;
 
     /** 泄漏程度 */
-    @Excel(name = "泄漏程度")
+    @Excel(name = "泄漏程度",readConverterExp = "1=不漏,2=一般泄露,3=严重泄漏")
     private String leakageDegree;
 
     /** 备注 */
@@ -104,53 +102,43 @@ public class TCheckRepairpoints extends BaseEntity
     private String remarks;
 
     /** 审核状态 */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态",readConverterExp = "0=未审核,1=已送审,2=已审核")
     private Long approveStatus;
 
     /** 审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date approveTime;
 
     /** 部门编号 */
-    @Excel(name = "部门编号")
     private Long deptId;
 
     /** 状态  0：正常 ；1：删除 */
     private Integer delFlag;
 
     /** 创建人 */
-    @Excel(name = "创建人")
     private Long createrCode;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdate;
 
     /** 维护人 */
-    @Excel(name = "维护人")
     private Long updaterCode;
 
     /** 维护时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "维护时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
     /** 装置id */
-    @Excel(name = "装置id")
     private Long plantId;
 
     /** 区域id */
-    @Excel(name = "区域id")
     private Long regionId;
 
     /** 设备id */
-    @Excel(name = "设备id")
     private Long devId;
 
     /** 仪器id */
-    @Excel(name = "仪器id")
     private Long instrumentId;
 
     /** 装置类别 */

master/src/main/resources/mybatis/base/TBaseDeviceMapper.xml

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectAllDeviceByRegionId" parameterType="long" resultMap="TBaseDeviceResult">
-        select d.dev_id, concat(d.dev_code, '+',d.dev_describe) `dev_describe` from t_base_device d where d.region_id=#{regionId} and d.del_flag=0
+        select d.dev_id, concat(d.dev_code, '+',d.dev_describe) `dev_describe` from t_base_device d where d.region_id=#{regionId} and d.del_flag=0  and d.approve_status=2
     </select>
 
     <select id="selectTBaseDeviceByCode" parameterType="TBasePoint" resultMap="TBaseDeviceResult">
@@ -153,4 +153,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{devId}
         </foreach>
     </delete>
+
+    <update id="updateTBaseDeviceByDevIds" parameterType="TBaseDevice">
+        update t_base_device set approve_status=#{approveStatus},approve_time=#{approveTime}
+        <where>
+            dev_id in
+            <foreach item="devId" collection="devIds" open="(" separator="," close=")">
+                #{devId}
+            </foreach>
+            <if test="approveStatus ==1">
+                and approve_status=0
+            </if>
+            <if test="approveStatus ==2">
+                and approve_status=1
+            </if>
+        </where>
+    </update>
 </mapper>

master/src/main/resources/mybatis/base/TBasePlantMapper.xml

@@ -121,7 +121,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteTBasePlantByIds" parameterType="String">
         update t_base_plant set del_flag=1 where plant_id in
         <foreach item="plantId" collection="array" open="(" separator="," close=")">
-            #{plant_id}
+            #{plantId}
         </foreach>
     </delete>
+
+    <update id="updateTBasePlantByPlantIds" parameterType="TBasePlant">
+        update t_base_plant set approve_status=#{approveStatus},approve_time=#{approveTime}
+        <where>
+            plant_id in
+            <foreach item="plantId" collection="plantIds" open="(" separator="," close=")">
+                #{plantId}
+            </foreach>
+            <if test="approveStatus ==1">
+                and approve_status=0
+            </if>
+            <if test="approveStatus ==2">
+                and approve_status=1
+            </if>
+        </where>
+    </update>
 </mapper>

master/src/main/resources/mybatis/base/TBasePointMapper.xml

@@ -258,4 +258,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{pointId}
         </foreach>
     </delete>
+
+    <update id="updateTBasePointByPointIds" parameterType="TBaseRegion">
+        update t_base_point set approve_status=#{approveStatus},approve_time=#{approveTime}
+        <where>
+            point_id in
+            <foreach item="pointId" collection="pointIds" open="(" separator="," close=")">
+                #{pointId}
+            </foreach>
+            <if test="approveStatus ==1">
+                and approve_status=0
+            </if>
+            <if test="approveStatus ==2">
+                and approve_status=1
+            </if>
+        </where>
+    </update>
 </mapper>

master/src/main/resources/mybatis/base/TBaseRegionMapper.xml

@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     <select id="selectAllRegionByPlantId" parameterType="long"  resultMap="TBaseRegionResult">
-        select d.region_id, d.region_code, d.region_name from t_base_region d where d.plant_id=#{plantId} and d.del_flag=0
+        select d.region_id, d.region_code, d.region_name from t_base_region d where d.plant_id=#{plantId} and d.del_flag=0 and d.approve_status=2
     </select>
 
     <select id="selectTBaseRegionById" parameterType="Long" resultMap="TBaseRegionResult">
@@ -124,4 +124,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{regionId}
         </foreach>
     </delete>
+
+    <update id="updateTBaseRegionByRegionIds" parameterType="TBaseRegion">
+        update t_base_region set approve_status=#{approveStatus},approve_time=#{approveTime}
+        <where>
+            region_id in
+            <foreach item="regionId" collection="regionIds" open="(" separator="," close=")">
+                #{regionId}
+            </foreach>
+            <if test="approveStatus ==1">
+                and approve_status=0
+            </if>
+            <if test="approveStatus ==2">
+                and approve_status=1
+            </if>
+        </where>
+    </update>
 </mapper>

master/src/main/resources/mybatis/check/TCheckRepairpointsMapper.xml

@@ -298,6 +298,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_check_repairpoints
         <trim prefix="SET" suffixOverrides=",">
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="repairCount != null">repair_count = #{repairCount},</if>
         </trim>
         <where>
             check_id in

ui/src/api/base/device.js

@@ -16,6 +16,7 @@ export function getDevice(id) {
     method: 'get'
   })
 }
+
 export function getAllDeviceByRegionId(regionId) {
   return request({
     url: '/base/device/allDevice/' + regionId,
@@ -40,11 +41,18 @@ export function updateDevice(data) {
     data: data
   })
 }
+export function handleApprove(data) {
+    return request({
+      url: '/base/device/handleApprove',
+      method: 'put',
+      data: data
+    })
+  }
 
 // 删除设备/管线
-export function delDevice(id) {
-  return request({
-    url: '/base/device/' + id,
-    method: 'delete'
-  })
-}
+  export function delDevice(id) {
+    return request({
+      url: '/base/device/' + id,
+      method: 'delete'
+    })
+  }

ui/src/api/base/plant.js

@@ -49,3 +49,10 @@ export function getAllPlantName() {
     method: 'get'
   })
 }
+export function handleApprove(data) {
+  return request({
+    url: '/base/plant/handleApprove',
+    method: 'put',
+    data:data
+  })
+}

ui/src/api/base/point.js

@@ -33,6 +33,12 @@ export function updatePoint(data) {
     method: 'put',
     data: data
   })
+}export function handleApprove(data) {
+  return request({
+    url: '/base/point/handleApprove',
+    method: 'put',
+    data: data
+  })
 }
 
 // 删除密封点

ui/src/api/base/region.js

@@ -49,3 +49,10 @@ export function delRegion(id) {
     method: 'delete'
   })
 }
+export function handleApprove(data) {
+  return request({
+    url: '/base/region/handleApprove',
+    method: 'put',
+    data: data
+  })
+}

ui/src/layout/components/Sidebar/Logo.vue

@@ -36,7 +36,7 @@ export default {
   data() {
     return {
       title: 'LDAR综合管理系统',
-      logo: logoImg
+      //logo: logoImg
     }
   }
 }

ui/src/views/base/device/index.vue

@@ -118,25 +118,29 @@
     <el-table v-loading="loading" :data="deviceList" :cell-style="tableCellStyle"
               @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" fixed="left"/>
-      <el-table-column label="审核状态" align="center" fixed="left" prop="approveStatus" :formatter="approveStatusFormat" :show-overflow-tooltip="true" width="80"/>
+      <el-table-column label="审核状态" align="center" fixed="left" prop="approveStatus"
+                       :formatter="approveStatusFormat" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="装置名称" align="center" prop="plantName" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="装置编编码" align="center" prop="plantCode" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="区域名称" align="center" prop="regionName" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="区域编号" align="center" prop="regionCode" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="设备/管线编号" align="center" prop="devCode" :show-overflow-tooltip="true" width="130"/>
-      <el-table-column label="设备/管线描述" align="center" prop="devDescribe" :show-overflow-tooltip="true" width="230"/>
+      <el-table-column label="设备/管线描述" align="center" prop="devDescribe" :show-overflow-tooltip="true"
+                       width="230"/>
       <el-table-column label="主要物料/产品" align="center" prop="material" :show-overflow-tooltip="true" width="130"/>
       <el-table-column label="物料状态" align="center" prop="materialStatus" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="合成相应因子" align="center" prop="responseFactor" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="相应因子来源" align="center" prop="responseFactorFrom" :show-overflow-tooltip="true" width="100"/>
+      <el-table-column label="合成相应因子" align="center" prop="responseFactor" :show-overflow-tooltip="true"
+                       width="100"/>
+      <el-table-column label="相应因子来源" align="center" prop="responseFactorFrom" :show-overflow-tooltip="true"
+                       width="100"/>
       <el-table-column label="维护人" align="center" prop="updater" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="维护时间" align="center" prop="updatedate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark"  :show-overflow-tooltip="true" width="230"/>
-      <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width"  width="120">
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="230"/>
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -242,12 +246,15 @@
           <el-link type="info" style="font-size:12px" @click="importTemplate">{{ $t('下载模板') }}</el-link>
         </div>
         <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
-          <input name="type" :value="upload.type" hidden />
+          <input name="type" :value="upload.type" hidden/>
         </form>
         <div class="el-upload__tip" style="color:red" slot="tip">{{ $t('提示：仅允许导入“xls”或“xlsx”格式文件！') }}</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm"  v-loading.fullscreen.lock="fullscreenLoading">{{ $t('确 定') }}</el-button>
+        <el-button type="primary" @click="submitFileForm" v-loading.fullscreen.lock="fullscreenLoading">{{
+            $t('确 定')
+          }}
+        </el-button>
         <el-button @click="upload.open = false">{{ $t('取 消') }}</el-button>
       </div>
     </el-dialog>
@@ -255,7 +262,7 @@
 </template>
 
 <script>
-import {listDevice, getDevice, delDevice, addDevice, updateDevice} from "@/api/base/device";
+import {addDevice, delDevice, getDevice, handleApprove, listDevice, updateDevice} from "@/api/base/device";
 import {getAllPlantName} from "@/api/base/plant";
 import {getAllRegion} from "@/api/base/region";
 import {MessageBox} from 'element-ui'
@@ -271,7 +278,7 @@ export default {
       clientHeight: 300,
       // 遮罩层
       loading: true,
-      // 选中数组
+      // 选中数组l
       ids: [],
       status: [],
       // 非单个禁用
@@ -303,7 +310,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/base/device/importData"
       },
@@ -385,12 +392,12 @@ export default {
       this.$refs.upload.clearFiles();
       this.fullscreenLoading = false;
       console.log(response)
-      if (response.data ===0) {
-        this.$alert(this.$t('导入失败！')+ response.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
-      }else if (response.data[0] != null) {
-        this.$alert(this.$t('成功导入') + response.msg + this.$t('条数据') + "，" + this.$t('第') + response.data + this.$t('行数据出现错误导入失败')+"。", this.$t('导入结果'), { dangerouslyUseHTMLString: true });
-      }else {
-        this.$alert(this.$t('成功导入') + response.msg + this.$t('条数据'), this.$t('导入结果'), { dangerouslyUseHTMLString: true });
+      if (response.data === 0) {
+        this.$alert(this.$t('导入失败！') + response.msg, this.$t('导入结果'), {dangerouslyUseHTMLString: true});
+      } else if (response.data[0] != null) {
+        this.$alert(this.$t('成功导入') + response.msg + this.$t('条数据') + "，" + this.$t('第') + response.data + this.$t('行数据出现错误导入失败') + "。", this.$t('导入结果'), {dangerouslyUseHTMLString: true});
+      } else {
+        this.$alert(this.$t('成功导入') + response.msg + this.$t('条数据'), this.$t('导入结果'), {dangerouslyUseHTMLString: true});
       }
       this.getList();
     },
@@ -399,7 +406,7 @@ export default {
     },
     tableCellStyle({row, column, rowIndex, columnIndex}) {
       if (columnIndex === 1 && row.approveStatus == 2) {
-        return "color:#00ff00;";
+        return "color:#13C2C2;";
       }
       if (columnIndex === 1 && row.approveStatus == 1) {
         return "color:#0000FF;";
@@ -525,7 +532,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.devId || this.ids;
-      if(row.approveStatus===undefined){
+      if (row.approveStatus === undefined) {
         for (let i = 0; i < this.status.length; i++) {
           if (this.status[i] != 0) {
             MessageBox.alert('已送审/已审核的数据不可删除！', '注意！', {
@@ -534,7 +541,7 @@ export default {
             return
           }
         }
-      }else if (row.approveStatus!=0){
+      } else if (row.approveStatus != 0) {
         MessageBox.alert('已送审/已审核的数据不可删除！', '注意！', {
           confirmButtonText: '确定',
         })
@@ -555,10 +562,20 @@ export default {
       }, `device_${new Date().getTime()}.xlsx`)
     },
     handleToApprove() {
-      alert("功能开发中......")
+      let data = {};
+      data.devIds = this.ids;
+      data.approveStatus = 1;
+      handleApprove(data).then(() => {
+        this.getList();
+      })
     },
     handleApprove() {
-      alert("功能开发中......")
+      let data = {};
+      data.devIds = this.ids;
+      data.approveStatus = 2;
+      handleApprove(data).then(() => {
+        this.getList();
+      })
     }
   }
 };

ui/src/views/base/plant/index.vue

@@ -193,7 +193,7 @@
 </template>
 
 <script>
-import {listPlant, getPlant, delPlant, addPlant, updatePlant} from "@/api/base/plant";
+import {listPlant, getPlant, delPlant, addPlant, updatePlant, handleApprove} from "@/api/base/plant";
 import {MessageBox} from "element-ui";
 
 export default {
@@ -386,7 +386,7 @@ export default {
             });
           } else {
             addPlant(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess(response.msg);
               this.open = false;
               this.getList();
             });
@@ -427,9 +427,19 @@ export default {
       }, `plant_${new Date().getTime()}.xlsx`)
     },
     handleToApprove() {
-      alert("功能开发中......")
+      let data={};
+      data.plantIds=this.ids;
+      data.approveStatus=1;
+      handleApprove(data).then(()=>{
+        this.getList();
+      })
     },handleApprove() {
-      alert("功能开发中......")
+      let data={};
+      data.plantIds=this.ids;
+      data.approveStatus=2;
+      handleApprove(data).then(()=>{
+        this.getList();
+      })
     }
   }
 };

ui/src/views/base/point/index.vue

@@ -546,7 +546,7 @@
 </template>
 
 <script>
-import {listPoint, getPoint, delPoint, addPoint, updatePoint} from "@/api/base/point";
+import {listPoint, getPoint, delPoint, addPoint, updatePoint, handleApprove} from "@/api/base/point";
 import {getAllPlantName} from "@/api/base/plant";
 import {getAllRegion} from "@/api/base/region";
 import {getAllDeviceByRegionId} from "@/api/base/device";
@@ -933,9 +933,13 @@ export default {
             });
           } else {
             addPoint(this.form).then(response => {
+              if (response.data!=0){
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              }else {
+                this.$modal.msgWarning(response.msg);
+              }
             });
           }
         }
@@ -974,10 +978,20 @@ export default {
       }, `point_${new Date().getTime()}.xlsx`)
     },
     handleToApprove() {
-      alert("功能开发中......")
+      let data={}
+      data.pointIds=this.ids;
+      data.approveStatus=1;
+      handleApprove(data).then(() => {
+        this.getList();
+      });
     },
     handleApprove() {
-      alert("功能开发中......")
+      let data={}
+      data.pointIds=this.ids;
+      data.approveStatus=2;
+      handleApprove(data).then(() => {
+        this.getList();
+      });
     }
   }
 };

ui/src/views/base/region/index.vue

@@ -174,7 +174,7 @@
 </template>
 
 <script>
-import { listRegion, getRegion, delRegion, addRegion, updateRegion } from "@/api/base/region";
+import { listRegion, getRegion, delRegion, addRegion, updateRegion, handleApprove } from "@/api/base/region";
 import {getAllPlantName} from "@/api/base/plant";
 import {MessageBox} from "element-ui";
 
@@ -388,10 +388,20 @@ export default {
       }, `region_${new Date().getTime()}.xlsx`)
     },
     handleToApprove() {
-      alert("功能开发中......")
+      let data={};
+      data.regionIds=this.ids;
+      data.approveStatus=1;
+      handleApprove(data).then(()=>{
+        this.getList();
+      })
     },
     handleApprove() {
-      alert("功能开发中......")
+      let data={};
+      data.regionIds=this.ids;
+      data.approveStatus=2;
+      handleApprove(data).then(()=>{
+        this.getList();
+      })
     }
   }
 };

ui/src/views/check/laws/index.vue

@@ -113,7 +113,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-connection"
+            icon="el-icon-tickets"
             @click="getLawItems(scope.row)"
             v-hasPermi="['check:laws:edit']"
           >法规项

ui/src/views/check/repairCheck/repairEnter.vue

@@ -297,7 +297,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('check/checkpoints/export', {
+      this.download('check/repairpoints/export', {
         ...this.queryParams
       }, `checkpoints_${new Date().getTime()}.xlsx`)
     },
@@ -389,6 +389,7 @@ export default {
       let data = {};
       data.checkIds = this.left;
       data.approveStatus = 2;
+      data.repairCount = 1;
       data.repairId = this.row.id;
       approveRepairpoints(data).then(response => {
         this.getList();

ui/src/views/login.vue

@@ -172,7 +172,7 @@ export default {
 
 .login-form {
   border-radius: 6px;
-  background: #ffffffaa;
+  background: #ffffff;
   width: 400px;
   box-sizing:border-box;
   box-shadow: 0px 15px 25px rgba(0,0,0,.5);