PSSR审批与巡检功能更新

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

@@ -62,6 +62,8 @@ public class TPssrAboveallController extends BaseController {
 
     @Autowired
     private ITPssrPowerService tPssrPowerService;
+    @Autowired
+    private TPssrApproveController tPssrApproveController;
 
     /**
      * 查询PSSR列表
@@ -153,6 +155,18 @@ public class TPssrAboveallController extends BaseController {
                         for (TPssrPatrol pssrPatrol : tPssrPatrols) {
                             tPssrPatrolService.insertTPssrPatrol(pssrPatrol, userId);
                         }
+
+                        TPssrPatrol query = new TPssrPatrol();
+                        query.setSubId(subcontent.getId());
+                        boolean flag = true;
+                        for (TPssrPatrol patrol : tPssrPatrolService.selectTPssrPatrolList(query)) {
+                            if (patrol.getApproveStatus()!=2){
+                                flag = false;
+                            }
+                        }
+                        if (flag){
+                            tPssrApproveController.doApprove(subcontent.getId());
+                        }
                     } else if (subcontent.getForShort().equals("txjk")) {
                         List<TPssrPatrol> tPssrPatrols = new ArrayList<>();
 //                        PAGA系统检查记录,10
@@ -162,6 +176,18 @@ public class TPssrAboveallController extends BaseController {
                         for (TPssrPatrol pssrPatrol : tPssrPatrols) {
                             tPssrPatrolService.insertTPssrPatrol(pssrPatrol, userId);
                         }
+
+                        TPssrPatrol query = new TPssrPatrol();
+                        query.setSubId(subcontent.getId());
+                        boolean flag = true;
+                        for (TPssrPatrol patrol : tPssrPatrolService.selectTPssrPatrolList(query)) {
+                            if (patrol.getApproveStatus()!=2){
+                                flag = false;
+                            }
+                        }
+                        if (flag){
+                            tPssrApproveController.doApprove(subcontent.getId());
+                        }
                     } else if (subcontent.getForShort().equals("bxsjcy")) {
                         List<TPssrPatrol> tPssrPatrols = new ArrayList<>();
 //                        四合一/苯系物/硫化氢/二氧化碳/射线一氧化碳检测仪检查记录,18
@@ -169,6 +195,18 @@ public class TPssrAboveallController extends BaseController {
                         for (TPssrPatrol pssrPatrol : tPssrPatrols) {
                             tPssrPatrolService.insertTPssrPatrol(pssrPatrol, userId);
                         }
+
+                        TPssrPatrol query = new TPssrPatrol();
+                        query.setSubId(subcontent.getId());
+                        boolean flag = true;
+                        for (TPssrPatrol patrol : tPssrPatrolService.selectTPssrPatrolList(query)) {
+                            if (patrol.getApproveStatus()!=2){
+                                flag = false;
+                            }
+                        }
+                        if (flag){
+                            tPssrApproveController.doApprove(subcontent.getId());
+                        }
                     } else if (subcontent.getForShort().equals("yfl")) {
                         genYfl(subcontent.getId(), userId);
                     } else if (subcontent.getForShort().equals("aqss")) {
@@ -188,6 +226,8 @@ public class TPssrAboveallController extends BaseController {
         return AjaxResult.success();
     }
 
+
+
     /**
      * 生成临时电源数据
      */

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

@@ -47,6 +47,9 @@ public class TPssrPatrolController extends BaseController {
     public TableDataInfo list(TPssrPatrol tPssrPatrol) {
         startPage();
         List<TPssrPatrol> list = tPssrPatrolService.selectTPssrPatrolList(tPssrPatrol);
+        list.forEach(item->{
+            item.setPlanName(tPatrolPlanService.selectTPatrolPlanById(item.getPlanId()).getPlanName());
+        });
         return getDataTable(list);
     }
 

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

@@ -36,7 +36,7 @@ public class TPssrNitrogen extends BaseEntity
 
     /** 采样日期 */
     @Excel(name = "采样日期")
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" , timezone = "GMT+8")
     private Date samplingDate;
 
     /** 样品名称 */

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

@@ -37,6 +37,7 @@ public class TPssrPatrol extends BaseEntity
     /** 巡检类型 */
     @Excel(name = "巡检类型")
     private Long planType;
+    private String planName;
 
     /** 巡检状态 */
     @Excel(name = "巡检状态")
@@ -100,6 +101,14 @@ public class TPssrPatrol extends BaseEntity
 
     private String reason;
 
+    public String getPlanName() {
+        return planName;
+    }
+
+    public void setPlanName(String planName) {
+        this.planName = planName;
+    }
+
     public String getReason() {
         return reason;
     }

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrPatrolServiceImpl.java

@@ -75,6 +75,7 @@ public class TPssrPatrolServiceImpl implements ITPssrPatrolService {
             TPatrolPlan plan = tPatrolPlans.get(0);
             planId = plan.getId();
             approveStatus = plan.getStatus() == 1 ? 2L : 0L;
+            tPssrPatrol.setConfirmer(plan.getConfirmed());
         } else {
             //否则生成新的临时计划
             tPatrolPlan.setPlanName(getPlanName(tPssrPatrol.getPlanType().toString(), calendar));

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

@@ -132,30 +132,30 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="系统名称" align="center" prop="systemName" :show-overflow-tooltip="true"/>
-      <el-table-column label="采样日期" align="center" prop="samplingDate" :show-overflow-tooltip="true"/>
-      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true"/>
-      <el-table-column label="氧气（%vol）" align="center" prop="oxygen" :show-overflow-tooltip="true"/>
-      <el-table-column label="露点" align="center" prop="dewPoint" :show-overflow-tooltip="true"/>
-      <el-table-column label="露点标准值" align="center" prop="dewPointValue" :show-overflow-tooltip="true"/>
-      <el-table-column label="合格（是/否）" align="center" prop="standard" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true">
+      <el-table-column label="系统名称" align="center" prop="systemName" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="采样日期" align="center" prop="samplingDate" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="氧气（%vol）" align="center" prop="oxygen" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="露点" align="center" prop="dewPoint" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="露点标准值" align="center" prop="dewPointValue" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="合格（是/否）" align="center" prop="standard" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true" width="150">
         <template slot-scope="scope">
           <span>{{ userFormat(scope.row.confirm1) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true">
+      <el-table-column label="确认人2" align="center" prop="confirm2" :show-overflow-tooltip="true" width="150">
         <template slot-scope="scope">
           <span>{{ userFormat(scope.row.confirm2) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="100">
+      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="130">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true" width="150"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="150"/>
       <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -204,8 +204,9 @@
         <el-form-item label="采样日期" prop="samplingDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.samplingDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd  HH:mm"
+                          type="datetime"
+                          value-format="yyyy-MM-dd  HH:mm"
                           placeholder="选择采样日期">
           </el-date-picker>
         </el-form-item>

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

@@ -295,12 +295,6 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
-
-    <!-- 附件对话框 -->
-    <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="doc.open" append-to-body title="现场照片"
-               width="1000px">
-      <el-image v-for="file in doc.fileList" :key="file.id" :src="file.fileUrl" lazy></el-image>
-    </el-dialog>
   <!-- 驳回原因对话框 -->
     <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="reason.open" append-to-body title="驳回"
                width="1000px">