添加奖金不分摊相关

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/BonusExcludeProject.java

@@ -45,7 +45,7 @@ public class BonusExcludeProject extends Model<BonusExcludeProject> {
      * 创建日期
      */
     @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ContractBonusDetail.java

@@ -98,7 +98,7 @@ public class ContractBonusDetail extends Model<ContractBonusDetail> {
      * 创建时间
      */
     @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ContractBonusSummary.java

@@ -79,7 +79,7 @@ public class ContractBonusSummary extends Model<ContractBonusSummary> {
      * 创建时间
      */
     @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/FinanceExcludeProject.java

@@ -47,7 +47,7 @@ public class FinanceExcludeProject extends Model<FinanceExcludeProject> {
      * 创建日期
      */
     @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/ContractBonusSummaryVO.java

@@ -67,7 +67,7 @@ public class ContractBonusSummaryVO {
      * 创建时间
      */
     @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 }

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

@@ -49,6 +49,7 @@ public class BonusExcludeProjectServiceImpl extends ServiceImpl<BonusExcludeProj
             List<BonusExcludeProject> collect = allProjects.stream().map(t -> {
                 BonusExcludeProject project = new BonusExcludeProject();
                 project.setProjectId(t.getId());
+                project.setCompanyId(user.getCompanyId());
                 project.setCreateBy(user.getId());
                 return project;
             }).collect(Collectors.toList());
@@ -58,6 +59,7 @@ public class BonusExcludeProjectServiceImpl extends ServiceImpl<BonusExcludeProj
                 BonusExcludeProject project = new BonusExcludeProject();
                 project.setProjectId(Integer.parseInt(addBO.getProjects()[i]));
                 project.setCreateBy(user.getId());
+                project.setCompanyId(user.getCompanyId());
                 resList.add(project);
             }
         }

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

@@ -65,6 +65,9 @@ public class ContractBonusDetailServiceImpl extends ServiceImpl<ContractBonusDet
     @Resource
     private ContractBonusSummaryMapper contractBonusSummaryMapper;
 
+    @Resource
+    private BonusExcludeProjectMapper bonusExcludeProjectMapper;
+
     public static Map<Integer,String> bonusTypeMap = new HashMap<>();
     static {
         bonusTypeMap.put(1,"第一季度奖");

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

@@ -1509,6 +1509,9 @@
         <foreach collection="userIds" item="userId" separator="," open="(" close=")">
             #{userId}
         </foreach>
+        and not exists(
+        select 1 from bonus_exclude_project where bonus_exclude_project.company_id = report.company_id and bonus_exclude_project.project_id = report.project_id
+        )
         group by creator_id,project_id
         ) tmp1
         left join
@@ -1522,6 +1525,9 @@
         <foreach collection="userIds" item="userId" separator="," open="(" close=")">
             #{userId}
         </foreach>
+        not exists(
+        select 1 from bonus_exclude_project where bonus_exclude_project.company_id = report.company_id and bonus_exclude_project.project_id = report.project_id
+        )
         group by creator_id,substr(create_date,1,7),project_id
         ) tmp2 on tmp1.creator_id = tmp2.creator_id and tmp1.project_id = tmp2.project_id