经营页面排序

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractServiceImpl.java

@@ -374,18 +374,18 @@ public class ContractServiceImpl implements ContractService{
     public List<ManagePersonDto> infoGroupByPerson() {
         Calendar calendar = Calendar.getInstance();
         String year = String.valueOf(calendar.get(Calendar.YEAR));
+        List<ManagePersonDto> manageDtos = contractMapper.signGroupByPerson(year);
         List<ManagePersonDto> returnDtos = contractMapper.returnGroupByPerson(year);
-        List<ManagePersonDto> signDtos = contractMapper.signGroupByPerson(year);
-        List<ManagePersonDto> manageDtos = contractMapper.newGroupByPerson(year);
+        List<ManagePersonDto> newDtos = contractMapper.newGroupByPerson(year);
         for (ManagePersonDto manageDto : manageDtos) {
             for (ManagePersonDto returnDto : returnDtos) {
                 if(returnDto.getUserId().equals(manageDto.getUserId())){
                     manageDto.setReturnAmount(returnDto.getReturnAmount());
                 }
             }
-            for (ManagePersonDto signDto : signDtos) {
-                if(signDto.getUserId().equals(manageDto.getUserId())){
-                    manageDto.setSignAmount(signDto.getSignAmount());
+            for (ManagePersonDto newDto : newDtos) {
+                if(newDto.getUserId().equals(manageDto.getUserId())){
+                    manageDto.setNewAmount(newDto.getSignAmount());
                 }
             }
         }

zjugis-business/src/main/resources/mapper/oracle/ContractMapper.xml

@@ -685,6 +685,7 @@
             </if>
         </where>
         GROUP BY c.AREA_MANAGER_ID
+        ORDER BY NVL(SUM(c.CONTRACT_AMOUNT), 0) desc
     </select>
 
     <select id="newGroupByPerson" resultType="com.zjugis.business.bean.dto.ManagePersonDto">