‘liusuyi’
2024-01-19 345a937081333fd7385550b207593570a062b78a
修复bug
已修改2个文件
55 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -462,36 +462,6 @@
        } else {
            result.put("updateTime", "");
        }
        //if(ardAlarmpointsWell.getGuideP1() != null){
        //    result.put("guideP1",ardAlarmpointsWell.getGuideP1());
        //}else{
        //    result.put("guideP1","");
        //}
        //if(ardAlarmpointsWell.getGuideP2() != null){
        //    result.put("guideP2",ardAlarmpointsWell.getGuideP2());
        //}else{
        //    result.put("guideP2","");
        //}
        //if(ardAlarmpointsWell.getGuideT1() != null){
        //    result.put("guideT1",ardAlarmpointsWell.getGuideT1());
        //}else{
        //    result.put("guideT1","");
        //}
        //if(ardAlarmpointsWell.getGuideT2() != null){
        //    result.put("guideT2",ardAlarmpointsWell.getGuideT2());
        //}else{
        //    result.put("guideT2","");
        //}
        //if(ardAlarmpointsWell.getGuideZ1() != null){
        //    result.put("guideZ1",ardAlarmpointsWell.getGuideZ1());
        //}else{
        //    result.put("guideZ1","");
        //}
        //if(ardAlarmpointsWell.getGuideZ2() != null){
        //    result.put("guideZ2",ardAlarmpointsWell.getGuideZ2());
        //}else{
        //    result.put("guideZ2","");
        //}
        if (config.size() != 0) {
            String oracle = config.get(0).getConfigValue();
            String[] oracleArr = oracle.split(";");
ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
@@ -129,12 +129,7 @@
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="guideP1 != null">guide_p1,</if>
            <if test="guideT1 != null">guide_t1,</if>
            <if test="guideZ1 != null">guide_z1,</if>
            <if test="guideP2 != null">guide_p2,</if>
            <if test="guideT2 != null">guide_t2,</if>
            <if test="guideZ2 != null">guide_z2,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -160,12 +155,6 @@
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="guideP1 != null">#{guideP1},</if>
            <if test="guideT1 != null">#{guideT1},</if>
            <if test="guideZ1 != null">#{guideZ1},</if>
            <if test="guideP2 != null">#{guideP2},</if>
            <if test="guideT2 != null">#{guideT2},</if>
            <if test="guideZ2 != null">#{guideZ2},</if>
        </trim>
    </insert>
@@ -194,12 +183,6 @@
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="guideP1 != null">guide_p1 = #{guideP1},</if>
            <if test="guideT1 != null">guide_t1 = #{guideT1},</if>
            <if test="guideZ1 != null">guide_z1 = #{guideZ1},</if>
            <if test="guideP2 != null">guide_p2 = #{guideP2},</if>
            <if test="guideT2 != null">guide_t2 = #{guideT2},</if>
            <if test="guideZ2 != null">guide_z2 = #{guideZ2},</if>
        </trim>
        where id = #{id}
    </update>
@@ -228,12 +211,6 @@
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="guideP1 != null">guide_p1 = #{guideP1},</if>
            <if test="guideT1 != null">guide_t1 = #{guideT1},</if>
            <if test="guideZ1 != null">guide_z1 = #{guideZ1},</if>
            <if test="guideP2 != null">guide_p2 = #{guideP2},</if>
            <if test="guideT2 != null">guide_t2 = #{guideT2},</if>
            <if test="guideZ2 != null">guide_z2 = #{guideZ2},</if>
        </trim>
        where well_id = #{wellId}
    </update>