新增发改委审核相关接口

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwShyjServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.fgw.FgwFj;
 import com.ruoyi.system.domain.fgw.FgwJzqk;
 import com.ruoyi.system.domain.fgw.FgwShyj;
@@ -269,15 +270,18 @@ public class FgwShyjServiceImpl implements IFgwShyjService {
             if ("Y".equals(isNt)){
                 String nttz = fgwJzqk.getNttz();
                 fgwXmsb.setNttz(nttz);
-                long ntxmtc = Long.parseLong(fgwXmsb.getNtxmtc());
-                long result = ntxmtc + Long.parseLong(nttz);
-                fgwXmsb.setNtxmtc(String.valueOf(result));
+                String ntxmtc = fgwXmsb.getNtxmtc();
+                if (StringUtils.isNotBlank(ntxmtc)){
+                    long result = Long.parseLong(ntxmtc) + Long.parseLong(nttz);
+                    fgwXmsb.setNtxmtc(String.valueOf(result));
+                }
                 //修改主表状态
                 fgwXmsbMapper.updateFgwXmsbStatus(fgwXmsb);
             }
         } else if (THR.equals(shjg)) {
             fgwJzqk.setIsSh(THR);
         }
+        fgwJzqkMapper.updateFgwJzqk(fgwJzqk);
         fgwShyj.setCreateTime(DateUtils.getNowDate());
         fgwShyj.setDeptId(SecurityUtils.getDeptId());
         fgwShyj.setShrxm(SecurityUtils.getUsername());

ruoyi-system/src/main/resources/mapper/system/fgw/FgwFjMapper.xml

@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="path != null">#{path},</if>
             <if test="type != null">#{type},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="isSh != null and isSh != ''">isSh,</if>
+            <if test="isSh != null and isSh != ''">#{isSh},</if>
 
         </trim>
     </insert>

ruoyi-system/src/main/resources/mapper/system/fgw/FgwXmsbMapper.xml

@@ -336,9 +336,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="njgsj != null">njgsj = #{njgsj},</if>
             <if test="nttz != null">nttz = #{nttz},</if>
             <if test="xmbq != null">xmbq = #{xmbq},</if>
-            <if test="is_js != null">is_js = #{isJs},</if>
+            <if test="isJs != null and isJs != ''">is_js = #{isJs},</if>
             <if test="isWt != null and isWt != ''">is_wt = #{isWt},</if>
-            <if test="wtType != null and wtType != ''">is_js = #{wtType},</if>
+            <if test="wtType != null and wtType != ''">wt_type = #{wtType},</if>
         </trim>
         where id = #{id}
     </update>