更新文件 hotelAction.java

mhotel/src/com/happy/action/hotelAction.java

@@ -148,7 +148,8 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
                     }
                 }
                 //判断图片是否有删除
-                List<FileInfo> fileInfoList = fileService.queryList("and link_id ='"+hotel.getManagerId()+"'");
+                List<FileInfo> fileInfoList = fileService.queryList("and link_id ='"+hotel.getManagerId()+"'  and (`name` is null or `name` not like '%营业执照%') ");
+                System.out.println("==="+fileInfoList+"==="+fileList);
                 if (fileInfoList != null){
                     if (fileInfoList.size() != fileList.size()){
                         isOk = true;
@@ -167,7 +168,7 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
                     workflow.setType(1);
                     workflow.setCoverImg(hotel.getCoverImg());
                     hotel.setRemark(hotel1.getRemark());
-                    hotel.setCoverImg(hotel1.getCoverImg());
+                    hotel.setCoverImg(hotel.getCoverImg());
                     int i = workflowService.insert(workflow);
                     m = hotelService.updateHotel(hotel);
                     if (i > 0 && m > 0){
@@ -175,8 +176,21 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
                         for(FileInfo file : fileList){
                             file.setId(String.valueOf(UUID.randomUUID()));
                             file.setLinkId(id);
+                            System.out.println(file.getLinkId());
                             fileService.insertFile(file);
                         }
+                        if(hotel.getId()!= null){
+                            fileService.delLinkFile2(String.valueOf(hotel.getManagerId()), " and (`name` is null or `name` not like '%营业执照%') ");
+                        }
+                        for(FileInfo file : fileList){
+                            FileInfo fileInfo = fileService.getById(file.getId());
+                            file.setLinkId(String.valueOf(hotel.getManagerId()));
+                            if(fileInfo==null){
+                                fileService.insertFile(file);
+                            }else{
+                                fileService.updateFile(file);
+                            }
+                        }
                         hotel.setRemark(hotel1.getRemark());
                         resultJson.put("message", "已成功提交审批！");
                         resultJson.put("code", 200);
@@ -200,7 +214,7 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
             }
             if (m > 0) {
                 if(hotel.getId()!= null){
-                    fileService.delLinkFile(String.valueOf(hotel.getId()));
+                    fileService.delLinkFile2(String.valueOf(hotel.getManagerId()), " and (`name` is null or `name` not like '%营业执照%') ");
                 }
                 for(FileInfo file : fileList){
                     FileInfo fileInfo = fileService.getById(file.getId());