公众号部分字段缺失修复

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

@@ -134,4 +134,10 @@ public class WechatMyTaskDto {
 
     @ApiModelProperty(value = "处置结果")
     private String actionResult;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
 }

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

@@ -62,7 +62,9 @@
 			p.feedback_uname as feedbackUname,
 			p.feedback_finish_time as dealTime,
 			p.deal_org_name as dealOrg,
-			p.deal_user as dealUser
+			p.deal_user as dealUser,
+			e.longitude as longitude,
+			e.latitude as latitude
 			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/DispatchTaskController.java

@@ -309,6 +309,12 @@ public class DispatchTaskController extends BaseController {
 					if("action_result".equals(t.getFieldCode())) {
 						//	处置结果
 						temp.setActionResult(value);
+					} else if("main_feedback_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setRemark(value);
+					} else if("feedback_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setFeedbackResult(value);
 					}
 				});
                 imgMap = sourceFileService.getAttachments(temp.getPaperId());

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

@@ -615,6 +615,12 @@ public class WechatController extends BaseController {
 					if("action_result".equals(t.getFieldCode())) {
 						//	处置结果
 						temp.setActionResult(value);
+					}  else if("main_feedback_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setRemark(value);
+					} else if("feedback_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setFeedbackResult(value);
 					}
 				});
                 imgMap = sourceFileService.getAttachments(temp.getPaperId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java

@@ -551,6 +551,12 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     if("action_result".equals(t.getFieldCode())) {
                         //	处置结果
                         temp.setActionResult(value);
+                    } else if("main_feedback_result".equals(t.getFieldCode())) {
+                        // 维修结果
+                        temp.setRemark(value);
+                    } else if("feedback_result".equals(t.getFieldCode())) {
+                        // 维修结果
+                        temp.setFeedbackResult(value);
                     }
                 });
                 imgMap = sourceFileService.getAttachments(temp.getPaperId());
@@ -761,6 +767,12 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     if("action_result".equals(t.getFieldCode())) {
                         //	处置结果
                         temp.setActionResult(value);
+                    } else if("main_feedback_result".equals(t.getFieldCode())) {
+                        // 维修结果
+                        temp.setRemark(value);
+                    } else if("feedback_result".equals(t.getFieldCode())) {
+                        // 维修结果
+                        temp.setFeedbackResult(value);
                     }
                 });
                 errorImgMap = sourceFileService.getAttachments(temp.getSequenceNbr());