修改提交审核BUG

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectServiceImpl.java

@@ -216,7 +216,7 @@ public class BmProjectServiceImpl implements IBmProjectService {
                     //提交在建信息审核申请
                     //判断bm_project_construction/bm_construction_rate/bm_construction_eq/bm_construction_pay/bm_construction_payinfo
                     BmProjectConstruction bmProjectConstruction = bmProjectConstructionMapper.selectBmProjectConstructionById(projectId);
-                    BmConstructionRate bmConstructionRate = bmConstructionRateMapper.selectBmConstructionRateById(projectId);
+                    BmConstructionRate bmConstructionRate = bmConstructionRateMapper.selectBmConstructionRateByProjectId(projectId);
                     BmConstructionEq bmConstructionEq = bmConstructionEqMapper.selectBmConstructionEqByProjectId(projectId);
                     BmConstructionPay bmConstructionPay = bmConstructionPayMapper.selectBmConstructionPayByProjectId(projectId);
                     BmConstructionPayInfo bmConstructionPayInfo = bmConstructionPayInfoMapper.selectBmConstructionPayInfoById(projectId);

ruoyi-system/src/main/resources/mapper/system/project/BmCompanyShareholderMapper.xml

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmCompanyShareholderByProjectId" parameterType="Long" resultMap="BmCompanyShareholderResult">
         <include refid="selectBmCompanyShareholderVo"/>
-        where bm_project_id = #{id} limit 1
+        where bm_project_id = #{id} and is_del = '0' limit 1
     </select>
         
     <insert id="insertBmCompanyShareholder" parameterType="BmCompanyShareholder" useGeneratedKeys="true" keyProperty="id">

ruoyi-system/src/main/resources/mapper/system/project/BmConstructionEqMapper.xml

@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.dict_label as eqTypeName
         FROM
         bm_construction_eq e
-        LEFT JOIN sys_dict_data d on e.eq_type = d.dict_value and d.dict_type = 'project_schedule'
+        LEFT JOIN sys_dict_data d on e.eq_type = d.dict_value and d.dict_type = 'project_schedule' and e.is_del = '0'
         where e.bm_project_id = #{projectId} limit 1
     </select>
         

ruoyi-system/src/main/resources/mapper/system/project/BmConstructionPayInfoMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectBmConstructionPayInfoById" parameterType="Long" resultMap="BmConstructionPayInfoResult">
         <include refid="selectBmConstructionPayInfoVo"/>
-        where bm_project_id = #{id} limit 1
+        where bm_project_id = #{id} and is_del = '0' limit 1
     </select>
         
     <insert id="insertBmConstructionPayInfo" parameterType="BmConstructionPayInfo" useGeneratedKeys="true" keyProperty="id">

ruoyi-system/src/main/resources/mapper/system/project/BmConstructionPayMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBmConstructionPayByProjectId" parameterType="Long" resultMap="BmConstructionPayResult">
         select p.id, p.bm_project_id, p.create_by, p.create_time, p.update_by, p.update_time, p.is_del, p.pay_for_type, p.pay_for_money,  p.photo, d.dict_label as payForTypeName
         from bm_construction_pay p
-        left join sys_dict_data d on p.pay_for_type = d.dict_value and d.dict_type = 'project_pay'
+        left join sys_dict_data d on p.pay_for_type = d.dict_value and d.dict_type = 'project_pay' and p.is_del = '0'
         where p.bm_project_id = #{project}
     </select>
         

ruoyi-system/src/main/resources/mapper/system/project/BmConstructionRateMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBmConstructionRateByProjectId" parameterType="Long" resultMap="BmConstructionRateResult">
         select r.id, r.bm_project_id, r.create_by, r.create_time, r.update_by, r.update_time, r.is_del, r.rate_type, r.photo, d.dict_label as rateTypeName
         from bm_construction_rate r
-        left join sys_dict_data d on r.rate_type = d.dict_value and d.dict_type = 'project_rate'
+        left join sys_dict_data d on r.rate_type = d.dict_value and d.dict_type = 'project_rate' and r.is_del = '0'
         where r.bm_project_id = #{projectId} limit 1
     </select>
         

ruoyi-system/src/main/resources/mapper/system/project/BmProjectConstructionMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBmProjectConstructionById" parameterType="Long" resultMap="BmProjectConstructionResult">
       select c.id, c.bm_project_id, c.create_by, c.create_time, c.update_by, c.update_time, c.is_del, c.construction_code, c.is_construction, c.construction_startdate, c.construction_enddate, c.construction_doc, c.construction_photo, p.order_begin_time, p.order_end_time
       from bm_project_construction c
-      left join bm_project p on c.bm_project_id = p.id
+      left join bm_project p on c.bm_project_id = p.id and p.is_del = '0'
       where c.bm_project_id = #{id} limit 1
     </select>
         

ruoyi-system/src/main/resources/mapper/system/project/BmProjectInvestorMapper.xml

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmProjectInvestorByProjectId" parameterType="Long" resultMap="BmProjectInvestorResult">
         <include refid="selectBmProjectInvestorVo"/>
-        where bm_project_id = #{id} limit 1
+        where bm_project_id = #{id} and is_del = '0' limit 1
     </select>
 
 

ruoyi-system/src/main/resources/mapper/system/project/BmProjectOrderinfoMapper.xml

@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectBmProjectOrderinfoById" parameterType="Long" resultMap="BmProjectOrderinfoResult">
         <include refid="selectBmProjectOrderinfoVo"/>
-        where bm_project_id = #{id} limit 1
+        where bm_project_id = #{id} and is_del = '0' limit 1
     </select>
         
     <insert id="insertBmProjectOrderinfo" parameterType="BmProjectOrderinfo" useGeneratedKeys="true" keyProperty="id">

ruoyi-system/src/main/resources/mapper/system/project/BmProjectPersionMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmProjectPersionByProjectId" parameterType="Long" resultMap="BmProjectPersionResult">
         <include refid="selectBmProjectPersionVo"/>
-        where bm_project_id = #{id} limit 1
+        where bm_project_id = #{id} and is_del = '0' limit 1
     </select>
         
     <insert id="insertBmProjectPersion" parameterType="BmProjectPersion" useGeneratedKeys="true" keyProperty="id">

ruoyi-system/src/main/resources/mapper/system/project/BmProjectProductMapper.xml

@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectBmProjectProductById" parameterType="Long" resultMap="BmProjectProductResult">
         <include refid="selectBmProjectProductVo"/>
-        where bm_project_id = #{id} limit 1
+        where bm_project_id = #{id} and is_del = '0' limit 1
     </select>
         
     <insert id="insertBmProjectProduct" parameterType="BmProjectProduct" useGeneratedKeys="true" keyProperty="id">