ソースを参照

民宿信息维护

lijie 2 年 前
コミット
db0ebe4223

+ 1 - 1
mhotel/src/com/happy/action/WorkflowAction.java

@@ -125,7 +125,7 @@ public class WorkflowAction  extends ActionSupport implements ServletRequestAwar
                         // 新的酒店图片
                         // 新的酒店图片
                         List<FileInfo> fileInfoList = fileService.queryList("and link_id ='"+workflow1.getId()+"'");
                         List<FileInfo> fileInfoList = fileService.queryList("and link_id ='"+workflow1.getId()+"'");
                         if (fileInfoList != null && fileInfoList.size() > 0){
                         if (fileInfoList != null && fileInfoList.size() > 0){
-                            //fileService.delLinkFile(String.valueOf(workflow1.getLinkId()));
+                            fileService.delLinkFile(String.valueOf(workflow1.getLinkId()));
                             fileInfoList.forEach(file -> {
                             fileInfoList.forEach(file -> {
                                 file.setLinkId(workflow1.getLinkId());
                                 file.setLinkId(workflow1.getLinkId());
                                 fileService.updateFile(file);
                                 fileService.updateFile(file);

+ 3 - 10
mhotel/src/com/happy/action/hotelAction.java

@@ -162,18 +162,11 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
                     int i = workflowService.insert(workflow);
                     int i = workflowService.insert(workflow);
                     m = hotelService.updateHotel(hotel);
                     m = hotelService.updateHotel(hotel);
                     if (i > 0 && m > 0){
                     if (i > 0 && m > 0){
-                        //删除所有关联的附件
-                        fileService.delLinkFile(String.valueOf(hotel.getId()));
                         //将新修改的附件关联到流程id
                         //将新修改的附件关联到流程id
                         for(FileInfo file : fileList){
                         for(FileInfo file : fileList){
-                            if ("".equals(file.getLinkId()) || file.getLinkId()==null || file.getLinkId().length() == 0){
-                                file.setLinkId(id);
-                                fileService.insertFile(file);
-                            }else {
-                                file.setId(String.valueOf(UUID.randomUUID()));
-                                file.setLinkId(String.valueOf(hotel.getId()));
-                                fileService.insertFile(file);
-                            }
+                            file.setId(String.valueOf(UUID.randomUUID()));
+                            file.setLinkId(id);
+                            fileService.insertFile(file);
                         }
                         }
                         hotel.setRemark(hotel1.getRemark());
                         hotel.setRemark(hotel1.getRemark());
                         resultJson.put("message", "已成功提交审批!");
                         resultJson.put("message", "已成功提交审批!");