Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/mapper/index/BillStatusCountMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.index.mapper.BillStatusCountMapper">
+    
+    <resultMap type="com.ruoyi.index.domain.BillStatusCount" id="BillStatusCountResult">
+        <result property="id" column="id"/>
+        <result property="status" column="status"/>
+        <result property="type" column="type"/>
+    </resultMap>
+
+    <select id="selectStockinStatusCount" resultMap="BillStatusCountResult">
+        select stockin_id as id, status, '1' as type
+        from in_stockin
+        where status in ('1', '2', '3')
+    </select>
+
+    <select id="selectStockoutStatusCount" resultMap="BillStatusCountResult">
+        select stockout_id as id, status, '2' as type
+        from out_stockout
+        where status in ('1', '2', '3')
+    </select>
+
+    <select id="selectStockcheckStatusCount" resultMap="BillStatusCountResult">
+        select stock_check_id as id, status, '3' as type
+        from check_stockin
+        where status in ('1', '2', '3')
+    </select>
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/index/CargoSpaceCountMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.index.mapper.CargoSpaceCountMapper">
+
+    <select id="selectStatusCount" resultType="java.util.Map">
+        SELECT status, COUNT(*) as count
+        FROM bas_cargo_space
+        WHERE status IN ('1', '2', '3', '4', '5', '6')
+        GROUP BY status
+        ORDER BY status
+    </select>
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/index/IndexCountMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.index.mapper.IndexCountMapper">
+    
+    <!-- 查询已完成入库单数量 -->
+    <select id="selectStockinFinishCount" resultType="Integer">
+        select count(1) from in_stockin_finish
+    </select>
+    
+    <!-- 查询已完成出库单数量 -->
+    <select id="selectStockoutFinishCount" resultType="Integer">
+        select count(1) from out_stockout_finish
+    </select>
+    
+    <!-- 查询已完成盘点单数量 -->
+    <select id="selectStockcheckFinishCount" resultType="Integer">
+        select count(1) from check_stockin_finish
+    </select>
+    
+</mapper>

ruoyi-admin/src/main/resources/mapper/index/ViewIndexJobMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.index.mapper.ViewIndexJobMapper">
+    
+    <resultMap type="ViewIndexJob" id="ViewIndexJobResult">
+        <result property="jobId" column="job_id" />
+        <result property="status" column="status" />
+        <result property="statusLabel" column="status_label" />
+        <result property="inOrOut" column="in_or_out" />
+        <result property="priority" column="priority" />
+    </resultMap>
+
+    <select id="selectViewIndexJobByStatus" parameterType="String" resultMap="ViewIndexJobResult">
+        select 
+            job_id,
+            status,
+            status_label,
+            in_or_out,
+            priority
+        from view_index_job
+
+    </select>
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/index/WeekJobCountMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.index.mapper.WeekJobCountMapper">
+    
+    <!-- 查询指定日期范围内每天的入库作业数量 -->
+    <select id="selectInJobCounts" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*) as count
+        FROM
+            mydo_job_finish
+        WHERE
+            in_or_out &lt; 20
+            AND CAST(create_time AS DATE) BETWEEN #{startDate} AND #{endDate}
+        GROUP BY
+            CAST(create_time AS DATE)
+        ORDER BY
+            CAST(create_time AS DATE)
+    </select>
+    
+    <!-- 查询指定日期范围内每天的出库作业数量 -->
+    <select id="selectOutJobCounts" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*) as count
+        FROM
+            mydo_job_finish
+        WHERE
+            in_or_out &gt;= 20
+            AND CAST(create_time AS DATE) BETWEEN #{startDate} AND #{endDate}
+        GROUP BY
+            CAST(create_time AS DATE)
+        ORDER BY
+            CAST(create_time AS DATE)
+    </select>
+    
+</mapper>