更新导出和公众号相关代码

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatMyBusinessListDto.java

@@ -33,4 +33,10 @@ public class WechatMyBusinessListDto {
     @ApiModelProperty(value = "业务状态")
     private String bussinessStatus;
 
+    @ApiModelProperty(value = "上报时间")
+    private Date reportTime;
+
+    @ApiModelProperty(value = "完成时间")
+    private Date finishTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatMyTaskListDto.java

@@ -32,4 +32,10 @@ public class WechatMyTaskListDto {
     @ApiModelProperty(value = "派遣时间")
     private Date dispatchTime;
 
+    @ApiModelProperty(value = "上报时间")
+    private Date reportTime;
+
+    @ApiModelProperty(value = "完成时间")
+    private Date finishTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -471,7 +471,9 @@
 			a.alert_status as taskStatus,
 			e.address,
 			a.call_time as dispatchTime,
-			a.alert_stage as bussinessStatus
+			a.alert_stage as bussinessStatus,
+			a.call_time as reportTime,
+			p.feedback_finish_time as finishTime
 			from tz_alert_called a
 			LEFT JOIN tcb_elevator e on e.sequence_nbr = a.equipment_id
 			LEFT JOIN tz_dispatch_paper p on p.alert_id = a.sequence_nbr

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/DispatchTaskMapper.xml

@@ -78,7 +78,9 @@
 			a.alarm_type as taskType,
 			a.alert_status as taskStatus,
 			e.address,
-			p.dispatch_time as dispatch_time
+			p.dispatch_time as dispatch_time,
+			a.call_time as reportTime,
+			p.feedback_finish_time as finishTime
 			from tz_dispatch_task t
 			LEFT JOIN tz_alert_called a on a.sequence_nbr = t.alert_id
 			LEFT JOIN tcb_elevator e on e.sequence_nbr = a.equipment_id

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
@@ -411,7 +412,16 @@ public class AlertCalledController extends BaseController {
 			String sort) {
 		queryWrapper.eq("is_delete", 0);
 
-		queryWrapper.orderByDesc("call_time");
+		if(sort!=null) {  // 排序失效
+			String[] date=  sort.split(",");
+			if(date[1].equals("ascend")) {
+				queryWrapper.orderByAsc(RedisKey.humpToLine(date[0]));
+			}else {
+				queryWrapper.orderByDesc(RedisKey.humpToLine(date[0]));
+			}
+		}else {
+			queryWrapper.orderByDesc("call_time");
+		}
 
 		if (!ValidationUtil.isEmpty(alertCalled.getIsAuxiliaryScreen())) {
 			if (!ValidationUtil.isEmpty(alertCalled.getCallTimeStart())