李扬

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlgdController.java

@@ -6,6 +6,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.StringUtils;
@@ -67,7 +68,6 @@ public class TReportHiYlgdController extends BaseController {
     /**
      * 查询压力管道报告历史列表
      */
-    @PreAuthorize("@ss.hasPermi('sems:historyYlgd:list')")
     @GetMapping("/list")
     public TableDataInfo list(TReportHiYlgd tReportHiYlgd) {
         startPage();
@@ -208,7 +208,12 @@ public class TReportHiYlgdController extends BaseController {
             //获取信息，就是上面的结构
             HashMap<String, Object> map = new HashMap<>();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            List<TReportHiYlgd> tReportHiYlgds = this.tReportHiYlgdService.selectTReportHiYlgdForYear(year);
+            //
+            TReportHiYlgd hiYlgd = new TReportHiYlgd();
+            Map param = new HashMap();
+            param.put("year" , year);
+            hiYlgd.setParams(param);
+            List<TReportHiYlgd> tReportHiYlgds = this.tReportHiYlgdService.selectTReportHiYlgdForYear(hiYlgd);
             List<SysDictData> con = iSysDictTypeService.selectDictDataByType("REPORT_CON");
             //使用当前时间作为文件夹，所有文件保存在当中
             long now = System.currentTimeMillis();

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlrqController.java

@@ -7,6 +7,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.StringUtils;
@@ -68,7 +69,6 @@ public class TReportHiYlrqController extends BaseController {
     /**
      * 查询压力容器报告历史列表
      */
-    @PreAuthorize("@ss.hasPermi('sems:historyYlrq:list')")
     @GetMapping("/list")
     public TableDataInfo list(TReportHiYlrq tReportHiYlrq) {
         startPage();
@@ -209,7 +209,12 @@ public class TReportHiYlrqController extends BaseController {
             //获取信息，就是上面的结构
             HashMap<String, Object> map = new HashMap<>();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            List<TReportHiYlrq> tReportHiYlrqs = this.tReportHiYlrqService.selectTReportHiYlrqForYear(year);
+            //
+            TReportHiYlrq hiYlrq = new TReportHiYlrq();
+            Map param = new HashMap();
+            param.put("year" , year);
+            hiYlrq.setParams(param);
+            List<TReportHiYlrq> tReportHiYlrqs = this.tReportHiYlrqService.selectTReportHiYlrqForYear(hiYlrq);
             List<SysDictData> con = iSysDictTypeService.selectDictDataByType("REPORT_CON");
             //使用当前时间作为文件夹，所有文件保存在当中
             long now = System.currentTimeMillis();

master/src/main/java/com/ruoyi/project/sems/mapper/TReportHiYlgdMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.sems.mapper;
 
 import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScopePlant;
 import com.ruoyi.project.sems.domain.TReportHiYlgd;
 
 /**
@@ -26,7 +27,8 @@ public interface TReportHiYlgdMapper
      * @param year 年份
      * @return
      */
-    public List<TReportHiYlgd> selectTReportHiYlgdForYear(String year);
+    @DataScopePlant(deptAlias = "d")
+    public List<TReportHiYlgd> selectTReportHiYlgdForYear(TReportHiYlgd year);
 
     /**
      * 查询压力管道报告历史列表
@@ -34,7 +36,7 @@ public interface TReportHiYlgdMapper
      * @param tReportHiYlgd 压力管道报告历史
      * @return 压力管道报告历史集合
      */
-    @DataScope(deptAlias = "d")
+    @DataScopePlant(deptAlias = "d")
     public List<TReportHiYlgd> selectTReportHiYlgdList(TReportHiYlgd tReportHiYlgd);
 
     /**

master/src/main/java/com/ruoyi/project/sems/mapper/TReportHiYlrqMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.sems.mapper;
 
 import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScopePlant;
 import com.ruoyi.project.sems.domain.TReportHiYlrq;
 
 /**
@@ -26,7 +27,8 @@ public interface TReportHiYlrqMapper
      * @param year 年份
      * @return
      */
-    public List<TReportHiYlrq> selectTReportHiYlrqForYear(String year);
+    @DataScopePlant(deptAlias = "d")
+    public List<TReportHiYlrq> selectTReportHiYlrqForYear(TReportHiYlrq year);
 
     /**
      * 查询压力容器报告历史列表
@@ -34,7 +36,7 @@ public interface TReportHiYlrqMapper
      * @param tReportHiYlrq 压力容器报告历史
      * @return 压力容器报告历史集合
      */
-    @DataScope(deptAlias = "d")
+    @DataScopePlant(deptAlias = "d")
     public List<TReportHiYlrq> selectTReportHiYlrqList(TReportHiYlrq tReportHiYlrq);
 
     /**

master/src/main/java/com/ruoyi/project/sems/service/ITReportHiYlgdService.java

@@ -34,7 +34,7 @@ public interface ITReportHiYlgdService
      * @param year 年份
      * @return
      */
-    public List<TReportHiYlgd> selectTReportHiYlgdForYear(String year);
+    public List<TReportHiYlgd> selectTReportHiYlgdForYear(TReportHiYlgd year);
 
     /**
      * 新增压力管道报告历史

master/src/main/java/com/ruoyi/project/sems/service/ITReportHiYlrqService.java

@@ -26,7 +26,7 @@ public interface ITReportHiYlrqService
      * @param year 年份
      * @return
      */
-    public List<TReportHiYlrq> selectTReportHiYlrqForYear(String year);
+    public List<TReportHiYlrq> selectTReportHiYlrqForYear(TReportHiYlrq year);
 
     /**
      * 查询压力容器报告历史列表

master/src/main/java/com/ruoyi/project/sems/service/impl/TReportHiYlgdServiceImpl.java

@@ -46,7 +46,7 @@ public class TReportHiYlgdServiceImpl implements ITReportHiYlgdService
     }
 
     @Override
-    public List<TReportHiYlgd> selectTReportHiYlgdForYear(String year) {
+    public List<TReportHiYlgd> selectTReportHiYlgdForYear(TReportHiYlgd year) {
         return this.tReportHiYlgdMapper.selectTReportHiYlgdForYear(year);
     }
 

master/src/main/java/com/ruoyi/project/sems/service/impl/TReportHiYlrqServiceImpl.java

@@ -34,7 +34,7 @@ public class TReportHiYlrqServiceImpl implements ITReportHiYlrqService
     }
 
     @Override
-    public List<TReportHiYlrq> selectTReportHiYlrqForYear(String year) {
+    public List<TReportHiYlrq> selectTReportHiYlrqForYear(TReportHiYlrq year) {
         return this.tReportHiYlrqMapper.selectTReportHiYlrqForYear(year);
     }
 

master/src/main/resources/freeMaker/yearYlgdFMaker.ftl

@@ -1373,10 +1373,10 @@
 			</tr>
 		</table>
 		<p style="margin:3pt 0pt 0pt">
-			<span style="font-family:SimSun; font-size:10pt">注：没有或未进行的检查项目在检查结果栏打“—”；无问题或合格的检查项目在检查结果栏打“√”，有问题或不合格</span>
+			<span style="font-family:SimSun; font-size:10pt">注：没有或未进行的检查项目在检查结果栏打“—”；无问题或合格的检查项目在检查结果栏打“√”，有问题或不合</span>
 		</p>
 		<p style="margin:3pt 0pt 0pt">
-			<span style="font-family:SimSun; font-size:10pt">的检查项目在检查结果栏打“×”，并在备注中说明。</span>
+			<span style="font-family:SimSun; font-size:10pt">格的检查项目在检查结果栏打“×”，并在备注中说明。</span>
 		</p>
 	</div>
 </body>

master/src/main/resources/freeMaker/yearYlrqFMaker.ftl

@@ -1489,10 +1489,10 @@
 		</table>
 	</div>
 	<p style="line-height:14pt; margin:0pt 14.05pt 0pt 7.05pt; orphans:0; text-align:justify; text-indent:0.05pt; widows:0">
-		<span style="font-family:SimSun; font-size:10pt">注：没有或未进行的检查项目在检查结果栏打“—”；无问题或合格的检查项目在检查结果栏打“√”，有问题或不合格</span>
+		<span style="font-family:SimSun; font-size:10pt">注：没有或未进行的检查项目在检查结果栏打“—”；无问题或合格的检查项目在检查结果栏打“√”，有问题或不合</span>
 	</p>
 	<p style="line-height:14pt; margin:0pt 14.05pt 0pt 7.05pt; orphans:0; text-align:justify; text-indent:0.05pt; widows:0">
-		<span style="font-family:SimSun; font-size:10pt">的检查项目在检查结果栏打“×”，并在备注中说明。</span>
+		<span style="font-family:SimSun; font-size:10pt">格的检查项目在检查结果栏打“×”，并在备注中说明。</span>
 	</p>
 </body>
 </html>

master/src/main/resources/mybatis/sems/TReportHiYlgdMapper.xml

@@ -57,8 +57,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTReportHiYlgdForYear" parameterType="String" resultMap="TReportHiYlgdResult">
         <include refid="selectTReportHiYlgdVo"/>
-        where TO_CHAR(check_date,'yyyy') = #{year}
+        where TO_CHAR(check_date,'yyyy') = #{params.year}
         and d.del_flag = 0
+        <!-- 数据范围过滤 -->
+        ${params.dataScopePlant}
     </select>
 
     <select id="selectTReportHiYlgdList" parameterType="TReportHiYlgd" resultMap="TReportHiYlgdResult">
@@ -68,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        ${params.dataScopePlant}
     </select>
 
     <select id="selectTReportHiYlgdById" parameterType="Long" resultMap="TReportHiYlgdResult">

master/src/main/resources/mybatis/sems/TReportHiYlrqMapper.xml

@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        ${params.dataScopePlant}
     </select>
 
     <select id="selectTReportHiYlrqById" parameterType="Long" resultMap="TReportHiYlrqResult">
@@ -88,8 +88,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTReportHiYlrqForYear" parameterType="String" resultMap="TReportHiYlrqResult">
         <include refid="selectTReportHiYlrqVo"/>
-        where TO_CHAR(check_date,'yyyy') = #{year}
+        where TO_CHAR(check_date,'yyyy') = #{params.year}
         and d.del_flag = 0
+        <!-- 数据范围过滤 -->
+        ${params.dataScopePlant}
     </select>
 
     <insert id="insertTReportHiYlrq" parameterType="TReportHiYlrq">

ui/src/lang/en.js

@@ -1294,7 +1294,7 @@ export default {
   提出时间:'Proposed Time',
   趋势图:'Trend',
   测厚数据:'Thickness Measurement Data',
-  数值:'Value',
+  实测记录:'Value',
   使用证号码:'Use No.',
   '材料(管/壳)':'Material (Tube/Shell)',
   '介质(管/壳)':'Medium (Tube/Shell)',

ui/src/lang/zh.js

@@ -1294,7 +1294,7 @@ export default {
   提出时间:'提出时间',
   趋势图:'趋势图',
   测厚数据:'测厚数据',
-  数值:'数值',
+  实测记录:'实测记录',
   使用证号码:'使用证号码',
   '材料(管/壳)':'材料(管/壳)',
   '介质(管/壳)':'介质(管/壳)',

ui/src/views/sems/reportYlgd/index.vue

@@ -58,7 +58,7 @@
           type="warning"
           size="mini"
           @click="dialogVisible = true"
-        >{{ $t('批量下载历史报告') }}
+        >{{ $t('批量')+$t('下载')+$t('历史报告') }}
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

ui/src/views/sems/thickness/index.vue

@@ -758,7 +758,7 @@
                prop="measureValue"
                header-align="center"
                align="center"
-               :label="$t('数值')">
+               :label="$t('实测记录')">
                <template slot-scope="scope">
                  <el-input v-if="scope.row.isEdit" v-model="scope.row.measureValue"></el-input>
                  <span v-else>{{scope.row.measureValue}}</span>

ui/src/views/sems/thickness/record.vue

@@ -18,7 +18,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="measure_recordList" @selection-change="handleSelectionChange" border>
-      <el-table-column :label="$t('数值')" align="center" prop="measureValue" width="120">
+      <el-table-column :label="$t('实测记录')" align="center" prop="measureValue" width="120">
         <template slot-scope="scope">
           <el-input v-if="scope.row.isEdit" v-model="scope.row.measureValue"></el-input>
           <span v-else>{{scope.row.measureValue}}</span>