Merge remote-tracking branch 'origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java

@@ -147,8 +147,17 @@ public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl<S
         listDTO.forEach(dto->{
             dto.setDateId(dateId);
         });
+        del(customerId,dateId);
         boolean insertRes=insertBatch(ConvertUtils.sourceToTarget(listDTO, ScreenProjectCategoryGridDailyEntity.class));
         log.info("insertRes is {}",insertRes);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void del(String customerId,String dateId){
+        Integer num = NumConstant.ZERO;
+        do {
+            num = baseDao.deleteByDateIdAndCustomerId(customerId, dateId);
+        }while (num > NumConstant.ZERO && num == NumConstant.ONE_THOUSAND);
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -81,7 +81,7 @@
           </if>
           AND od.pid = '0'
           AND od.date_id = #{dateId}
-        GROUP BY od.CATEGORY_CODE,od.pid
+        GROUP BY categoryCode,od.pid
     </select>
 
     <!-- 查询内部客户组织的项目分类 -->