LY sems 日志

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

@@ -28,6 +28,8 @@ import com.ruoyi.project.sems.his.controller.TSpechiYlgdController;
 import com.ruoyi.project.sems.his.controller.TSpechiYlrqController;
 import com.ruoyi.project.sems.his.domain.TApproveSpecModify;
 import com.ruoyi.project.sems.his.service.ITApproveSpecModifyService;
+import com.ruoyi.project.sems.mapper.TSpecdevYlgdMapper;
+import com.ruoyi.project.sems.mapper.TSpecdevYlrqMapper;
 import com.ruoyi.project.sems.service.ITSpecCheckService;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
@@ -52,6 +54,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
+
 /**
  * 特种设备压力容器台账Controller
  *
@@ -77,6 +81,8 @@ public class TSpecdevYlrqController extends BaseController {
     private TApproveSpecModifyController approveSpecModifyController;
     @Autowired
     private TSpechiYlrqController tSpechiYlrqController;
+    @Resource
+    private TSpecdevYlrqMapper tSpecdevYlrqMapper;
     /**
      * 查询特种设备压力容器台账列表
      */
@@ -193,6 +199,9 @@ public class TSpecdevYlrqController extends BaseController {
         new Thread(() -> {
             tSpechiYlrqController.addOperLog(String.valueOf(tSpecdevYlrq.getId()),userName,new Date() , "修改" );
         },"特种设备操作日志").start();
+        new Thread(() -> {
+            tSpecdevYlrqMapper.syncReport(tSpecdevYlrq);
+        },"同步年度检查").start();
         return AjaxResult.success();
     }
 

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

@@ -233,6 +233,10 @@ public class TReportYlrq extends TReportHiYlrq
     @Excel(name = "检查结论")
     private String con;
 
+    /** 年检报告编号 */
+    @Excel(name = "年检报告编号")
+    private String yearReportNo;
+
     /** 最新申请时间 */
     private Date approveTime;
 
@@ -290,6 +294,16 @@ public class TReportYlrq extends TReportHiYlrq
         this.approveId = approveId;
     }
 
+    @Override
+    public String getYearReportNo() {
+        return yearReportNo;
+    }
+
+    @Override
+    public void setYearReportNo(String yearReportNo) {
+        this.yearReportNo = yearReportNo;
+    }
+
     @Override
     public Long getReportId() {
         return reportId;

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevYlgdMapper.java

@@ -79,4 +79,6 @@ public interface TSpecdevYlgdMapper extends BaseMapper<TSpecdevYlgd> {
 
 
     void duplicateTSpecdevYlgd();
+
+    void syncReport(String valueOf);
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevYlrqMapper.java

@@ -77,4 +77,6 @@ public interface TSpecdevYlrqMapper extends BaseMapper<TSpecdevYlrq> {
 
 
     void duplicateTSpecdevYlrq();
+
+    void syncReport(TSpecdevYlrq tSpecdevYlrq);
 }

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

@@ -161,6 +161,7 @@
             <if test="nextCheckDate != null">next_check_date = #{nextCheckDate},</if>
             <if test="problem != null">problem = #{problem},</if>
             <if test="con != null">con = #{con},</if>
+            <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
         </trim>
         <!--2023年1月5日修改-->
         <!--由于部分t_report_ylgd.dev_id与t_specdev_ylgd.id不一致，导致update失效-->

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

@@ -66,6 +66,7 @@
         <result property="updaterCode" column="updater_code"/>
         <result property="updatedate" column="updatedate"/>
         <result property="deptName" column="dept_name"/>
+        <result property="yearReportNo" column="year_report_no"/>
     </resultMap>
 
     <sql id="selectTReportYlrqVo">
@@ -79,6 +80,7 @@
                y.useno,
                y.safe_class,
                y.next_warn_date,
+               d.year_report_no,
                d.medium,
                d.des_pressure,
                d.des_temp,
@@ -203,6 +205,7 @@
             <if test="createdate != null">createdate,</if>
             <if test="updaterCode != null">updater_code,</if>
             <if test="updatedate != null">updatedate,</if>
+            <if test="yearReportNo != null">year_report_no,</if>
             pj1,pj2,pj3,pj4,pj5,pj6,pj7,pj8,pj9,pj10,pj11,pj12,pj13,pj14,pj15,pj16,pj17,
             pj18,pj19,pj20,pj21,pj22,pj23,pj24,pj25,pj26,pj27,pj28,pj29,pj30,pj31,pj32,con
         </trim>
@@ -218,6 +221,7 @@
             <if test="createdate != null">#{createdate},</if>
             <if test="updaterCode != null">#{updaterCode},</if>
             <if test="updatedate != null">#{updatedate},</if>
+            <if test="yearReportNo != null">#{yearReportNo},</if>
             <![CDATA[
             '√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','√','1']]>
         </trim>
@@ -236,6 +240,7 @@
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
         </trim>
         where id = #{id}
     </update>
@@ -280,6 +285,7 @@
             <if test="nextCheckDate != null">next_check_date = #{nextCheckDate},</if>
             <if test="problem != null">problem = #{problem},</if>
             <if test="con != null">con = #{con},</if>
+            <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
         </trim>
         where dev_id = (
         select id
@@ -349,6 +355,7 @@
             <if test="createdate != null">createdate,</if>
             <if test="updaterCode != null">updater_code,</if>
             <if test="updatedate != null">updatedate,</if>
+            <if test="yearReportNo != null">year_report_no,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -403,6 +410,7 @@
             <if test="createdate != null">#{createdate},</if>
             <if test="updaterCode != null">#{updaterCode},</if>
             <if test="updatedate != null">#{updatedate},</if>
+            <if test="yearReportNo != null">#{yearReportNo},</if>
         </trim>
     </insert>
 
@@ -460,6 +468,7 @@
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -490,4 +490,6 @@
         --${params.dataScopePlant}
     </select>
 
+
+
 </mapper>

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

@@ -411,5 +411,14 @@
         )
     </update>
 
+    <update id="syncReport" parameterType="TSpecdevYlrq">
+        update t_report_ylrq
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="yearWarnDate != null">year_warn_date = #{yearWarnDate},</if>
+            <if test="yearNextWarnDate != null">year_next_warn_date = #{yearNextWarnDate},</if>
+            <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
+        </trim>
+        where id = #{id}
+    </update>
 
 </mapper>

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

@@ -396,7 +396,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('确认人')" prop="wxjl">
+            <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
                   v-for="dict in wxjlList"

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

@@ -367,7 +367,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('确认人')" prop="wxjl">
+            <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
                   v-for="dict in wxjlList"

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

@@ -422,7 +422,7 @@
         </el-row>
         <el-row>
           <el-col>
-            <el-form-item :label="$t('确认人')" prop="wxjl">
+            <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
                   v-for="dict in wxjlList"

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

@@ -392,7 +392,7 @@
         </el-row>
         <el-row>
           <el-col>
-            <el-form-item :label="$t('确认人')" prop="wxjl">
+            <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
                   v-for="dict in wxjlList"

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

@@ -489,7 +489,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('确认人')" prop="wxjl">
+            <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
                   v-for="dict in wxjlList"

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

@@ -459,7 +459,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('确认人')" prop="wxjl">
+            <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
                   v-for="dict in wxjlList"

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

@@ -626,7 +626,7 @@
         </el-row>
         <el-row>
           <el-col>
-            <el-form-item :label="$t('确认人')" prop="wxjl">
+            <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
                   v-for="dict in wxjlList"

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

@@ -594,7 +594,7 @@
         </el-row>
         <el-row>
           <el-col>
-            <el-form-item :label="$t('确认人')" prop="wxjl">
+            <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
                   v-for="dict in wxjlList"

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

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

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

@@ -558,7 +558,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('确认人')" prop="wxjl">
+            <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
                   v-for="dict in wxjlList"

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

@@ -528,7 +528,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('确认人')" prop="wxjl">
+            <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
                   v-for="dict in wxjlList"