- PSSR安全设施爆破片导入

- PSSR安全设施呼吸阀导入
- PSSR安全设施泄放阀导入
- PSSR安全设施爆破片日期格式修改
- PSSR安全设施呼吸阀日期格式修改
- PSSR安全设施泄放阀日期格式修改

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

@@ -94,28 +94,30 @@ public class TPssrSafetyBrustController extends BaseController {
                     String cellValue = ExcelUtils.getCellValue(cell);
                     logger.info("cellValue:" + cellValue);
                     if (j == 0) {
-                        entity.setDevNo(cellValue);
+                        entity.setUnit(cellValue);
                     } else if (j == 1) {
-                        entity.setSafetyDev(cellValue);
+                        entity.setDevNo(cellValue);
                     } else if (j == 2) {
-                        entity.setInstallLocation(cellValue);
+                        entity.setSafetyDev(cellValue);
                     } else if (j == 3) {
                         entity.setInstallLocation(cellValue);
                     } else if (j == 4) {
                         entity.setInstallAccuracy(cellValue);
                     } else if (j == 5) {
-                        entity.setPutUse(cellValue);
+                        entity.setRightDirection(cellValue);
                     } else if (j == 6) {
-                        entity.setSetPressure(cellValue);
+                        entity.setPutUse(cellValue);
                     } else if (j == 7) {
-                        entity.setUniformPressure(cellValue);
+                        entity.setSetPressure(cellValue);
                     } else if (j == 8) {
-                        entity.setIs0kpa(cellValue);
+                        entity.setUniformPressure(cellValue);
                     } else if (j == 9) {
+                        entity.setIs0kpa(cellValue);
+                    } else if (j == 10) {
                         if (cellValue.length() > 3) {
                             entity.setConfirmationTime(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 10) {
+                    } else if (j == 11) {
                         entity.setRemarks(cellValue);
                     }
                 }

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBleed.java

@@ -76,6 +76,7 @@ public class TPssrSafetyBleed extends BaseEntity
 
     /** 时间 */
     @Excel(name = "时间")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date confirmationTime;
 
     /** 删除状态 */

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBreath.java

@@ -76,6 +76,7 @@ public class TPssrSafetyBreath extends BaseEntity
 
     /** 时间 */
     @Excel(name = "时间")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date confirmationTime;
 
     /** 删除状态 */

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBrust.java

@@ -76,6 +76,7 @@ public class TPssrSafetyBrust extends BaseEntity
 
     /** 检查日期 */
     @Excel(name = "检查日期")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date confirmationTime;
 
     /** 删除状态 */

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

@@ -172,7 +172,7 @@
       </el-table-column>
       <el-table-column label="时间" align="center" prop="confirmationTime" :show-overflow-tooltip="true" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.confirmationTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>

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

@@ -172,7 +172,7 @@
       </el-table-column>
       <el-table-column label="时间" align="center" prop="confirmationTime" :show-overflow-tooltip="true" width="120">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.confirmationTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>

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

@@ -172,7 +172,7 @@
       <el-table-column label="检查日期" align="center" prop="confirmationTime" :show-overflow-tooltip="true"
                        width="120">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.confirmationTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>