坐席单位和考勤趋势修改

duty-service/src/main/java/cn/com/taiji/duty/model/AdminSeatUnit.java

@@ -55,6 +55,9 @@ public class AdminSeatUnit implements Serializable {
 	@ApiModelProperty("日志URL")
 	private String dailyUrl;
 
+	@ApiModelProperty("日志URL名称")
+	private String dailyName;
+
 	@ApiModelProperty("周报状态")
 	private String weekStatus;
 
@@ -64,4 +67,7 @@ public class AdminSeatUnit implements Serializable {
 	@ApiModelProperty("周报URL")
 	private String weekUrl;
 
+	@ApiModelProperty("周报URL名称")
+	private String weekName;
+
 }

duty-service/src/main/resources/mapper/DutySeatDutyUnitMapper.xml

@@ -80,8 +80,8 @@
                         GROUP_CONCAT(u.serial_number) as number,GROUP_CONCAT(case when up.id is null then 0 else 1 end) as state,
                         case when si.status = '1' then 1 else 2 end as signInStatus,si.status as inStatus,date_format(si.time,'%H:%i:%s') as inTime,
                         case when so.status = '1' then 1 else 2 end as signOutStatus,so.status as outStatus,date_format(so.time,'%H:%i:%s') as outTime,
-                        case when d.id is null then 2 else 1 end as dailyStatus,date_format(d.submit_time,'%H:%i:%s') as dailyTime,d.file_url as dailyUrl,
-                        case when w.id is null then 2 else 1 end as weekStatus,date_format(w.submit_time,'%H:%i:%s') as weekTime,w.file_url as weekUrl
+                        case when d.id is null then 2 else 1 end as dailyStatus,date_format(d.submit_time,'%H:%i:%s') as dailyTime,d.file_name as dailyName,d.file_url as dailyUrl,
+                        case when w.id is null then 2 else 1 end as weekStatus,date_format(w.submit_time,'%H:%i:%s') as weekTime,w.file_name as weekName,w.file_url as weekUrl
                  FROM duty_seat_duty_unit u
                           LEFT JOIN duty_seat_duty_unit_person up on u.id = up.unit_id and up.del_flag = 0
                             <if test="accountIds != null and accountIds.size() != 0">

duty-service/src/main/resources/mapper/DutyStatisticsMapper.xml

@@ -35,7 +35,7 @@
         ) t
     </select>
     <select id="queryAnalysisInfoByWeeks" resultType="AdminAnalysisInfo">
-        select t.*,format(t.normal/(t.normal + t.abnormal) * 100,2) as rate
+        select concat('第',t.date,'周') as date,t.normal,t.abnormal,format(t.normal/(t.normal + t.abnormal) * 100,2) as rate
         from (
         select week as date,count(case `status` when '1' then 1 end) as normal,count(case `status` when '2' then 1 end) as abnormal
         from duty_statistics