change - 设备报表

aucma-base/src/main/resources/mapper/base/BaseMonitorWorkUnitMapper.xml

@@ -56,7 +56,7 @@
             <if test="proportion != null ">and bmwu.proportion = #{proportion}</if>
             <if test="isFlag != null ">and bmwu.is_flag = #{isFlag}</if>
         </where>
-        order by OBJ_ID
+        order by bmwu.monitor_code
     </select>
 
     <select id="selectBaseMonitorWorkUnitByObjId" parameterType="Long" resultMap="BaseMonitorWorkUnitResult">

aucma-base/src/main/resources/mapper/base/BaseWorkUnitMapper.xml

@@ -23,7 +23,21 @@
     </resultMap>
 
     <sql id="selectBaseWorkUnitVo">
-        select obj_id, work_unit_code, parent_id, work_unit_name, work_unit_address, ancestors, work_unit_sort, product_line_code, work_unit_type, is_flag, created_by, created_time, updated_by, updated_time from base_work_unit
+        select obj_id,
+               work_unit_code,
+               parent_id,
+               work_unit_name,
+               work_unit_address,
+               ancestors,
+               work_unit_sort,
+               product_line_code,
+               work_unit_type,
+               is_flag,
+               created_by,
+               created_time,
+               updated_by,
+               updated_time
+        from base_work_unit
     </sql>
 
     <select id="selectBaseWorkUnitList" parameterType="BaseWorkUnit" resultMap="BaseWorkUnitResult">
@@ -32,11 +46,15 @@
             <if test="objId != null ">and obj_id = #{objId}</if>
             <if test="workUnitCode != null  and workUnitCode != ''">and work_unit_code = #{workUnitCode}</if>
             <if test="parentId != null  and parentId != ''">and parent_id = #{parentId}</if>
-                        <if test="workUnitName != null  and workUnitName != ''"> and work_unit_name like concat(concat('%', #{workUnitName}), '%')</if>
-                        <if test="workUnitAddress != null  and workUnitAddress != ''"> and work_unit_address = #{workUnitAddress}</if>
+            <if test="workUnitName != null  and workUnitName != ''">and work_unit_name like concat(concat('%',
+                #{workUnitName}), '%')
+            </if>
+            <if test="workUnitAddress != null  and workUnitAddress != ''">and work_unit_address = #{workUnitAddress}
+            </if>
             <if test="ancestors != null  and ancestors != ''">and ancestors = #{ancestors}</if>
             <if test="workUnitSort != null ">and work_unit_sort = #{workUnitSort}</if>
-                        <if test="productLineCode != null  and productLineCode != ''"> and product_line_code = #{productLineCode}</if>
+            <if test="productLineCode != null  and productLineCode != ''">and product_line_code = #{productLineCode}
+            </if>
             <if test="workUnitType != null ">and work_unit_type = #{workUnitType}</if>
             <if test="isFlag != null ">and is_flag = #{isFlag}</if>
             <if test="createdBy != null  and createdBy != ''">and created_by = #{createdBy}</if>
@@ -44,6 +62,7 @@
             <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
         </where>
+        order by work_unit_code
     </select>
 
     <select id="selectBaseWorkUnitByObjId" parameterType="Long" resultMap="BaseWorkUnitResult">
@@ -111,7 +130,9 @@
     </update>
 
     <delete id="deleteBaseWorkUnitByObjId" parameterType="Long">
-        delete from base_work_unit where obj_id = #{objId}
+        delete
+        from base_work_unit
+        where obj_id = #{objId}
     </delete>
 
     <delete id="deleteBaseWorkUnitByObjIds" parameterType="String">

aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java

@@ -53,9 +53,10 @@ public class ProductionReportController extends BaseController {
      * 查询生产执行报表
      */
     @GetMapping("/productionExecutionReportList")
-    public AjaxResult productionExecutionReportList(@RequestParam(required = false) Map hashMap) {
+    public TableDataInfo productionExecutionReportList(@RequestParam(required = false) Map hashMap) {
+        startPage();
         List<ProductionExecutionReport> list = productionReportService.productionExecutionReportList(hashMap);
-        return success(list);
+        return getDataTable(list);
     }
 
     /**
@@ -65,18 +66,21 @@ public class ProductionReportController extends BaseController {
      */
     @PostMapping("/productionExecutionReportList/export")
     public void productionExecutionReportListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) {
+        hashMap.put("pageNum",null);
+        hashMap.put("pageSize",null);
         List<ProductionExecutionReport> list = productionReportService.productionExecutionReportList(hashMap);
         ExcelUtil<ProductionExecutionReport> util = new ExcelUtil<>(ProductionExecutionReport. class);
-        util.exportExcel(response, list, "清单率报表" );
+        util.exportExcel(response, list, "查询生产执行报表" );
     }
 
     /**
      * 查询在制品查询报表
      */
     @GetMapping("/WIPInquiryReportList")
-    public AjaxResult WIPInquiryReportList(@RequestParam(required = false) Map hashMap) {
+    public TableDataInfo WIPInquiryReportList(@RequestParam(required = false) Map hashMap) {
+        startPage();
         List<WIPInquiryReport> list = productionReportService.WIPInquiryReportList(hashMap);
-        return success(list);
+        return getDataTable(list);
     }
 
     /**
@@ -86,6 +90,8 @@ public class ProductionReportController extends BaseController {
      */
     @PostMapping("/WIPInquiryReportList/export")
     public void WIPInquiryReportListExport(HttpServletResponse response, @RequestParam(required = false) Map hashMap) {
+        hashMap.put("pageNum",null);
+        hashMap.put("pageSize",null);
         List<WIPInquiryReport> list = productionReportService.WIPInquiryReportList(hashMap);
         ExcelUtil<WIPInquiryReport> util = new ExcelUtil<>(WIPInquiryReport. class);
         util.exportExcel(response, list, "清单率报表" );

aucma-report/src/main/java/com/aucma/report/domain/ReportDayDnb.java

@@ -29,6 +29,12 @@ public class ReportDayDnb extends BaseEntity {
     @Excel(name = "计量设备编号")
     private String monitorCode;
 
+    /**
+     * 计量设备名称
+     */
+    @Excel(name = "计量设备名称")
+    private String monitorName;
+
     /**
      * 仪表值
      */
@@ -50,47 +56,49 @@ public class ReportDayDnb extends BaseEntity {
     /**
      * 开始时间
      */
-    @Excel(name = "开始时间")
     private String beginTime;
 
     /**
      * 结束时间
      */
-    @Excel(name = "结束时间")
     private String endTime;
 
     /**
      * 是否标识
      */
-    @Excel(name = "是否标识")
     private Long isFlag;
 
     /**
      * 创建人
      */
-    @Excel(name = "创建人")
     private String createdBy;
 
     /**
      * 创建时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
     /**
      * 更新人
      */
-    @Excel(name = "更新人")
     private String updatedBy;
 
     /**
      * 更新时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+
+    public String getMonitorName() {
+        return monitorName;
+    }
+
+    public void setMonitorName(String monitorName) {
+        this.monitorName = monitorName;
+    }
+
     public void setObjId(Long objId) {
         this.objId = objId;
     }

aucma-report/src/main/resources/mapper/report/ReportDayDnbMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="ReportDayDnb" id="ReportDayDnbResult">
         <result property="objId" column="obj_id"/>
         <result property="monitorCode" column="monitor_code"/>
+        <result property="monitorName" column="monitor_name"/>
         <result property="instrumentValue" column="instrument_value"/>
         <result property="expend" column="expend"/>
         <result property="reportDate" column="report_date"/>
@@ -20,29 +21,40 @@
     </resultMap>
 
     <sql id="selectReportDayDnbVo">
-        select obj_id, monitor_code, instrument_value, expend, report_date, begin_time, end_time, is_flag, created_by, created_time, updated_by, updated_time from report_day_dnb
+        select rpd.monitor_code,
+               bm.MONITOR_NAME,
+               MAX(rpd.instrument_value)     instrument_value,
+               SUM(rpd.expend)               expend,
+               SUBSTR(rpd.begin_time, 1, 10) report_date
+        from report_point_dnb rpd
+                 left join BASE_MONITORINFO bm on bm.MONITOR_CODE = rpd.MONITOR_CODE
     </sql>
 
     <select id="selectReportDayDnbList" parameterType="ReportDayDnb" resultMap="ReportDayDnbResult">
         <include refid="selectReportDayDnbVo"/>
         <where>
-                        <if test="monitorCode != null  and monitorCode != ''"> and monitor_code = #{monitorCode}</if>
+            <if test="monitorCode != null  and monitorCode != ''">and rpd.monitor_code = #{monitorCode}</if>
             <if test="instrumentValue != null ">and instrument_value = #{instrumentValue}</if>
             <if test="expend != null ">and expend = #{expend}</if>
             <if test="reportDate != null  and reportDate != ''">and report_date = #{reportDate}</if>
             <if test="beginTime != null  and beginTime != ''">and begin_time = #{beginTime}</if>
             <if test="endTime != null  and endTime != ''">and end_time = #{endTime}</if>
             <if test="isFlag != null ">and is_flag = #{isFlag}</if>
+            <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
+                and SUBSTR(rpd.begin_time, 1, 10) between  #{params.beginCollectTime} and #{params.endCollectTime}
+            </if>
             <if test="createdBy != null  and createdBy != ''">and created_by = #{createdBy}</if>
             <if test="createdTime != null ">and created_time = #{createdTime}</if>
             <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
         </where>
+        GROUP BY rpd.monitor_code, bm.MONITOR_NAME, SUBSTR(rpd.begin_time, 1, 10)
+        order by report_date,rpd.monitor_code
     </select>
 
     <select id="selectReportDayDnbByObjId" parameterType="Long" resultMap="ReportDayDnbResult">
         <include refid="selectReportDayDnbVo"/>
-            where obj_id = #{objId}
+        where rpd.obj_id = #{objId}
     </select>
 
     <insert id="insertReportDayDnb" parameterType="ReportDayDnb">
@@ -99,7 +111,9 @@
     </update>
 
     <delete id="deleteReportDayDnbByObjId" parameterType="Long">
-        delete from report_day_dnb where obj_id = #{objId}
+        delete
+        from report_day_dnb
+        where obj_id = #{objId}
     </delete>
 
     <delete id="deleteReportDayDnbByObjIds" parameterType="String">

aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml

@@ -49,12 +49,15 @@
             <if test="beginTime != null  and beginTime != ''">and rpd.begin_time = #{beginTime}</if>
             <if test="endTime != null  and endTime != ''">and rpd.end_time = #{endTime}</if>
             <if test="isFlag != null ">and rpd.is_flag = #{isFlag}</if>
+            <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
+                and rpd.begin_time between #{params.beginCollectTime}  and #{params.endCollectTime}
+            </if>
             <if test="createdBy != null  and createdBy != ''">and rpd.created_by = #{createdBy}</if>
             <if test="createdTime != null ">and rpd.created_time = #{createdTime}</if>
             <if test="updatedBy != null  and updatedBy != ''">and rpd.updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and rpd.updated_time = #{updatedTime}</if>
         </where>
-        order by rpd.OBJ_ID
+        order by rpd.begin_time DESC
     </select>
 
     <select id="selectReportPointDnbByObjId" parameterType="Long" resultMap="ReportPointDnbResult">