change - 看板接口

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

@@ -47,6 +47,16 @@ public class BoardReportController extends BaseController {
         return AjaxResult.success(boardReportService.boxFoamingProductionInterface(paramMap));
     }
 
+    /**
+     * 获取当前班组时间
+     * @param paramMap
+     * @return
+     */
+    @PostMapping("/getCurrentTeamTimeList")
+    public AjaxResult getCurrentTeamTimeList(@RequestBody HashMap<String, String> paramMap) {
+        return AjaxResult.success(boardReportService.getCurrentTeamTimeList(paramMap));
+    }
+
 
     /**
      * 首页接口

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

@@ -60,4 +60,13 @@ public class ProductionReportController extends BaseController {
         return success(list);
     }
 
+    /**
+     * 发泡注料记录报表
+     */
+    @GetMapping("/foamFillingRecordReportList")
+    public AjaxResult foamFillingRecordReportList(@RequestParam(required = false) Map hashMap) {
+        List<HashMap<String, Object>> list = productionReportService.foamFillingRecordReportList(hashMap);
+        return success(list);
+    }
+
 }

aucma-report/src/main/java/com/aucma/report/mapper/BoardReportMapper.java

@@ -55,4 +55,11 @@ public interface BoardReportMapper {
      * @return
      */
     List<HashMap<String, Object>> boxFoamingProductionInterface(HashMap<String, String> paramMap);
+
+    /**
+     * 获取当前班组时间
+     * @param paramMap
+     * @return
+     */
+    List<HashMap<String, Object>> getCurrentTeamTimeList(HashMap<String, String> paramMap);
 }

aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java

@@ -85,4 +85,11 @@ public interface GeneralReportMapper {
      * @return
      */
     List<HashMap<String, Object>> pourRecordReportList(Map hashMap);
+
+    /**
+     * 发泡注料记录报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> foamFillingRecordReportList(Map hashMap);
 }

aucma-report/src/main/java/com/aucma/report/service/IBoardReportService.java

@@ -35,4 +35,11 @@ public interface IBoardReportService {
      */
     List<HashMap<String, Object>> boxFoamingProductionInterface(HashMap<String, String> paramMap);
 
+    /**
+     * 获取当前班组时间
+     * @param paramMap
+     * @return
+     */
+    List<HashMap<String, Object>> getCurrentTeamTimeList(HashMap<String, String> paramMap);
+
 }

aucma-report/src/main/java/com/aucma/report/service/impl/BoardReportServiceImpl.java

@@ -91,5 +91,15 @@ public class BoardReportServiceImpl implements IBoardReportService {
         return boardReportMapper.boxFoamingProductionInterface(paramMap);
     }
 
+    /**
+     * 获取当前班组时间
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public List<HashMap<String, Object>> getCurrentTeamTimeList(HashMap<String, String> paramMap) {
+        return boardReportMapper.getCurrentTeamTimeList(paramMap);
+    }
+
 
 }

aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java

@@ -59,5 +59,15 @@ public class ProductionReportServiceImpl implements IProductionReportService {
         return reportMapper.ScanOfflineRecordReportList(hashMap);
     }
 
+    /**
+     * 发泡注料记录报表
+     * @param hashMap
+     * @return
+     */
+    @Override
+    public List<HashMap<String, Object>> foamFillingRecordReportList(Map hashMap) {
+        return reportMapper.foamFillingRecordReportList(hashMap);
+    }
+
 
 }

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

@@ -89,4 +89,13 @@
         ORDER BY BD.SORT
     </select>
 
+    <select id="getCurrentTeamTimeList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT SEQ,
+               TO_CHAR(START_TIME, 'YYYY-MM-DD HH24:MI:SS') START_TIME,
+               TO_CHAR(END_TIME, 'YYYY-MM-DD HH24:MI:SS')   END_TIME,
+               HOUR_TIME,
+               TEAM_NAME
+        FROM VIEW_CURRENT_TEAM_TIME
+    </select>
+
 </mapper>

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

@@ -74,6 +74,10 @@
         SELECT *
         FROM VIEW_PERFUSION_RECORD
     </select>
+    <select id="foamFillingRecordReportList" resultType="java.util.HashMap">
+        SELECT *
+        FROM VIEW_BOX_FOAMDATARECORD
+    </select>
 
 
 </mapper>