Merge remote-tracking branch 'origin/dev' into dev

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/FtGenerateOrderTask.java

@@ -3,6 +3,7 @@ package com.ruoyi.quartz.task;
 import com.ruoyi.system.fantang.mapper.FtReportMealVoMapper;
 import com.ruoyi.system.fantang.service.impl.FtFoodDemandDaoServiceImpl;
 import com.ruoyi.system.fantang.service.impl.FtOrderDaoServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -11,6 +12,7 @@ import org.springframework.stereotype.Component;
  *
  * @author ruoyi
  */
+@Slf4j
 @Component("OrderingTask")
 public class FtGenerateOrderTask {
 
@@ -18,7 +20,7 @@ public class FtGenerateOrderTask {
     private FtFoodDemandDaoServiceImpl foodDemandDaoService;
 
     @Autowired
-    private FtReportMealVoMapper ftReportMealVoMapper;
+    private FtReportMealVoMapper reportMealVoMapper;
 
     @Autowired
     private FtOrderDaoServiceImpl orderDaoService;
@@ -30,7 +32,7 @@ public class FtGenerateOrderTask {
 
     public void GeneratePatientTomorrowReportMeal() {
         System.out.println("生成次日病患报餐记录");
-        ftReportMealVoMapper.insertTomorrowReportMeal();
+        reportMealVoMapper.insertTomorrowReportMeal();
     }
 
     // 生成次日员工订餐记录
@@ -38,4 +40,23 @@ public class FtGenerateOrderTask {
         System.out.println("生成次日员工订餐记录");
         orderDaoService.GenerateStaffTomorrowOrder();
     }
+
+    // 更新用餐状态为用餐状态，用餐前提前2小时关闭报餐数据修改
+    public void updateBreakfastDinnerFlag() {
+      log.info("更新早餐数:{}", reportMealVoMapper.updateBreakfastDinnerFlag());
+    }
+
+    // 更新用餐状态为用餐状态，用餐前提前2小时关闭报餐数据修改
+    public void updateLunchDinnerFlag() {
+        log.info("更新午餐数:{}", reportMealVoMapper.updateLunchDinnerFlag());
+    }
+
+    // 更新用餐状态为用餐状态，用餐前提前2小时关闭报餐数据修改
+    public void updateDinnerDinnerFlag() {
+        log.info("更新晚餐数:{}", reportMealVoMapper.updateDinnerDinnerFlag());
+
+        log.info("更新加餐数:{}", reportMealVoMapper.updateAdditionDinnerFlag());
+
+    }
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java

@@ -219,6 +219,11 @@ public class ClientPatientController extends BaseController {
         return AjaxResult.success(list);
     }
 
+    /**
+     * 接收病患报餐数据，更新；生成报餐日志表
+     * @param list
+     * @return
+     */
     @PostMapping("/tomorrowReport")
     public AjaxResult tomorrowReport(@RequestBody JSONArray list){
         System.out.println(list);

ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java

@@ -5,6 +5,7 @@ import com.ruoyi.system.fantang.domain.FtReportMealsDao;
 import com.ruoyi.system.fantang.vo.FtReportMealVo;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -36,4 +37,17 @@ public interface FtReportMealVoMapper extends BaseMapper<FtReportMealVo> {
             "where FIND_IN_SET(f.food_id,d.foods)) as price, d.open_flag, 0, d.nutrition_food_id from ft_food_demand d " +
             "LEFT JOIN ft_patient p on p.patient_id = d.patient_id and p.off_flag = 0")
     public void insertTomorrowReportMeal();
+
+    @Update("UPDATE ft_report_meals set dining_flag =  1, dining_at = now() where type  = 1 and   create_at =CURDATE()")
+    Integer updateBreakfastDinnerFlag();
+
+    @Update("UPDATE ft_report_meals set dining_flag =  1, dining_at = now() where type  = 2 and   create_at =CURDATE()")
+    Integer updateLunchDinnerFlag();
+
+    @Update("UPDATE ft_report_meals set dining_flag =  1, dining_at = now() where type = 3  and   create_at =CURDATE()")
+    Integer updateDinnerDinnerFlag();
+
+    @Update("UPDATE ft_report_meals set dining_flag =  1, dining_at = now() where type = 4 and open_flag = 1  and   create_at =CURDATE()")
+    Integer updateAdditionDinnerFlag();
+
 }

ruoyi-ui/src/settings.js

@@ -14,7 +14,7 @@ module.exports = {
   /**
    * 是否显示 tagsView
    */
-  tagsView: true,
+  tagsView: false,
 
   /**
    * 是否固定头部

ruoyi-ui/src/views/fantang/returnManage/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="对应发票id" prop="invoiceId">
+      <el-form-item label="发票号" prop="invoiceId">
         <el-input
           v-model="queryParams.invoiceId"
-          placeholder="请输入对应发票id"
+          placeholder="请输入对应发票号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -27,37 +27,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="余额" prop="balancePrice">
+      <el-form-item label="回款情况" prop="returnFlag">
-        <el-input
-          v-model="queryParams.balancePrice"
-          placeholder="请输入余额"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="操作员" prop="opera">
-        <el-input
-          v-model="queryParams.opera"
-          placeholder="请输入操作员"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="凭证的图片url" prop="voucherUrl">
-        <el-input
-          v-model="queryParams.voucherUrl"
-          placeholder="请输入凭证的图片url"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否完成回款标志" prop="returnFlag">
         <el-input
           v-model="queryParams.returnFlag"
-          placeholder="请输入是否完成回款标志"
+          placeholder="请选择回款标志"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -114,17 +87,15 @@
     <el-table v-loading="loading" :data="returnManageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" v-if="false"/>
-      <el-table-column label="对应发票id" align="center" prop="invoiceId" />
+      <el-table-column label="发票号" align="center" prop="invoiceId" />
       <el-table-column label="回款日期" align="center" prop="returnAt" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.returnAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="回款金额" align="center" prop="returnPrice" />
-      <el-table-column label="余额" align="center" prop="balancePrice" />
+      <el-table-column label="待收余款" align="center" prop="balancePrice" />
-      <el-table-column label="操作员" align="center" prop="opera" />
+      <el-table-column label="回款情况" align="center" prop="returnFlag" />
-      <el-table-column label="凭证的图片url" align="center" prop="voucherUrl" />
-      <el-table-column label="是否完成回款标志" align="center" prop="returnFlag" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button