优化

platform-dao/src/main/java/com/platform/dao/mapper/repair/RepairFeeMapper.java

@@ -3,6 +3,8 @@ package com.platform.dao.mapper.repair;
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.entity.repair.RepairFee;
+import com.platform.dao.vo.export.repair.ExportRepairSumFeeVO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 import java.util.List;
 
@@ -15,6 +17,7 @@ import java.util.List;
  */
 @Component
 public interface RepairFeeMapper extends MyMapper<RepairFee> {
+    List<ExportRepairSumFeeVO> getSbsRepairFee(@Param("sbIds") List<String> sbIds);
     /**
      * 分页查询
      * @param dto

platform-dao/src/main/java/com/platform/dao/vo/export/repair/ExportRepairSumFeeVO.java

@@ -0,0 +1,40 @@
+package com.platform.dao.vo.export.repair;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @Description 工单费用单导出VO
+ * @Author liuyu
+ * @Date 2020-05-12 10:01:21
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportRepairSumFeeVO implements Serializable {
+
+    /**
+     * 主键
+     */
+    @Excel(name = "主键", orderNum = "1")
+    private String sbId;
+
+    /**
+     * 设备编号
+     */
+    @Excel(name = "设备编号", orderNum = "2")
+    private String sbNo;
+
+    /**
+     * 费用金额
+     */
+    @Excel(name = "费用金额", orderNum = "8")
+    private Double fee;
+
+
+}

platform-dao/src/main/resources/mapper/repair/RepairFeeMapper.xml

@@ -84,4 +84,17 @@
         LEFT JOIN t_repair_application_form application on fee.repair_id = application.id
         where fee.id = #{id}
     </select>
+    <select id="getSbsRepairFee" resultType="com.platform.dao.vo.export.repair.ExportRepairSumFeeVO">
+        select sum(fee) as fee,info.no as sbNo,fee.sb_id from t_repair_fee fee right join t_sb_info info on info.id = fee.sb_id
+        <where>
+            <if test="sbIds!=null and sbIds.size()>0">
+                and fee.sb_id in
+                <foreach collection="sbIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by fee.sb_id
+        order by sum(fee) desc
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairFeeController.java

@@ -5,6 +5,7 @@ import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.entity.repair.RepairFee;
 import com.platform.dao.mapper.repair.RepairFeeMapper;
 import com.platform.dao.vo.export.repair.ExportHistoryRepairFeeVO;
+import com.platform.dao.vo.export.repair.ExportRepairSumFeeVO;
 import com.platform.service.repair.RepairFeeService;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.repair.ExportRepairFeeVO;
@@ -155,4 +156,18 @@ public class RepairFeeController {
     ExcelUtil.exportResponseDict(response, ExportRepairFeeVO.class, BeanConverterUtil.copyListProperties(list, ExportRepairFeeVO.class), "维修费用单");
   }
 
+  /**
+   * 维修费用单导出
+   *
+   * @param  sbIds
+   * @return R
+   */
+  @GetMapping("/export/sbs")
+  @SysLog("维修费用单导出")
+  @PreAuthorize("@pms.hasPermission('repair-fees-export')")
+  public void exportSbsRepairFee(HttpServletResponse response,@RequestParam("sbIds") List<String> sbIds) {
+    List<ExportRepairSumFeeVO> list = repairFeeService.getSbsRepairFee(sbIds);
+    ExcelUtil.exportResponseDict(response, ExportRepairSumFeeVO.class, list, "历史费用单统计");
+  }
+
 }

platform-rest/src/main/resources/application-dev.yml

@@ -86,6 +86,7 @@ ignore:
     - /store/out-store-forms/**
     - /check/jobs/**
     - /sqarepartmanage/spare-part-info/**
+    - /repair/fees/**
 upload:
   root-dir: D://data//xian
 

platform-service/src/main/java/com/platform/service/repair/RepairFeeService.java

@@ -3,6 +3,7 @@ package com.platform.service.repair;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.entity.repair.RepairFee;
+import com.platform.dao.vo.export.repair.ExportRepairSumFeeVO;
 import com.platform.dao.vo.report.RepairReportFee;
 import com.platform.dao.vo.report.RepairReportMttr;
 import com.platform.dao.vo.report.RepairSbInfoReportFee;
@@ -18,6 +19,7 @@ import java.util.List;
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface RepairFeeService extends IBaseService<RepairFee, RepairFeeDTO> {
+    List<ExportRepairSumFeeVO> getSbsRepairFee(List<String> sbIds);
 
    /**
     * 批量删除

platform-service/src/main/java/com/platform/service/repair/impl/RepairFeeServiceImpl.java

@@ -23,6 +23,7 @@ import com.platform.dao.enums.SysFileTypeEnum;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.repair.RepairFeeMapper;
 import com.platform.dao.mapper.upms.SysFileMapper;
+import com.platform.dao.vo.export.repair.ExportRepairSumFeeVO;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.dao.vo.report.RepairReportFee;
 import com.platform.dao.vo.report.RepairReportMttr;
@@ -58,6 +59,11 @@ public class RepairFeeServiceImpl extends BaseServiceImpl<RepairFeeMapper, Repai
 
     private final SbInfoService sbInfoService;
 
+    @Override
+    public List<ExportRepairSumFeeVO> getSbsRepairFee(List<String> sbIds) {
+        return mapper.getSbsRepairFee(sbIds);
+    }
+
     @Override
     public int batchDelete(List<String> ids) {
         Weekend<RepairFee> weekend = new Weekend<>(RepairFee.class);