fix. 联调修改

sop-business/src/main/java/com/qmth/sop/business/bean/dto/DingStatisticByPersonDto.java

@@ -1,5 +1,6 @@
 package com.qmth.sop.business.bean.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
@@ -26,10 +27,12 @@ public class DingStatisticByPersonDto {
 
     @ApiModelProperty(value = "服务单元id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @ExcelIgnore
     private Long serviceId;
 
     @ApiModelProperty(value = "用户id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @ExcelIgnore
     private Long userId;
 
     @ExcelProperty(value = "姓名(人员档案号)")

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingStatisticByPersonServiceImpl.java

@@ -49,7 +49,6 @@ public class TBDingStatisticByPersonServiceImpl extends ServiceImpl<TBDingStatis
                 BigDecimal workHours = new BigDecimal(0);
                 BigDecimal addDays = new BigDecimal(0);
                 BigDecimal addHours = new BigDecimal(0);
-                BigDecimal workDays;
                 int violationDays = 0;
 
                 for (TBDingStatistic tbDingStatistic : tbDingStatisticList) {

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -64,3 +64,6 @@ INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, r
 -- 2024-11-07
 ALTER TABLE t_b_ding_statistic_by_person
     ADD COLUMN user_id BIGINT NULL COMMENT '用户id' AFTER service_name;
+
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2123', '工时统计-统计计算', '/api/admin/tb/ding/statistic/calculate', 'URL', '29', '4', 'AUTH', '1', '1', '0');
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES ('2124', '统计计算', 'Calculate', 'BUTTON', '29', '5', 'AUTH', '2123', '1', '0', '1');