Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-sb into demo_

platform-common/src/main/java/com/platform/common/util/DateUtils.java

@@ -492,10 +492,10 @@ public class DateUtils {
     public static List<Map<String, LocalDateTime>> getMonthStartAndEndByYear(int year, int month) {
         List<Map<String, LocalDateTime>> monthStartAndEndList = new ArrayList<Map<String, LocalDateTime>>();
         // 每年的 一月一号，零时零分零秒
-        for (int i = 1; i < month; i++) {
+        for (int i = 1; i <= month; i++) {
             Map<String, LocalDateTime> dateTimeMap = new HashMap<String, LocalDateTime>();
-            LocalDateTime searchStartTimeMonth = getFirstDayOfMonth(year, i).plusDays(-1);
-            LocalDateTime searchEndTimeMonth = getLastDayOfMonth(year, i).plusDays(1);
+            LocalDateTime searchStartTimeMonth = getFirstDayOfMonth(year, i);
+            LocalDateTime searchEndTimeMonth = getLastDayOfMonth(year, i);
             dateTimeMap.put("searchStartTimeMonth", searchStartTimeMonth);
             dateTimeMap.put("searchEndTimeMonth", searchEndTimeMonth);
             monthStartAndEndList.add(dateTimeMap);

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbMeasureLogVO.java

@@ -19,49 +19,47 @@ import java.time.LocalDateTime;
 public class ExportSbMeasureLogVO implements Serializable {
 
     /**
-   * 主键
-   */
-  @Excel(name = "主键", orderNum = "1")
-  private String id;
-
+     * 标准名称
+     */
+    @Excel(name = "设备位号")
+    private String cardNo;
     /**
-   * 标准名称
-   */
-  @Excel(name = "设备名称", orderNum = "2")
-  private String sbName;
+     * 出厂编号
+     */
+    @Excel(name = "出厂编号")
+    private String zzh;
     /**
      * 标准名称
      */
-    @Excel(name = "设备型号", orderNum = "3")
-    private String sbModel;
+    @Excel(name = "设备名称")
+    private String sbName;
     /**
      * 标准名称
      */
-    @Excel(name = "测量编号", orderNum = "4")
-    private String cardNo;
+    @Excel(name = "设备型号")
+    private String sbModel;
     /**
-   * 编码
-   */
-  @Excel(name = "设备编号", orderNum = "5")
-  private String no;
-
+     * 编码
+     */
+    @Excel(name = "设备编号")
+    private String no;
     /**
-   * 检定日期
-   */
-  @Excel(name = "检定日期", orderNum = "6")
-  private LocalDate lastDate;
+     * 检定日期
+     */
+    @Excel(name = "检定日期")
+    private LocalDate lastDate;
 
     /**
-   * 是否启用: 0-否 1-是
-   */
-  @Excel(name = "检定人", orderNum = "7")
-  private String name;
+     * 是否启用: 0-否 1-是
+     */
+    @Excel(name = "检定人")
+    private String name;
 
     /**
-   * 备注
-   */
-  @Excel(name = "备注", orderNum = "8")
-  private String requirement;
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String requirement;
 
 
 }

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbMeasureLogVO.java

@@ -32,6 +32,14 @@ public class SbMeasureLogVO extends BaseVO implements Serializable{
      * 设备id
      */
     private String sbId;
+    /**
+     * 设备位号
+     */
+    private String positionNo;
+    /**
+     * 出厂编号
+     */
+    private String zzh;
     /**
      * 设备名称
      */

platform-dao/src/main/resources/mapper/sb/SbMeasureLogMapper.xml

@@ -134,7 +134,7 @@
     <select id="selectList" parameterType="com.platform.dao.dto.sb.SbMeasureLogDTO"
             resultType="com.platform.dao.vo.query.sb.SbMeasureLogVO">
         select checkstandard.*,
-               sb.name sbName, sb.model sbModel, sb.no sbNo, sb.zzh sbZzh, sb.card_no cardNo
+        sb.position_no positionNo, sb.zzh, sb.name sbName, sb.model sbModel, sb.no sbNo, sb.zzh sbZzh, sb.card_no cardNo
         from t_sb_measure_log as checkstandard
         LEFT JOIN t_sb_info sb on checkstandard.sb_id = sb.id
         <where>

platform-rest/src/main/java/com/platform/rest/controller/report/MeasureLogReportController.java

@@ -9,7 +9,9 @@ import com.platform.dao.dto.check.CheckJobDTO;
 import com.platform.dao.dto.sb.SbMeasureLogDTO;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.check.ExportCheckJobVO;
+import com.platform.dao.vo.export.sb.ExportSbMeasureLogVO;
 import com.platform.dao.vo.query.check.CheckJobVO;
+import com.platform.dao.vo.query.sb.SbMeasureLogVO;
 import com.platform.dao.vo.report.CheckJobReportVO;
 import com.platform.dao.vo.report.CheckJobReportWeekHoursVO;
 import com.platform.dao.vo.report.MeasureLogReportVO;
@@ -74,5 +76,33 @@ public class MeasureLogReportController {
         ExcelUtil.exportResponseDict(response, MeasureLogReportVO.class, list, fileName);
     }
 
+    /**
+     * 保养任务每月统计报表导出
+     *
+     * @param dto  查询条件
+     * @param year 查询年份
+     * @return R
+     */
+    @GetMapping("/export/month")
+    @SysLog("检定记录每月明细导出")
+    public void export(HttpServletResponse response, SbMeasureLogDTO dto, @RequestParam(required = false) Integer year,
+                       @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth,
+                       @RequestParam(required = false) Integer month) {
+        List<MeasureLogReportVO> list = sbMeasureLogService.getMonthReport(dto, year, startMonth, endMonth);
+        String fileName = "";
+        fileName = year + "-" + month + "-检定记录明细";
+        if (CollectionUtil.isNotEmpty(list)) {
+            for (MeasureLogReportVO vo : list) {
+                if (vo.getMonth() == month) {
+                    List<SbMeasureLogVO> detailList = vo.getDetailList();
+                    if (CollectionUtil.isNotEmpty(detailList)) {
+                        ExcelUtil.exportResponseDict(response, ExportSbMeasureLogVO.class, BeanConverterUtil.copyListProperties(detailList, ExportSbMeasureLogVO.class), fileName);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
     
 }