修改奖金导入逻辑

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractBonusDetailServiceImpl.java

@@ -419,7 +419,9 @@ public class ContractBonusDetailServiceImpl extends ServiceImpl<ContractBonusDet
                     contractBonusSummary.setYear(useYear);
                     toAddSummaryList.add(contractBonusSummary);
                 });
-                contractBonusSummaryMapper.batchInsertByImportData(toAddSummaryList);
+                if(CollectionUtils.isNotEmpty(toAddSummaryList)){
+                    contractBonusSummaryMapper.batchInsertByImportData(toAddSummaryList);
+                }
                 if(CollectionUtils.isNotEmpty(toAddBonusDetailList)){
                     contractBonusDetailMapper.batchInsert(toAddBonusDetailList);
                 }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ContractBonusDetailMapper.xml

@@ -45,5 +45,6 @@
                      )tmp2 group by contract, project_id
             )tmp1
                 left join project p on tmp1.projectId = p.id
+        order by tmp1.contract
     </select>
 </mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ContractBonusSummaryMapper.xml

@@ -22,6 +22,7 @@
             cbs.year = substr(#{ym},1,4)  and cbs.company_id = #{companyId}
         and substr(cbs.start_ym,6,7) <= substr(#{ym},6,7)
         and substr(cbs.end_ym,6,7) >= substr(#{ym},6,7)
+        order by cbs.user_id
     </select>
 
     <sql id="baseColumns">

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -1503,7 +1503,7 @@
         select creator_id,project_id,sum(ifnull(working_time,0)) projectTotalCost
         from report
         where
-        company_id = 10
+        company_id = #{companyId} and state = 1
         and create_date between str_to_date(#{startDate},'%Y-%m-%d') and str_to_date(#{endDate},'%Y-%m-%d')
         and creator_id in
         <foreach collection="userIds" item="userId" separator="," open="(" close=")">
@@ -1516,7 +1516,7 @@
         select creator_id,substr(create_date,1,7) as ym,project_id,sum(ifnull(working_time,0)) projectYMCost
         from report
         where
-        company_id = 10
+        company_id = #{companyId}  and state = 1
         and create_date between str_to_date(#{startDate},'%Y-%m-%d') and str_to_date(#{endDate},'%Y-%m-%d')
         and creator_id in
         <foreach collection="userIds" item="userId" separator="," open="(" close=")">
@@ -1547,7 +1547,7 @@
         select creator_id,substr(create_date,1,7) as ym,project_id,sum(ifnull(working_time,0)) projectYMCost
         from report
         where
-        company_id = 10
+        company_id = #{companyId}
         and create_date between str_to_date(#{startDate},'%Y-%m-%d') and str_to_date(#{endDate},'%Y-%m-%d')
         and creator_id in
         <foreach collection="userIds" item="userId" separator="," open="(" close=")">
@@ -1560,7 +1560,7 @@
         select creator_id,project_id,create_date,working_time
         from report
         where
-        company_id = 10
+        company_id = #{companyId}
         and create_date between str_to_date(#{startDate},'%Y-%m-%d') and str_to_date(#{endDate},'%Y-%m-%d')
         and creator_id in
         <foreach collection="userIds" item="userId" separator="," open="(" close=")">