소스 검색

完善计量检定功能

hfxc226 2 년 전
부모
커밋
4e3c1cdf6f

+ 0 - 15
platform-dao/src/main/java/com/platform/dao/vo/report/MeasureLogReportVO.java

@@ -31,21 +31,6 @@ public class MeasureLogReportVO implements Serializable {
      */
     @Excel(name = "总数", orderNum = "3")
     private Integer totalNum;
-    /**
-     * 完成数
-     */
-    @Excel(name = "完成数", orderNum = "4")
-    private Integer totalFinishNum;
-    /**
-     * 未完成数
-     */
-    @Excel(name = "未完成数", orderNum = "5")
-    private Integer totalWaitNum;
-    /**
-     * 完成率
-     */
-    @Excel(name = "完成率", orderNum = "6")
-    private String finishRate;
 
     /**
      * 明细列表

+ 0 - 9
platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -623,15 +623,6 @@ user.real_name as saveUserName,sb.repair_dept_id
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update t_sb_info
             <set>
-                <if test="item.lastBaoyangTimes != null">
-                    last_baoyang_time=#{item.lastBaoyangTimes},
-                </if>
-                <if test="item.lastBaoyangHours != null">
-                    last_baoyang_hours=#{item.lastBaoyangHours},
-                </if>
-                <if test="item.lastBaoyangMiles != null">
-                    last_baoyang_miles=#{item.lastBaoyangMiles},
-                </if>
                 <if test="item.measureStatus != null">
                     measure_status= #{item.measureStatus}
                 </if>

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

@@ -71,7 +71,7 @@ public class MeasureLogReportController {
         } else {
             fileName = year + "年-检定记录统计报表";
         }
-        ExcelUtil.exportResponseDict(response, CheckJobReportVO.class, list, fileName);
+        ExcelUtil.exportResponseDict(response, MeasureLogReportVO.class, list, fileName);
     }