人大金仓适配

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -1525,7 +1525,7 @@
                   and update_date >=
                       #{startTime} and  #{endTime} >=  update_date
                 <if test="orgCode != null and orgCode != ''">
-                    and wes.biz_org_code like concat(#{orgCode}, "%")
+                    and wes.biz_org_code like concat(#{orgCode}, '%')
                 </if>
             ) as allNum,
             (
@@ -1539,7 +1539,7 @@
                         where
                             wed.code like '92010800%'
                         <if test="orgCode != null and orgCode != ''">
-                            and wes.biz_org_code like concat(#{orgCode}, "%")
+                            and wes.biz_org_code like concat(#{orgCode}, '%')
                         </if>
                         ) as allEqu) as allEqu,
             (
@@ -1558,7 +1558,7 @@
                           and wesi.update_date >=
                               #{startTime} and  #{endTime} >=  update_date
                                 <if test="orgCode != null and orgCode != ''">
-                                    and wes.biz_org_code like concat(#{orgCode}, "%")
+                                    and wes.biz_org_code like concat(#{orgCode}, '%')
                                 </if>
                     ) as startNum) as startNum
     </select>     

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/DealerReviewMapper.xml

@@ -44,7 +44,7 @@
             </if>
 
         </where>
-        ORDER BY u.audit_status ,u.rec_date DESC
+        ORDER BY u.audit_status ,u.rec_date DESC,u.sequence_nbr DESC
 
 
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PersonnelBusinessMapper.xml

@@ -39,7 +39,7 @@
             and std_user_biz.amos_user_name  like concat(concat('%',#{dto.amosUserName}),'%')
         </if>
         <if test="dto.amosUnitOrgCode!=null">
-            and hygf_personnel_business.amos_unit_org_code like concat(concat(#{dto.amosUnitOrgCode}),"%")
+            and hygf_personnel_business.amos_unit_org_code like concat(concat(#{dto.amosUnitOrgCode}),'%')
         </if>
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationMapper">
 <select id="queryPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto">
-    select * from (select
+    select * from (select DISTINCT
     hygf_power_station.*,
     b.initiate_status,
     b.contract_lock_id,
@@ -33,7 +33,7 @@
     <if test="processStatus != null and processStatus != ''">
         and hygf_power_station.process_status = #{processStatus}
     </if>
-    GROUP BY hygf_peasant_household.sequence_nbr
+<!--    GROUP BY hygf_peasant_household.sequence_nbr-->
     ORDER BY hygf_power_station.rec_date desc
     ) a
 </select>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml

@@ -41,7 +41,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
     </select>
 
     <select id="preparationStation" resultType="java.util.Map">
-       select b.* from (   select
+       select b.* from (   select DISTINCT
         hygf_peasant_household.peasant_household_no as peasantHouseholdNo,
         hygf_peasant_household.owners_name as ownersName,
         hygf_peasant_household.regional_companies_name as regionalCompaniesName,
@@ -81,7 +81,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
             and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not null and preparation_money_state != ''
         </if>
         </where>
-        GROUP BY  hygf_peasant_household.sequence_nbr
+<!--        GROUP BY  hygf_peasant_household.sequence_nbr-->
         <if test=" preparationMoneyState == 1 ">
             order by hygf_preparation_money.delivery_time  DESC
        </if>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/ToDoTasksMapper.xml

@@ -17,7 +17,7 @@
     and privilege_user_org_role.ROLE_SEQ=#{roleId}
 
     <if test="orgCode!=null">
-        and    privilege_company.ORG_CODE   like concat(#{orgCode},"%")
+        and    privilege_company.ORG_CODE   like concat(#{orgCode},'%')
     </if>
      ORDER BY  privilege_agency_user.USER_ID DESC
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/UnitInfoMapper.xml

@@ -26,7 +26,7 @@ from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
                 and privilege_company.COMPANY_TYPE=#{dto.companyType}
             </if>
             <if test="dto.orgCode!=null">
-                and privilege_company.ORG_CODE like concat(concat(#{dto.orgCode}),"%")
+                and privilege_company.ORG_CODE like concat(concat(#{dto.orgCode}),'%')
             </if>
             <if test="dto.comid!=null">
                 and privilege_company.SEQUENCE_NBR !=#{dto.comid}