feat: 签到报表导出场地

guzijian
1 parent fbe36b68
Showing 4 changed files with 40 additions and 22 deletions
Bsth-admin/src/main/java/com/ruoyi/domain/DriverScheduling.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ExportReportViewResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ReportDetailResponseVo.java
Bsth-admin/src/main/resources/mapper/driver_scheduling/DriverSchedulingMapper.xml
@@ -26,6 +26,7 @@ public class DriverScheduling {
     private Integer alcoholFlag;
     private BigDecimal alcoholIntake;
     private String remark;
+    private String siteName;
     /**
      * 不是当前表的属性
      */
@@ -55,6 +55,11 @@ public class ExportReportViewResponseVo {
     @ColumnWidth(12)
     private String nbbm;
+    @ApiModelProperty("打卡场地")
+    @ExcelProperty(value = "打卡场地")
+    @ColumnWidth(14)
+    private String siteName;
+
     @ApiModelProperty("计划签到时间")
     @ExcelProperty(value = "计划签到时间")
     @ColumnWidth(20)
@@ -19,6 +19,7 @@ public class ReportDetailResponseVo {
     private String fleetName;
     private String nbbm;
     private String exString;
+    private String siteName;
     /**
      * 计划操作
      */
@@ -23,7 +23,7 @@
         <result column="alcohol_flag" property="alcoholFlag" jdbcType="DATETIMEOFFSET"/>
         <result column="alcohol_intake" property="alcoholIntake"/>
     </resultMap>
-    <insert id="insertRoster" parameterType="java.util.List"  useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+    <insert id="insertRoster" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         insert into scheduling (schedule_date,line_name,job_code,`name`,posts,lp_name,nbbm,bc_type,fcsj_t,zdsj_t)
         values
         <foreach collection="list" item="item" separator=",">
@@ -45,34 +45,45 @@
     </insert>
     <update id="updateRoster">
         update scheduling
-        set sign_in_id = #{signInId},
-            ex_type    = #{exType},
-            sign_time = #{signTime},
-            remark = #{remark},
-            sign_type = #{signType},
-            alcohol_flag = #{alcoholFlag},
+        set sign_in_id     = #{signInId},
+            ex_type        = #{exType},
+            sign_time      = #{signTime},
+            remark         = #{remark},
+            sign_type      = #{signType},
+            alcohol_flag   = #{alcoholFlag},
             alcohol_intake = #{alcoholIntake}
         where id = #{scheduling.id}
     </update>
     <select id="queryToDay" resultType="com.ruoyi.domain.DriverScheduling" resultMap="Scheduling">
-        select scheduling.*,driver.fleet_name fleetName from
-        scheduling left join driver on driver.job_code = scheduling.job_code
-        where schedule_date = #{date}
-        <if test="jobCode !=null and jobCode != ''">
-            and scheduling.job_code = #{jobCode}
-        </if>
-        <if test="name !=null and name != ''">
-            and `name` = #{name}
-        </if>
-        <if test="lineName !=null and lineName != ''">
-            and scheduling.line_name like  concat('%', #{lineName}, '%')
-        </if>
+        select scheduling.*,driver.fleet_name fleetName,equipment.site_name siteName from
+        scheduling left join driver on scheduling.job_code = driver.job_code
+        left join sign_in on scheduling.sign_in_id = sign_in.id
+        left join equipment on equipment.device_id = sign_in.device_id
+        <where>
+            <if test="jobCode !=null and jobCode != ''">
+                and scheduling.job_code = #{jobCode}
+            </if>
+            <if test="name !=null and name != ''">
+                and `name` = #{name}
+            </if>
+            <if test="lineName !=null and lineName != ''">
+                and scheduling.line_name like concat('%', #{lineName}, '%')
+            </if>
+            <if test="date != null and date != ''">
+                and schedule_date = #{date}
+            </if>
+        </where>
+
     </select>
     <select id="queryByMonth" resultType="com.ruoyi.domain.DriverScheduling" resultMap="Scheduling">
-        select scheduling.*,driver.fleet_name fleetName from
-        scheduling left join driver on driver.job_code = scheduling.job_code
-        where schedule_date &gt;= #{startDate} and schedule_date &lt;= #{endDate}
+        select scheduling.*, driver.fleet_name fleetName,equipment.site_name siteName
+        from scheduling
+                 left join driver on driver.job_code = scheduling.job_code
+                 left join sign_in on scheduling.sign_in_id = sign_in.id
+                 left join equipment on equipment.device_id = sign_in.device_id
+        where schedule_date &gt;= #{startDate}
+          and schedule_date &lt;= #{endDate}
     </select>
 </mapper>
 \ No newline at end of file