浏览代码

PSSR氮气置换新增“露点”、“露点标准值”字段,加自动合格判断,根据露点数据或者氧含量标准判断是否合格

wangggziwen 7 月之前
父节点
当前提交
4b4b74c3f6

+ 35 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.pssr.controller;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 import com.ruoyi.project.pssr.domain.TPssrApprove;
@@ -93,9 +94,42 @@ public class TPssrNitrogenController extends BaseController
     public AjaxResult add(@RequestBody TPssrNitrogen tPssrNitrogen)
     {
         tPssrNitrogen.setApproveStatus(0L);
+        this.verifySatndard(tPssrNitrogen);
         return toAjax(tPssrNitrogenService.insertTPssrNitrogen(tPssrNitrogen));
     }
 
+    /**
+     * 验证氧气/露点是否合格
+     * @param tPssrNitrogen
+     */
+    private void verifySatndard(TPssrNitrogen tPssrNitrogen) {
+        String oxygen = tPssrNitrogen.getOxygen();
+        String dewPoint = tPssrNitrogen.getDewPoint();
+        String dewPointValue = tPssrNitrogen.getDewPointValue();
+        String standard = "";
+        if (!"".equals(oxygen) && !"".equals(dewPoint)) {//判断氧气+露点
+            if (new BigDecimal(oxygen).compareTo(new BigDecimal(0.2)) == -1
+                    && new BigDecimal(dewPoint).compareTo(new BigDecimal(dewPointValue)) == -1) {
+                standard = "是";
+            } else {
+                standard = "否";
+            }
+        } else if (!"".equals(oxygen) && "".equals(dewPoint)) {//判断氧气
+            if (new BigDecimal(oxygen).compareTo(new BigDecimal(0.2)) == -1) {
+                standard = "是";
+            } else {
+                standard = "否";
+            }
+        } else if (!"".equals(dewPoint) && "".equals(oxygen)) {//判断露点
+            if (new BigDecimal(dewPoint).compareTo(new BigDecimal(dewPointValue)) == -1) {
+                standard = "是";
+            } else {
+                standard = "否";
+            }
+        }
+        tPssrNitrogen.setStandard(standard);
+    }
+
     /**
      * 修改系统氮气置换
      */
@@ -104,6 +138,7 @@ public class TPssrNitrogenController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrNitrogen tPssrNitrogen)
     {
+        this.verifySatndard(tPssrNitrogen);
         return toAjax(tPssrNitrogenService.updateTPssrNitrogen(tPssrNitrogen));
     }
 

+ 26 - 2
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrNitrogen.java

@@ -45,8 +45,8 @@ public class TPssrNitrogen extends BaseEntity
     @Excel(name = "氧气")
     private String oxygen;
 
-    /** 步骤状态 */
-    @Excel(name = "步骤状态")
+    /** 合格(是/否) */
+    @Excel(name = "合格(是/否)")
     private String standard;
 
     /** 确认人1 */
@@ -107,6 +107,30 @@ public class TPssrNitrogen extends BaseEntity
     private String confirm1Name;
     private String confirm2Name;
 
+    /** 露点 */
+    @Excel(name = "露点")
+    private String dewPoint;
+
+    /** 露点标准值 */
+    @Excel(name = "露点标准值")
+    private String dewPointValue;
+
+    public String getDewPoint() {
+        return dewPoint;
+    }
+
+    public void setDewPoint(String dewPoint) {
+        this.dewPoint = dewPoint;
+    }
+
+    public String getDewPointValue() {
+        return dewPointValue;
+    }
+
+    public void setDewPointValue(String dewPointValue) {
+        this.dewPointValue = dewPointValue;
+    }
+
     public String getConfirm1Name() {
         return confirm1Name;
     }

+ 11 - 1
master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml

@@ -27,10 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="confirm1Name"    column="confirm1_name"    />
         <result property="confirm2Name"    column="confirm2_name"    />
+        <result property="dewPoint"    column="dew_point"    />
+        <result property="dewPointValue"    column="dew_point_value"    />
     </resultMap>
 
     <sql id="selectTPssrNitrogenVo">
-        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.system_name, d.sampling_date, d.sample_name, d.oxygen, d.standard, d.confirm1, d.confirm2, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_nitrogen d
+        select d.id, d.dew_point, d.dew_point_value, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.system_name, d.sampling_date, d.sample_name, d.oxygen, d.standard, d.confirm1, d.confirm2, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_nitrogen d
       left join sys_dept s on s.dept_id = d.dept_id
       left join sys_user u1 on u1.user_id = d.CONFIRM1
       left join sys_user u2 on u2.user_id = d.CONFIRM2
@@ -56,6 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="dewPoint != null "> and dew_point = #{dewPoint}</if>
+            <if test="dewPointValue != null "> and dew_point_value = #{dewPointValue}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -92,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
             <if test="approveStatus != null">approve_status,</if>
+            <if test="dewPoint != null">dew_point,</if>
+            <if test="dewPointValue != null">dew_point_value,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -113,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="dewPoint != null">#{dewPoint},</if>
+            <if test="dewPointValue != null">#{dewPointValue},</if>
          </trim>
     </insert>
 
@@ -137,6 +145,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="dewPoint != null">dew_point = #{dewPoint},</if>
+            <if test="dewPointValue != null">dew_point_value = #{dewPointValue},</if>
         </trim>
         where id = #{id}
     </update>

+ 11 - 3
ui/src/views/pssr/nitrogen/index.vue

@@ -136,6 +136,8 @@
       <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">
         <template slot-scope="scope">
@@ -204,10 +206,16 @@
         <el-form-item label="氧气" prop="oxygen">
           <el-input v-model="form.oxygen" placeholder="请输入氧气"/>
         </el-form-item>
-        <el-form-item label="合格" prop="standard">
-          <el-radio label="是" v-model="form.standard">是</el-radio>
-          <el-radio label="否" v-model="form.standard">否</el-radio>
+        <el-form-item label="露点" prop="dewPoint">
+          <el-input v-model="form.dewPoint" placeholder="请输入露点"/>
         </el-form-item>
+        <el-form-item label="露点标准值" prop="dewPointValue">
+          <el-input v-model="form.dewPointValue" placeholder="请输入露点标准值"/>
+        </el-form-item>
+        <!--<el-form-item label="合格" prop="standard">-->
+          <!--<el-radio label="是" v-model="form.standard">是</el-radio>-->
+          <!--<el-radio label="否" v-model="form.standard">否</el-radio>-->
+        <!--</el-form-item>-->
         <el-form-item label="确认人1" prop="confirm1">
           <el-select v-model="form.confirm1" filterable placeholder="请选择确认人2">
             <el-option v-for="user in userOptions"