Browse Source

流程审批民宿信息维护首图添加

lijie 2 years ago
parent
commit
143dd342e5

+ 5 - 0
mhotel/src/com/happy/Model/Workflow.java

@@ -58,6 +58,11 @@ public class Workflow {
     private String createDate;
 
     /**
+     * 民宿信息封面图
+     */
+    private String coverImg;
+
+    /**
      * 附件列表
      */
     List<FileInfo> fileInfoList;

+ 19 - 4
mhotel/src/com/happy/action/WorkflowAction.java

@@ -2,16 +2,14 @@ package com.happy.action;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.happy.Model.Booking;
-import com.happy.Model.BookingComment;
-import com.happy.Model.FileInfo;
-import com.happy.Model.Workflow;
+import com.happy.Model.*;
 import com.happy.Until.GetHttpParam;
 import com.happy.Until.ResUtil;
 import com.happy.Until.UUIDUtil;
 import com.happy.dto.IPage;
 import com.happy.service.BookingCommentService;
 import com.happy.service.FileService;
+import com.happy.service.HotelService;
 import com.happy.service.WorkflowService;
 import com.opensymphony.xwork2.ActionSupport;
 import net.sf.json.JSONObject;
@@ -39,6 +37,8 @@ public class WorkflowAction  extends ActionSupport implements ServletRequestAwar
     public WorkflowService workflowService;
     @Resource
     public FileService fileService;
+    @Resource
+    public HotelService hotelService;
     @Resource(name = "BookingCommentService")
     private BookingCommentService bookingCommentService;
     public HttpServletRequest getRequest() {
@@ -130,6 +130,21 @@ public class WorkflowAction  extends ActionSupport implements ServletRequestAwar
                             fileService.updateFile(file);
                         });
                         workflow1.setStatus(2);//审批通过
+                        //民宿信息修改
+                        Hotel hotel = new Hotel();
+                        boolean isUpdateHotel = false;
+                        if (workflow1.getCoverImg() != null && !"".equals(workflow1.getCoverImg())){
+                            hotel.setCoverImg(workflow1.getCoverImg());
+                            isUpdateHotel = true;
+                        }
+                        if (workflow1.getRemark() != null && !"".equals(workflow1.getRemark())){
+                            hotel.setRemark(workflow1.getRemark());
+                            isUpdateHotel = true;
+                        }
+                        if (isUpdateHotel){
+                            hotel.setId(Integer.valueOf(workflow1.getLinkId()));
+                            hotelService.updateHotel(hotel);
+                        }
                     }else {//审批拒绝
                         workflow1.setStatus(3); //拒绝审批
                     }

+ 6 - 0
mhotel/src/com/happy/action/hotelAction.java

@@ -127,6 +127,10 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
                 if (!hotel1.getRemark().equals(hotel.getRemark())){
                     isOk = true;
                 }
+                //判断是否修改了封面图
+                if (!hotel1.getCoverImg().equals(hotel.getCoverImg()) && hotel.getCoverImg() != null && !"".equals(hotel.getCoverImg())){
+                    isOk = true;
+                }
                 //判断是否修改图片
                 for(FileInfo file : fileList){
                     if ( "".equals(file.getLinkId()) || file.getLinkId()==null || file.getLinkId().length() == 0) {
@@ -143,7 +147,9 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
                     workflow.setId(id);
                     workflow.setStatus(1);
                     workflow.setType(1);
+                    workflow.setCoverImg(hotel.getCoverImg());
                     hotel.setRemark(hotel1.getRemark());
+                    hotel.setCoverImg(hotel1.getCoverImg());
                     int i = workflowService.insert(workflow);
                     m = hotelService.updateHotel(hotel);
                     if (i > 0 && m > 0){

+ 8 - 3
mhotel/src/com/happy/dao/impl/WorkflowImplDao.java

@@ -32,7 +32,7 @@ public class WorkflowImplDao implements WorkflowDao {
         this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
     }
 
-    private String selectSql = " select a.id,a.link_id,a.type,a.title,a.status,a.remark,a.create_id,a.workflow_date,date_format(a.create_date, '%Y-%m-%d') as create_date,a.workflow_remark,a.workflow_name, " +
+    private String selectSql = " select a.id,a.link_id,a.type,a.title,a.status,a.remark,a.create_id,a.workflow_date,a.cover_img,date_format(a.create_date, '%Y-%m-%d') as create_date,a.workflow_remark,a.workflow_name, " +
                                 " case when a.type = 1 then b.hname when a.type = 2 then c.user_name else null end as createName "+
                                 " from workflow a " +
                                 " left join hotel b on a.type = 1 and a.create_id = b.id " +
@@ -41,8 +41,8 @@ public class WorkflowImplDao implements WorkflowDao {
 
     @Override
     public int insert(Workflow workflow) {
-        String sql = "insert into `workflow`(id,link_id,type,title,status,remark,create_id,create_date)" +
-                "values(:id,:link_id,:type,:title,:status,:remark,:create_id,:create_date) ";
+        String sql = "insert into `workflow`(id,link_id,type,title,status,remark,create_id,create_date,cover_img)" +
+                "values(:id,:link_id,:type,:title,:status,:remark,:create_id,:create_date,:cover_img) ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("link_id",workflow.getLinkId());
         sps.addValue("type",workflow.getType());
@@ -51,6 +51,7 @@ public class WorkflowImplDao implements WorkflowDao {
         sps.addValue("remark",workflow.getRemark());
         sps.addValue("create_id",workflow.getCreateId());
         sps.addValue("create_date",UUIDUtil.getNewDate());
+        sps.addValue("cover_img",workflow.getCoverImg());
         if (workflow.getId() == null) {
             sps.addValue("id", String.valueOf(UUID.randomUUID()));
         } else {
@@ -155,6 +156,10 @@ public class WorkflowImplDao implements WorkflowDao {
             stringBuffer.append(" workflow_name=:workflow_name ,");
             sps.addValue("workflow_name",workflow.getWorkflowName());
         }
+        if (!Func.checkNull(workflow.getCoverImg())){
+            stringBuffer.append(" workflow_date=:workflow_date ,");
+            sps.addValue("cover_img",workflow.getCoverImg());
+        }
         if (!Func.checkNull(workflow.getWorkflowDate())){
             stringBuffer.append(" workflow_date=:workflow_date ");
             sps.addValue("workflow_date",workflow.getWorkflowDate());