李扬

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

@@ -173,7 +173,7 @@ public class TReportHiYlgdController extends BaseController {
             HistoricTaskInstanceQuery htiq = historyService.createHistoricTaskInstanceQuery();
             List<HistoricTaskInstance> htiLists = htiq.processInstanceId(reportHiYlgd.getApproveId()).finished().orderByHistoricTaskInstanceEndTime().asc().list();
             logger.info("历史任务：" + JSON.toJSONString(htiLists));
-            if (htiLists != null) {
+            if (htiLists != null && htiLists.size() > 0 ) {
                 SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 map.put("inspectorOne", iSysUserService.selectUserById(Long.parseLong(htiLists.get(0).getAssignee())).getNickName());
                 map.put("inspectorOneEndTime", sdf2.format(htiLists.get(0).getEndTime()));
@@ -186,8 +186,12 @@ public class TReportHiYlgdController extends BaseController {
                 map.put("approveUser", iSysUserService.selectUserById(Long.parseLong(htiLists.get(4).getAssignee())).getNickName());
                 map.put("approveEndTime", sdf2.format(htiLists.get(4).getEndTime()));
             }
+            String check = "-";
+            if (reportHiYlgd.getCheckDate()!= null) {
+                check = sdf.format(reportHiYlgd.getCheckDate());
+            }
             String pdfName = reportHiYlgd.getPlantCode()
-                    + "-" + sdf.format(reportHiYlgd.getCheckDate())
+                    + "-" + check
                     + "-" + reportHiYlgd.getDevno()
                     + "-压力管道年度检查报告.pdf"
                     .replace(" ", "")

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

@@ -174,7 +174,7 @@ public class TReportHiYlrqController extends BaseController {
             HistoricTaskInstanceQuery htiq = historyService.createHistoricTaskInstanceQuery();
             List<HistoricTaskInstance> htiLists = htiq.processInstanceId(tReportHiYlrq.getApproveId()).finished().orderByHistoricTaskInstanceEndTime().asc().list();
             logger.info("历史任务：" + JSON.toJSONString(htiLists));
-            if (htiLists != null) {
+            if (htiLists != null && htiLists.size() > 0  ) {
                 SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 map.put("inspectorOne", iSysUserService.selectUserById(Long.parseLong(htiLists.get(0).getAssignee())).getNickName());
                 map.put("inspectorOneEndTime", sdf2.format(htiLists.get(0).getEndTime()));
@@ -187,9 +187,13 @@ public class TReportHiYlrqController extends BaseController {
                 map.put("approveUser", iSysUserService.selectUserById(Long.parseLong(htiLists.get(4).getAssignee())).getNickName());
                 map.put("approveEndTime", sdf2.format(htiLists.get(4).getEndTime()));
             }
-            String pdfName = reportYlrq.getPlantCode()
-                    + "-" + sdf.format(reportYlrq.getCheckDate())
-                    + "-" + reportYlrq.getDevno()
+            String check = "-";
+            if (tReportHiYlrq.getCheckDate()!= null) {
+                check = sdf.format(tReportHiYlrq.getCheckDate());
+            }
+            String pdfName = tReportHiYlrq.getPlantCode()
+                    + "-" + check
+                    + "-" + tReportHiYlrq.getDevno()
                     + "-压力容器年度检查报告.pdf"
                     .replace(" ", "")
                     .replace("\\s", "")

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

@@ -204,6 +204,8 @@ public class TSpecdevDtController extends BaseController
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
                     }  else if (j == 16) {
+                        entity.setPerTestConclusion(cellValue);//备注
+                    } else if (j == 17) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 17) {
                         for (SysDept d : dept) {

master/src/main/java/com/ruoyi/project/sems/domain/TReportHiYlgd.java

@@ -132,6 +132,7 @@ public class TReportHiYlgd extends BaseEntity
     private String con;
 
     /** 生成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date buildDate;
 
     /** 审批bussinessykey */

master/src/main/java/com/ruoyi/project/sems/domain/TReportHiYlrq.java

@@ -180,6 +180,7 @@ public class TReportHiYlrq extends BaseEntity
     private String con;
 
     /** 生成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date buildDate;
 
     /** 审批bussinessykey */

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevCc.java

@@ -123,16 +123,16 @@ public class TSpecdevCc extends BaseEntity
     @Excel(name = "报告编号")
     private String reportNo;
 
-    /** 定期检验结论 */
-    @Excel(name = "定期检验结论")
-    private String perTestConclusion;
+
 
     /** 资产归属形式 */
     @Excel(name = "资产归属形式")
     private String assetOwner;
-
+    /** 定期检验结论 */
+    @Excel(name = "定期检验结论")
+    private String perTestConclusion;
     /** 备注 */
-    //@Excel(name = "备注")
+    @Excel(name = "备注")
     private String remarks;
 
     /** 设备位号 */

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevDt.java

@@ -94,17 +94,17 @@ public class TSpecdevDt extends BaseEntity
     @Excel(name = "报告编号")
     private String reportNo;
 
-    /** 定期检验结论 */
-    @Excel(name = "定期检验结论")
-    private String perTestConclusion;
+
 
     /** 下次年检时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "下次检验日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date nextWarnDate;
-
+    /** 定期检验结论 */
+    @Excel(name = "定期检验结论")
+    private String perTestConclusion;
     /** 备注 */
-    //@Excel(name = "备注")
+    @Excel(name = "备注")
     private String remarks;
 
     /** 设备位号 */

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevYlrq.java

@@ -162,7 +162,7 @@ public class TSpecdevYlrq extends BaseEntity
     private String yearReportNo;
 
     /** 备注 */
-    //@Excel(name = "备注")
+    @Excel(name = "备注")
     private String remarks;
 
     /** 状态 1 ：正常 ；0：删除 */

master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /data/cpmsfile/uploadPath）
-  profile: /data/cpmsfile/uploadPath
+  profile: D:/ruoyi/uploadPath
   # 邮件中链接跳转路径 示例（本地：http://localhost/#，服务器：http://47.114.101.16:8080/cpms/index.html#）
   requestJumpPath: https://cpms.basf-ypc.net.cn/cpms/index.html#
   # 获取ip地址开关

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

@@ -317,7 +317,7 @@
 				</td>
 				<td colspan="2" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:110pt">
 					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">${reportHiYlgd.safeClass}</span>
+						<span style="font-family:SimSun; font-size:11pt"><#if reportHiYlgd.safeClass??>${reportHiYlgd.safeClass}</#if></span>
 					</p>
 				</td>
 				<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:70pt">

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

@@ -309,7 +309,7 @@
 				</td>
 				<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:110pt">
 					<p style="margin:0pt; text-align:center">
-						<span style="font-family:SimSun; font-size:11pt">${reportHiYlrq.safeClass}</span>
+						<span style="font-family:SimSun; font-size:11pt"><#if reportHiYlrq.safeClass??>${reportHiYlrq.safeClass}</#if></span>
 					</p>
 				</td>
 				<td colspan="6" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:70pt">

ui/.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # CPMS管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://47.114.101.16:8090'
+#VUE_APP_BASE_API = 'http://47.114.101.16:8090'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ui/src/views/sems/specDt/bf.vue

@@ -94,12 +94,13 @@
 
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
               <template slot-scope="scope">

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

@@ -140,12 +140,13 @@
 
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100"  sortable="custom">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">

ui/src/views/sems/specDt/specDt-hisReform.vue

@@ -27,12 +27,13 @@
 
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('创建时间')" align="center" prop="createdate" width="100">
         <template slot-scope="scope">

ui/src/views/sems/specDt/ty.vue

@@ -139,12 +139,13 @@
 
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">

ui/src/views/sems/specDt/zx.vue

@@ -94,12 +94,13 @@
 
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
               <template slot-scope="scope">