Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -167,8 +167,18 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         }
         returnDto.setParticipateTotal(participateTotal);
         returnDto.setParticipateUserTotal(participateUserTotal);
-        returnDto.setSubRankList(CollectionUtils.isNotEmpty(returnDto.getSubRankList()) && returnDto.getSubRankList().size() >= formDTO.getTopRow() ?
-                returnDto.getSubRankList().subList(NumConstant.ZERO, formDTO.getTopRow()) : returnDto.getSubRankList());
+        //按照组织次数降序排列
+        if(CollectionUtils.isNotEmpty(returnDto.getSubRankList())){
+            Collections.sort(returnDto.getSubRankList(), new Comparator<WorkRecordSubRank>() {
+                @Override
+                public int compare(WorkRecordSubRank o1, WorkRecordSubRank o2) {
+                    return o2.getParticipateTotal().compareTo(o1.getParticipateTotal());
+                }
+            });
+            if(returnDto.getSubRankList().size() >= formDTO.getTopRow()){
+                returnDto.getSubRankList().subList(NumConstant.ZERO, formDTO.getTopRow());
+            }
+        }
         return returnDto;
     }
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -321,6 +321,7 @@
                 and sca.PID=#{agencyId}
             </otherwise>
         </choose>
+        order by CONVERT ( sca.AGENCY_NAME  USING gbk ) ASC
     </select>
 
     <!-- 根据agencyId查询网格 -->

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@@ -137,5 +137,6 @@
                 and m.PARENT_AGENCY_ID=#{agencyId}
             </otherwise>
         </choose>
+        order by CONVERT ( m.grid_name  USING gbk ) ASC
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenCustomerWorkRecordDictServiceImpl.java

@@ -35,6 +35,7 @@ import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
 import java.util.List;
@@ -108,7 +109,7 @@ public class ScreenCustomerWorkRecordDictServiceImpl extends BaseServiceImpl<Scr
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collect(ScreenCollFormDTO<ScreenCustomerWorkRecordDictDTO> data) {
-        if(data.getIsFirst()){
+        if (data.getIsFirst() && !CollectionUtils.isEmpty(data.getDataList())) {
             int affectedRows = baseDao.deleteBatch(data.getCustomerId());
             while(affectedRows > 0){
                 affectedRows = baseDao.deleteBatch(data.getCustomerId());

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -28,6 +28,7 @@ import com.epmet.entity.plugins.ScreenWorkRecordOrgDailyEntity;
 import com.epmet.service.plugins.ScreenWorkRecordOrgDailyService;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 工作日志-组织按日统计(累计值)
@@ -42,7 +43,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collectOrgDaily(ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data) {
-        if(data.getIsFirst()){
+        if (data.getIsFirst() && !CollectionUtils.isEmpty(data.getDataList())) {
             int affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getDateId());
             while(affectedRows > 0){
                 affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getDateId());

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/plugins/impl/ScreenWorkRecordOrgMonthlyServiceImpl.java

@@ -29,6 +29,7 @@ import com.epmet.service.plugins.ScreenWorkRecordOrgMonthlyService;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 工作日志-组织按月统计
@@ -51,7 +52,7 @@ public class ScreenWorkRecordOrgMonthlyServiceImpl extends BaseServiceImpl<Scree
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public void collect(ScreenCollFormDTO<ScreenWorkRecordCommonFormDTO> data) {
-        if(data.getIsFirst()){
+        if(data.getIsFirst() && !CollectionUtils.isEmpty(data.getDataList())){
             int affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getMonthId());
             while(affectedRows > 0){
                 affectedRows = baseDao.deleteBatch(data.getCustomerId(),data.getMonthId());