Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/IcExportItemListFormDTO.java

@@ -69,5 +69,10 @@ public class IcExportItemListFormDTO implements Serializable {
      */
     private String optionSourceType;
 
+    /**
+     * 是否支持添加（即多对一，eg：需求列表）
+     */
+    private boolean supportAdd;
+
 
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemBaseResult.java

@@ -55,5 +55,10 @@ public class FormItemBaseResult implements Serializable {
      */
     private String optionSourceValue;
 
+    /**
+     * 是否支持添加（即多对一，eg：需求列表）
+     */
+    private boolean supportAdd;
+
 }
 

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -252,6 +252,7 @@
             ifi.OPTION_SOURCE_VALUE,
             ifi.OPTION_SOURCE_TYPE,
             ifig.TABLE_NAME,
+            ifig.SUPPORT_ADD,
             CONCAT(ifi.COLUMN_NAME, if(ifi.COLUMN_NUM = 0, '', ifi.COLUMN_NUM)) columnName
         FROM
             ic_form_item ifi

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -812,6 +812,7 @@
             <if test="idCard != null and idCard != ''">
             AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' )
             </if>
+            ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk)
             ) t
             WHERE
                 1=1
@@ -821,7 +822,7 @@
             <if test="natCount != null">
             AND natCount = #{natCount}
             </if>
-            ORDER BY `NAME`
+
     </select>
     <select id="natList" resultType="com.epmet.dto.result.EpidemicPreventionResultDTO">
         SELECT * FROM