ly sems report fix bug

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

@@ -324,10 +324,10 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         ) {
             TSpecdevYlrq d = tSpecdevYlrqMapper.selectTSpecdevYlrqById(t.getId());
             String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
-            if (re != null) {
+            if (re == null) {
                 re = checkRemarks(d.getRemarks() + d.getRemarks2());//备注超期
             }
-            d.setRemarks(re);
+            t.setRemarks(re);
         }
         numArr.add(ylrqList.size());
         logger.info(JSON.toJSONString(ylrqList));
@@ -448,6 +448,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
     }
 
     private String checkRemarks(String input) {
+        logger.info("checkRemarks包含 '" + input + "'================");
         String[] keywords = {"报告未到", "已检等待报告", "等待报告", "已检"};
         for (String keyword : keywords) {
             if (input.contains(keyword)) {
@@ -459,13 +460,13 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
     }
 
     private String checkApproveStatus(Long approveStatus) {
-        if (approveStatus == 2) {
+        if (approveStatus == 2l) {
             return "停用申请中";
         }
-        if (approveStatus == 3) {
+        if (approveStatus == 3l) {
             return "报废申请中";
         }
-        if (approveStatus == -1) {
+        if (approveStatus == -1l) {
             return "注销申请中";
         }
         return null;

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

@@ -123,37 +123,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectExpriedYlrqHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_YLRQ
-        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准','报废批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
     <select id="selectExpriedYlgdHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_YLGD
-        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准','报废批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
     <select id="selectExpriedGlHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_GL
-        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准','报废批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
     <select id="selectExpriedDtHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_DT
-        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM')  and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM')  and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准','报废批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
     <select id="selectExpriedDzsbHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_DZSB
-        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准','报废批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
     <select id="selectExpriedCcHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_CC
-        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准','报废批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
 

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

@@ -149,6 +149,16 @@
           v-hasPermi="['pssr:overhaulExchanger:edit']"
         >确认
         </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['pssr:pipe:edit']"
+        >批量操作</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

ui/src/views/sems/approve/tapprove-add.vue

@@ -786,10 +786,11 @@
             addApprove(this.dataForm).then(response => {
               this.msgSuccess(this.$t('新增成功'));
               this.visible = false;
+              this.$emit('refreshDataList')
             });
         }
       });
-      this.$emit('refreshDataList')
+
     },
     handleChange(value) {
       this.showDelay = false

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

@@ -9,7 +9,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>v-if="dataForm == 0"v-if="dataForm == 0"
+      </el-form-item>
       <el-form-item :label="$t('单元')" prop="unit" label-width="50">
         <el-input
           v-model="queryParams.unit"