Merge branch 'master' of http://192.168.1.222:3000/zhoufan/zxkf_api

zxkf-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -244,7 +244,7 @@ public class WorkOrderBaseController extends BaseController {
 
         String dealContent="";
         if(!StringHelper.isEmpty(input.getResult())){
-            dealContent=",回复内容："+input.getResult();
+            dealContent="，回复内容："+input.getResult();
 
         }
         if (result) {
@@ -502,7 +502,7 @@ public class WorkOrderBaseController extends BaseController {
                 HashMap<String, String> fileInfo = new HashMap<String, String>();
                 for (SysAccessories accessories : accessoriesList
                 ) {
-                    fileInfo.put(accessories.getOriname(), accessories.getFileurl());
+                    fileInfo.put(accessories.getFileid().toString(), accessories.getFileurl());
                 }
                 ov.setFileurl(fileInfo);
             }
@@ -687,7 +687,7 @@ public class WorkOrderBaseController extends BaseController {
         workorderbaseService.updateBatch(qw);
 
         if (!StringHelper.isEmpty(reason)) {
-            reason = ",原因：" + reason;
+            reason = "，原因：" + reason;
         }
         boolean logresult = addlog("重启了工单" + reason, "重启", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");
         return Success("重启成功");

zxkf-api/src/main/java/api/controller/order/WorkOrderOperateLogController.java

@@ -126,7 +126,7 @@ public class WorkOrderOperateLogController extends BaseController {
                 HashMap<String, String> fileInfo = new HashMap<String, String>();
                 for (SysAccessories accessories : accessoriesList
                 ) {
-                    fileInfo.put(accessories.getOriname(), accessories.getFileurl());
+                    fileInfo.put(accessories.getFileid().toString(), accessories.getFileurl());
                 }
                 ov.setFileurl(fileInfo);
             }