pssr 导入

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java

@@ -306,7 +306,7 @@ public class TPssrFrameController extends BaseController {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrFrame.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrFrame));
+        return toAjax(tPssrFrameService.insertTPssrFrame(tPssrFrame));
     }
 
     //导入时判断更新或新增

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -236,7 +236,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulExchanger tPssrOverhaulExchanger) {
         tPssrOverhaulExchanger.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrOverhaulExchanger));
+        return toAjax(tPssrOverhaulExchangerService.insertTPssrOverhaulExchanger(tPssrOverhaulExchanger));
     }
 
     //导入时判断更新或新增

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -376,7 +376,7 @@ public class TPssrOverhaulFilterController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulFilter tPssrOverhaulFilter) {
         tPssrOverhaulFilter.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrOverhaulFilter));
+        return toAjax(tPssrOverhaulFilterService.insertTPssrOverhaulFilter(tPssrOverhaulFilter));
     }
 
     //导入时判断更新或新增

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -369,7 +369,7 @@ public class TPssrOverhaulTowerController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulTower tPssrOverhaulTower) {
         tPssrOverhaulTower.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrOverhaulTower));
+        return toAjax(tPssrOverhaulTowerService.insertTPssrOverhaulTower(tPssrOverhaulTower));
     }
 
     //导入时判断更新或新增

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -401,7 +401,7 @@ public class TPssrOverhaulValveController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody TPssrOverhaulValve tPssrOverhaulValve) {
         tPssrOverhaulValve.setApproveStatus(0L);
-        return toAjax(insertOrUpdate(tPssrOverhaulValve));
+        return toAjax(tPssrOverhaulValveService.insertTPssrOverhaulValve(tPssrOverhaulValve));
     }
 
     //导入时判断更新或新增

master/src/main/resources/mybatis/reliability/TSafetyvavleMapper.xml

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="tagno != null  and tagno != ''"> and tagno = #{tagno}</if>
             <if test="item != null "> and item = #{item}</if>
+            <if test="subarea != null "> and subarea = #{subarea}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -227,7 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		-- 递归查询，找到某个父级部门（假设传入的部门ID为 :parent_dept_id）的所有子部门
 		SELECT dept_id
 		FROM sys_dept
-		START WITH dept_id in (10040,10000,108)
+		START WITH dept_id in (10040,10000,108,109)
 		CONNECT BY PRIOR dept_id = parent_id
 		)
 		<if test="nickName != null and nickName != ''">

ui/src/views/pssr/overhaulExchanger/index.vue

@@ -225,7 +225,7 @@
           <el-input v-model="form.equipmentName" placeholder="请输入设备名称"/>
         </el-form-item>
         <el-form-item label="P&ID图号" prop="pidNo">
-          <el-input v-model="form.pidNo" placeholder="请输入图号"/>
+          <el-input v-model="form.pidNo" type="textarea" placeholder="请输入图号"/>
         </el-form-item>
         <el-form-item label="检修内容" prop="workDes">
           <el-input v-model="form.workDes" placeholder="请输入检修内容"/>

ui/src/views/pssr/overhaulFilter/index.vue

@@ -226,7 +226,7 @@
           <el-input v-model="form.strainerLocation" placeholder="请输入过滤网位置"/>
         </el-form-item>
         <el-form-item label="P&ID号" prop="pidNo">
-          <el-input v-model="form.pidNo" placeholder="请输入P&ID号"/>
+          <el-input v-model="form.pidNo"  type="textarea" placeholder="请输入P&ID号"/>
         </el-form-item>
         <el-form-item label="管线号" prop="isoDwgNo">
           <el-input v-model="form.isoDwgNo" placeholder="请输入管线号"/>

ui/src/views/pssr/overhaulTower/index.vue

@@ -228,7 +228,7 @@
           <el-input v-model="form.workDes" placeholder="请输入检修内容"/>
         </el-form-item>
         <el-form-item label="图号" prop="pidNo">
-          <el-input v-model="form.pidNo" placeholder="请输入图号"/>
+          <el-input v-model="form.pidNo" type="textarea" placeholder="请输入图号"/>
         </el-form-item>
         <el-form-item label="完成状态" prop="completionStatus">
           <el-radio-group v-model="form.completionStatus">

ui/src/views/pssr/overhaulValve/index.vue

@@ -217,7 +217,7 @@
           <el-input v-model="form.valveClass" placeholder="请输入等级"/>
         </el-form-item>
         <el-form-item label="PID图号" prop="pidNo">
-          <el-input v-model="form.pidNo" placeholder="请输入图号"/>
+          <el-input v-model="form.pidNo" type="textarea" placeholder="请输入图号"/>
         </el-form-item>
         <el-form-item label="升级改型更换/更换/维修" prop="changeType">
           <el-select v-model="form.changeType" placeholder="请选择升级改型更换/更换/维修" clearable size="small">