add. 工时统计

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.sop.business.bean.dto.*;
 import com.qmth.sop.business.bean.result.CrmProjectResult;
-import com.qmth.sop.business.bean.result.TBDeviceDeliveryResult;
 import com.qmth.sop.business.bean.result.UserArchivesResult;
 import com.qmth.sop.business.entity.*;
 import com.qmth.sop.business.mapper.TBDingStatisticMapper;
@@ -22,7 +21,6 @@ import com.qmth.sop.common.util.FileUtil;
 import com.qmth.sop.common.util.ServletUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -71,12 +69,6 @@ public class TBDingStatisticServiceImpl extends ServiceImpl<TBDingStatisticMappe
     @Resource
     private TBServiceService tbServiceService;
 
-    @Resource
-    private SysCustomService sysCustomService;
-
-    @Resource
-    private SysSupplierService sysSupplierService;
-
     @Resource
     private TBDingStatisticByPersonService tbdingStatisticByPersonService;
 
@@ -501,25 +493,25 @@ public class TBDingStatisticServiceImpl extends ServiceImpl<TBDingStatisticMappe
             case BY_PERSON:
                 List<DingStatisticByPersonDto> byPersonData = tbdingStatisticByPersonService.findStatisticByPersonList(
                         serviceId);
-                EasyExcel.write(fileTemp, TBDeviceDeliveryResult.class).sheet("工时统计-按人员").doWrite(byPersonData);
+                EasyExcel.write(fileTemp, DingStatisticByPersonDto.class).sheet("工时统计-按人员").doWrite(byPersonData);
                 break;
             case BY_SOP:
                 List<DingStatisticBySopDto> bySopData = tbdingStatisticBySopService.findStatisticBySopList(serviceId);
-                EasyExcel.write(fileTemp, TBDeviceDeliveryResult.class).sheet("工时统计-按sop").doWrite(bySopData);
+                EasyExcel.write(fileTemp, DingStatisticBySopDto.class).sheet("工时统计-按sop").doWrite(bySopData);
                 break;
             case BY_CRM:
                 List<DingStatisticByCrmDto> byCrmData = tbdingStatisticByCrmService.findStatisticByCrmList(serviceId);
-                EasyExcel.write(fileTemp, TBDeviceDeliveryResult.class).sheet("工时统计-按crm").doWrite(byCrmData);
+                EasyExcel.write(fileTemp, DingStatisticByCrmDto.class).sheet("工时统计-按crm").doWrite(byCrmData);
                 break;
             case BY_CUSTOM:
                 List<DingStatisticByCustomDto> byCustomData = tbdingStatisticByCustomService.findStatisticByCustomList(
                         serviceId);
-                EasyExcel.write(fileTemp, TBDeviceDeliveryResult.class).sheet("工时统计-按客户").doWrite(byCustomData);
+                EasyExcel.write(fileTemp, DingStatisticByCustomDto.class).sheet("工时统计-按客户").doWrite(byCustomData);
                 break;
             case BY_SUPPLIER:
                 List<DingStatisticBySupplierDto> bySupplierData = tbdingStatisticBySupplierService.findStatisticBySupplierList(
                         serviceId);
-                EasyExcel.write(fileTemp, TBDeviceDeliveryResult.class).sheet("工时统计-按供应商").doWrite(bySupplierData);
+                EasyExcel.write(fileTemp, DingStatisticBySupplierDto.class).sheet("工时统计-按供应商").doWrite(bySupplierData);
                 break;
             default:
                 break;

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

@@ -167,3 +167,8 @@ CREATE TABLE t_b_ding_statistic_by_supplier (
   PRIMARY KEY (id))
 COMMENT = '工时统计-按供应商统计';
 
+
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2100', '工时统计-分页查询', '/api/admin/tb/ding/statistic/page', 'URL', '29', '1', 'AUTH', '1', '1', '0');
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('2101', '工时统计-批量导出', '/api/admin/tb/ding/statistic/export', 'URL', '29', '2', 'AUTH', '1', '1', '0');
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES ('2102', '搜索', 'Select', 'BUTTON', '29', '1', 'AUTH', '2100', '1', '0', '1');
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES ('2103', '导出统计结果', 'Export', 'BUTTON', '29', '2', 'AUTH', '2101', '1', '0', '1');

sop-business/src/main/resources/mapper/TBDingStatisticBySopMapper.xml

@@ -40,7 +40,7 @@
             work_hours AS workHours,
             violation_days AS violationDays
         FROM
-            t_b_ding_statistic_by_sop;
+            t_b_ding_statistic_by_sop
         <where>
             <if test="serviceId != null">
                 AND service_id = #{serviceId}