完善

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgLeaderDTO.java

@@ -58,6 +58,8 @@ public class IcPartyOrgLeaderDTO implements Serializable {
      */
 	private String position;
 
+    private Integer sort;
+
     /**
      * 
      */

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyWishDTO.java

@@ -58,6 +58,8 @@ public class IcPartyWishDTO implements Serializable {
      */
 	private String content;
 
+    private Integer sort;
+
     /**
      * 0：未删除；1：已删除
      */

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyInventoryDTO.java

@@ -59,6 +59,8 @@ public class IcPartyInventoryDTO implements Serializable {
      */
 	private Integer type;
 
+    private Integer sort;
+
     /**
      * 0：未删除；1：已删除
      */

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgLeaderEntity.java

@@ -63,4 +63,6 @@ public class IcPartyOrgLeaderEntity extends BaseEpmetEntity {
      */
 	private Integer type;
 
+	private Integer sort;
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyWishEntity.java

@@ -58,4 +58,6 @@ public class IcPartyWishEntity extends BaseEpmetEntity {
      */
 	private String content;
 
+	private Integer sort;
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgLeaderServiceImpl.java

@@ -70,7 +70,7 @@ public class IcPartyOrgLeaderServiceImpl extends BaseServiceImpl<IcPartyOrgLeade
         QueryWrapper<IcPartyOrgLeaderEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
-        wrapper.eq(StringUtils.isNotBlank(partyOrgId), "PARTY_ORG_ID", partyOrgId);
+        wrapper.eq(StringUtils.isNotBlank(partyOrgId), "PARTY_ORG_ID", partyOrgId).orderByAsc("SORT");
 
         return wrapper;
     }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyWishServiceImpl.java

@@ -68,7 +68,7 @@ public class IcPartyWishServiceImpl extends BaseServiceImpl<IcPartyWishDao, IcPa
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<IcPartyWishEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).orderByAsc("SORT");
 
         return wrapper;
     }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyInventoryEntity.java

@@ -59,4 +59,6 @@ public class IcPartyInventoryEntity extends BaseEpmetEntity {
      */
 	private Integer type;
 
+	private Integer sort;
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyInventoryServiceImpl.java

@@ -108,14 +108,14 @@ public class IcPartyInventoryServiceImpl extends BaseServiceImpl<IcPartyInventor
         List<IcPartyInventoryListResultDTO> resultDTOS = new ArrayList<>();
 
         LambdaQueryWrapper<IcPartyInventoryEntity> queryWrapperP = new LambdaQueryWrapper<>();
-        queryWrapperP.eq(IcPartyInventoryEntity::getParentId,0);
+        queryWrapperP.eq(IcPartyInventoryEntity::getParentId,0).orderByAsc(IcPartyInventoryEntity::getSort);
         List<IcPartyInventoryEntity> entityPList = baseDao.selectList(queryWrapperP);
         if (entityPList.size() > 0){
             resultDTOS = ConvertUtils.sourceToTarget(entityPList,IcPartyInventoryListResultDTO.class);
             resultDTOS.forEach(result->{
 
                 LambdaQueryWrapper<IcPartyInventoryEntity> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(IcPartyInventoryEntity::getParentId,result.getId());
+                queryWrapper.eq(IcPartyInventoryEntity::getParentId,result.getId()).orderByAsc(IcPartyInventoryEntity::getSort);
                 List<IcPartyInventoryEntity> entityList = baseDao.selectList(queryWrapper);
                 if (entityList.size() > 0){
                     result.setChildren(ConvertUtils.sourceToTarget(entityList, IcPartyInventoryDTO.class));
@@ -131,14 +131,14 @@ public class IcPartyInventoryServiceImpl extends BaseServiceImpl<IcPartyInventor
         List<IcPartyInventoryListResultDTO> resultDTOS = new ArrayList<>();
 
         LambdaQueryWrapper<IcPartyInventoryEntity> queryWrapperP = new LambdaQueryWrapper<>();
-        queryWrapperP.eq(IcPartyInventoryEntity::getParentId,0);
+        queryWrapperP.eq(IcPartyInventoryEntity::getParentId,0).orderByAsc(IcPartyInventoryEntity::getSort);
         List<IcPartyInventoryEntity> entityPList = baseDao.selectList(queryWrapperP);
         if (entityPList.size() > 0){
             resultDTOS = ConvertUtils.sourceToTarget(entityPList,IcPartyInventoryListResultDTO.class);
             resultDTOS.forEach(result->{
 
                 LambdaQueryWrapper<IcPartyInventoryEntity> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(IcPartyInventoryEntity::getParentId,result.getId());
+                queryWrapper.eq(IcPartyInventoryEntity::getParentId,result.getId()).orderByAsc(IcPartyInventoryEntity::getSort);;
                 List<IcPartyInventoryEntity> entityList = baseDao.selectList(queryWrapper);
                 if (entityList.size() > 0){
                     result.setChildren(ConvertUtils.sourceToTarget(entityList, IcPartyInventoryDTO.class));

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgLeaderDao.xml

@@ -29,7 +29,7 @@
               and
               org.PARTY_ORG_TYPE = #{type}
           </if>
-          order by org.id,orgP.id
+          order by org.id,orgP.id,leader.SORT
     </select>
 
 

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyWishDao.xml

@@ -22,6 +22,7 @@
         select *
         from ic_party_wish
         where DEL_FLAG = 0
+        order by SORT asc
 
     </select>