Merge branch 'master' of http://192.168.101.10:13000/gogs/zhaoshangyinzi

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

@@ -56,7 +56,7 @@ public class BmProjectReferralServiceImpl implements IBmProjectReferralService
     public int insertBmProjectReferral(BmProjectReferral bmProjectReferral)
     {
         bmProjectReferral.setCreateTime(DateUtils.getNowDate());
-        //bmProjectReferral.setCreateBy(SecurityUtils.getUsername());
+        bmProjectReferral.setCreateBy(SecurityUtils.getUsername());
         return bmProjectReferralMapper.insertBmProjectReferral(bmProjectReferral);
     }
 
@@ -70,7 +70,7 @@ public class BmProjectReferralServiceImpl implements IBmProjectReferralService
     public int updateBmProjectReferral(BmProjectReferral bmProjectReferral)
     {
         bmProjectReferral.setUpdateTime(DateUtils.getNowDate());
-        //bmProjectReferral.setUpdateBy(SecurityUtils.getUsername());
+        bmProjectReferral.setUpdateBy(SecurityUtils.getUsername());
         return bmProjectReferralMapper.updateBmProjectReferral(bmProjectReferral);
     }
 

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
+		order by u.create_time DESC
 	</select>
 	
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idcardFront != null  and idcardFront != ''"> and idcard_front = #{idcardFront}</if>
             <if test="idcardBack != null  and idcardBack != ''"> and idcard_back = #{idcardBack}</if>
         </where>
-
+        order by create_time DESC
     </select>
     
     <select id="selectBmCompanyShareholderById" parameterType="Long" resultMap="BmCompanyShareholderResult">

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

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="eqType != null  and eqType != ''"> and e.eq_type = #{eqType}</if>
             <if test="photo != null  and photo != ''"> and e.photo = #{photo}</if>
         </where>
+        order by e.create_time DESC
     </select>
     
     <select id="selectBmConstructionEqById" parameterType="Long" resultMap="BmConstructionEqResult">

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

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="statisticsDate != null "> and statistics_date = #{statisticsDate}</if>
             <if test="statisticsPhoto != null  and statisticsPhoto != ''"> and statistics_photo = #{statisticsPhoto}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectBmConstructionPayInfoById" parameterType="Long" resultMap="BmConstructionPayInfoResult">

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

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payForMoney != null"> and p.pay_for_money = #{payForMoney}</if>
             <if test="photo != null  and photo != ''"> and p.photo = #{photo}</if>
         </where>
+        order by p.create_time DESC
     </select>
     
     <select id="selectBmConstructionPayById" parameterType="Long" resultMap="BmConstructionPayResult">

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rateType != null  and rateType != ''"> and r.rate_type = #{rateType}</if>
             <if test="photo != null  and photo != ''"> and r.photo = #{photo}</if>
         </where>
+        order by r.create_time DESC
     </select>
     
     <select id="selectBmConstructionRateById" parameterType="Long" resultMap="BmConstructionRateResult">

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="targetArrivalAmount != null "> and target_arrival_amount = #{targetArrivalAmount}</if>
             <if test="targetInvestmentNum != null "> and target_investment_num = #{targetInvestmentNum}</if>
         </where>
+        order by p.create_time DESC
     </select>
 
     <select id="selectBmDeptPlanById" parameterType="Long" resultMap="BmDeptPlanResult">

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

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="constructionDoc != null  and constructionDoc != ''"> and construction_doc = #{constructionDoc}</if>
             <if test="constructionPhoto != null  and constructionPhoto != ''"> and construction_photo = #{constructionPhoto}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectBmProjectConstructionById" parameterType="Long" resultMap="BmProjectConstructionResult">

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

@@ -28,12 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             is_del = '0'
             <if test="isDel != null "> and is_del = #{isDel}</if>
+            <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
             <if test="companyAddress != null  and companyAddress != ''"> and company_address = #{companyAddress}</if>
             <if test="companyLegal != null  and companyLegal != ''"> and company_legal = #{companyLegal}</if>
             <if test="companyCode != null  and companyCode != ''"> and company_code = #{companyCode}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectBmProjectInvestorById" parameterType="Long" resultMap="BmProjectInvestorResult">

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

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idcode != null  and idcode != ''"> and idcode = #{idcode}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectBmProjectPersionById" parameterType="Long" resultMap="BmProjectPersionResult">

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

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isOk != null  and isOk != ''"> and is_ok = #{isOk}</if>
             <if test="okDate != null "> and ok_date = #{okDate}</if>
         </where>
+        order by create_time DESC
     </select>
     
     <select id="selectBmProjectProductById" parameterType="Long" resultMap="BmProjectProductResult">