Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/model/TpAnnouncement.java

     @TableField(exist = false)
     private String endCreateDate;
 
+    @TableField(exist = false)
+    private String sortKey;
+
+    @TableField(exist = false)
+    private String sortOrder;
+
 }

src/main/java/com/huiju/estateagents/property/model/TpBuildingOwnerInfo.java

      */
     @TableField(exist = false)
     private Integer index;
+
+    @TableField(exist = false)
+    private String sortKey;
+
+    @TableField(exist = false)
+    private String sortOrder;
 }

src/main/java/com/huiju/estateagents/property/service/impl/BillStatementServiceImpl.java

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.BillInvoiceMapper;
 import com.huiju.estateagents.property.dao.BillStatementMapper;
         String startCreateDate = jsonObject.getString("startCreateDate");
         String endCreateDate = jsonObject.getString("endCreateDate");
 
+        String sortKey = jsonObject.getString("sortKey");
+        String sortOrder = jsonObject.getString("sortOrder");
+
         // 参数
         Map<String, Object> map = Maps.newHashMap();
         map.put("communityId", communityId);
         map.put("payType", payType);
         map.put("startCreateDate", startCreateDate);
         map.put("endCreateDate", endCreateDate);
+        map.put("sortKey",sortKey);
+        if (!StringUtils.isEmpty(sortOrder)){
+            map.put("sortOrder",sortOrder.equals("descend") ? "desc" : "asc");
+        }else {
+            map.put("sortOrder","asc");
+        }
+
 
         Page<TpBillOrder> page = new Page<>();
         page.setCurrent(pageNum);

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

         Long pageNum = jsonObject.getLong("pageNum") == null ? 1 : jsonObject.getLong("pageNum");
         Long pageSize = jsonObject.getLong("pageSize") == null ? 10 : jsonObject.getLong("pageSize");
         tpBuildingOwnerInfo.setVerifyStatus(jsonObject.getString("verifyStatus"));
-
+        tpBuildingOwnerInfo.setSortKey(jsonObject.getString("sortKey"));
+        if (!com.huiju.estateagents.common.StringUtils.isEmpty(jsonObject.getString("sortOrder"))){
+            tpBuildingOwnerInfo.setSortOrder(jsonObject.getString("sortOrder").equals("descend") ? "desc" : "asc");
+        }else {
+            tpBuildingOwnerInfo.setSortOrder("asc");
+        }
         Page page = new Page(pageNum,pageSize);
 
         // 分页查询

src/main/java/com/huiju/estateagents/property/service/impl/TpAnnouncementServiceImpl.java

         tpAnnouncement.setStartCreateDate(jsonobject.getString("startCreateDate"));
         tpAnnouncement.setEndCreateDate(jsonobject.getString("endCreateDate"));
 
+        tpAnnouncement.setSortKey(jsonobject.getString("sortKey"));
+        if (!StringUtils.isEmpty(jsonobject.getString("sortOrder"))){
+            tpAnnouncement.setSortOrder(jsonobject.getString("sortOrder").equals("descend") ? "desc" : "asc");
+        }else {
+            tpAnnouncement.setSortOrder("asc");
+        }
+
         // 分页
         Page<TpBuildingOwnerInfo> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);

src/main/java/com/huiju/estateagents/service/impl/TaRoleServiceImpl.java

             }
         }
         // 查询按钮
-        QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();
-        taRoleButtonQuery.eq("role_id",id);
-        List<TaRoleButton> taRoleButtonList= taRoleButtonMapper.selectList(taRoleButtonQuery);
-        List<SysButtonInMenu> sysButtonInArr = new ArrayList<>();
-        for(TaRoleButton taRoleButton :taRoleButtonList){
-            QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
-            sysButtonInMenuQuery.eq("btn_id",taRoleButton.getBtnId());
-            SysButtonInMenu sysButtonInMenuList= sysButtonInMenuMapper.selectOne(sysButtonInMenuQuery);
-            sysButtonInArr.add(sysButtonInMenuList);
-        }
-        taRole.setSysButtonInMenu(sysButtonInArr);
+//        QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();
+//        taRoleButtonQuery.eq("role_id",id);
+//        List<TaRoleButton> taRoleButtonList= taRoleButtonMapper.selectList(taRoleButtonQuery);
+//        List<SysButtonInMenu> sysButtonInArr = new ArrayList<>();
+//        for(TaRoleButton taRoleButton :taRoleButtonList){
+//            QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
+//            sysButtonInMenuQuery.eq("btn_id",taRoleButton.getBtnId());
+//            SysButtonInMenu sysButtonInMenuList= sysButtonInMenuMapper.selectOne(sysButtonInMenuQuery);
+//            sysButtonInArr.add(sysButtonInMenuList);
+//        }
+//        taRole.setSysButtonInMenu(sysButtonInArr);
         taRole.setSysMenuList(sysMenuList);
         return taRole;
     }

src/main/resources/mapper/property/BillOrderMapper.xml

                 </if>
         </where>
         group by tbo.order_bumber
-        order by tbo.create_date DESC
+        order by
+        <if test="map.sortKey != null and map.sortKey != ''">
+            ${map.sortKey} ${map.sortOrder},
+        </if>
+        tbo.create_date DESC
     </select>
     <select id="getBillHouse" resultType="java.lang.Integer">
         SELECT

src/main/resources/mapper/property/TpAnnouncementMapper.xml

           AND DATE_FORMAT(create_date, '%Y-%m-%d') <= #{record.endCreateDate}
         </if>
           AND org_id = #{record.orgId,jdbcType=INTEGER}
-          ORDER BY sort DESC,create_date desc
+          ORDER BY
+        <if test="record.sortKey != null and record.sortKey != ''">
+          ${record.sortKey} ${record.sortOrder},
+        </if>
+        sort DESC,create_date desc
       </where>
   </select>
   <select id="getById" resultType="com.huiju.estateagents.property.model.TpAnnouncement">

src/main/resources/mapper/property/TpBuildingOwnerInfoMapper.xml

         <if test="tpBuildingOwnerInfo.verifyStatus != null and tpBuildingOwnerInfo.verifyStatus != ''">
             and u.verify_status = #{tpBuildingOwnerInfo.verifyStatus}
         </if>
-        order by u.create_date desc
+        order by
+        <if test="tpBuildingOwnerInfo.sortKey != null and tpBuildingOwnerInfo.sortKey != ''">
+            ${tpBuildingOwnerInfo.sortKey} ${tpBuildingOwnerInfo.sortOrder},
+        </if>
+        u.create_date desc
     </select>
     <select id="getAvailableProp" resultType="java.lang.Integer">
         select count(*)