Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/reservat/BomanReservatController.java

@@ -91,6 +91,16 @@ public class BomanReservatController extends BaseController
         return toAjax(bomanReservatService.updateBomanReservat(bomanReservat));
     }
 
+    /**
+     * 陵园预约审核
+     */
+    @PreAuthorize("@ss.hasPermi('system:reservat:sh')")
+    @PostMapping("/sh")
+    public AjaxResult examine(@RequestBody BomanReservat bomanReservat)
+    {
+        return toAjax(bomanReservatService.examine(bomanReservat));
+    }
+
     /**
      * 删除陵园预约
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/BomanReservat.java

@@ -82,6 +82,12 @@ public class BomanReservat extends BaseEntity
     @Excel(name = "接人人员id")
     private Long receptionId;
 
+    /** 接人人员姓名 */
+    private String receptionName;
+
+    /** 接人人员手机号 */
+    private String receptionPhone;
+
     /** 创建部门 */
     @Excel(name = "创建部门")
     private Long createDept;
@@ -240,31 +246,44 @@ public class BomanReservat extends BaseEntity
         return createDept;
     }
 
+    public String getReceptionName() {
+        return receptionName;
+    }
+
+    public String getReceptionPhone() {
+        return receptionPhone;
+    }
+
+    public void setReceptionName(String receptionName) {
+        this.receptionName = receptionName;
+    }
+
+    public void setReceptionPhone(String receptionPhone) {
+        this.receptionPhone = receptionPhone;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("reservatId", getReservatId())
-            .append("visitName", getVisitName())
-            .append("visitUnitName", getVisitUnitName())
-            .append("visitPhone", getVisitPhone())
-            .append("visitIdCard", getVisitIdCard())
-            .append("visitNum", getVisitNum())
-            .append("visitRemark", getVisitRemark())
-            .append("visitDate", getVisitDate())
-            .append("visitTime", getVisitTime())
-            .append("visitDateTime", getVisitDateTime())
-            .append("visitQr", getVisitQr())
-            .append("visitType", getVisitType())
-            .append("visitStatus", getVisitStatus())
-            .append("reservatType", getReservatType())
-            .append("isReception", getIsReception())
-            .append("receptionId", getReceptionId())
-            .append("createDept", getCreateDept())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "BomanReservat{" +
+                "reservatId=" + reservatId +
+                ", visitName='" + visitName + '\'' +
+                ", visitUnitName='" + visitUnitName + '\'' +
+                ", visitPhone='" + visitPhone + '\'' +
+                ", visitIdCard='" + visitIdCard + '\'' +
+                ", visitNum='" + visitNum + '\'' +
+                ", visitRemark='" + visitRemark + '\'' +
+                ", visitDate=" + visitDate +
+                ", visitTime='" + visitTime + '\'' +
+                ", visitDateTime=" + visitDateTime +
+                ", visitQr='" + visitQr + '\'' +
+                ", visitType='" + visitType + '\'' +
+                ", visitStatus='" + visitStatus + '\'' +
+                ", reservatType='" + reservatType + '\'' +
+                ", isReception='" + isReception + '\'' +
+                ", receptionId=" + receptionId +
+                ", receptionName='" + receptionName + '\'' +
+                ", receptionPhone='" + receptionPhone + '\'' +
+                ", createDept=" + createDept +
+                '}';
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IBomanReservatService.java

@@ -58,4 +58,6 @@ public interface IBomanReservatService
      * @return 结果
      */
     public int deleteBomanReservatByReservatId(Long reservatId);
+
+    int examine(BomanReservat bomanReservat);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanReservatServiceImpl.java

@@ -54,6 +54,9 @@ public class BomanReservatServiceImpl implements IBomanReservatService
     public int insertBomanReservat(BomanReservat bomanReservat)
     {
         bomanReservat.setCreateTime(DateUtils.getNowDate());
+        if("2".equals(bomanReservat.getReservatType())){
+            bomanReservat.setVisitType("3");
+        }
         return bomanReservatMapper.insertBomanReservat(bomanReservat);
     }
 
@@ -93,4 +96,10 @@ public class BomanReservatServiceImpl implements IBomanReservatService
     {
         return bomanReservatMapper.deleteBomanReservatByReservatId(reservatId);
     }
+
+    @Override
+    public int examine(BomanReservat bomanReservat) {
+        bomanReservat.setUpdateTime(DateUtils.getNowDate());
+        return bomanReservatMapper.updateBomanReservat(bomanReservat);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/BomanReservatMapper.xml

@@ -21,6 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reservatType"    column="reservat_type"    />
         <result property="isReception"    column="is_reception"    />
         <result property="receptionId"    column="reception_id"    />
+        <result property="receptionName"    column="reception_name"    />
+        <result property="receptionPhone"    column="reception_phone"    />
         <result property="createDept"    column="create_dept"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -51,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reservatType != null  and reservatType != ''"> and reservat_type = #{reservatType}</if>
             <if test="isReception != null  and isReception != ''"> and is_reception = #{isReception}</if>
             <if test="receptionId != null "> and reception_id = #{receptionId}</if>
+            <if test="receptionName != null "> and reception_name = #{receptionName}</if>
+            <if test="receptionPhone != null "> and reception_phone = #{receptionPhone}</if>
             <if test="createDept != null "> and create_dept = #{createDept}</if>
         </where>
     </select>
@@ -78,6 +82,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reservatType != null">reservat_type,</if>
             <if test="isReception != null">is_reception,</if>
             <if test="receptionId != null">reception_id,</if>
+
+            <if test="receptionName != null "> reception_name,</if>
+            <if test="receptionPhone != null "> reception_phone,</if>
+
             <if test="createDept != null">create_dept,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -101,6 +109,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reservatType != null">#{reservatType},</if>
             <if test="isReception != null">#{isReception},</if>
             <if test="receptionId != null">#{receptionId},</if>
+
+            <if test="receptionName != null "> #{receptionName},</if>
+            <if test="receptionPhone != null "> #{receptionPhone},</if>
+
             <if test="createDept != null">#{createDept},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -128,6 +140,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reservatType != null">reservat_type = #{reservatType},</if>
             <if test="isReception != null">is_reception = #{isReception},</if>
             <if test="receptionId != null">reception_id = #{receptionId},</if>
+
+            <if test="receptionName != null "> reception_name = #{receptionName},</if>
+            <if test="receptionPhone != null "> reception_phone = #{receptionPhone},</if>
+
             <if test="createDept != null">create_dept = #{createDept},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>