LY 预约续票

master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceBookingworkticketController.java

@@ -142,11 +142,11 @@ public class TInvoiceBookingworkticketController extends BaseController
                 TInvoiceBookingworkticket bookingworkticket=tInvoiceBookingworkticketService.selectTInvoiceBookingworkticketById(workcontent.getBookingticketId());
                 workcontent.setBookingworkticket(bookingworkticket);
         }
-        //除去作废的票
+        //除去作废的票 以及 续票
         Iterator<TInvoiceWorkcontent> iterator = tInvoiceWorkcontentList.iterator();
         while (iterator.hasNext()) {
             TInvoiceWorkcontent t = iterator.next();
-            if (t.getBookingworkticket().getStatus() !=  3) {
+            if (t.getBookingworkticket().getStatus() !=  3 || t.getXpxp().equals("12")) {
                 iterator.remove();
             }
         }
@@ -225,13 +225,12 @@ public class TInvoiceBookingworkticketController extends BaseController
                 row.createCell(2).setCellValue(new SimpleDateFormat("yyyy/MM/dd").format(t.getBookingworkticket().getWorkStartTime()));
             }
             //
-            if (t.getBookingworkticket().getWorkEndTime()!= null){
-                row.createCell(3).setCellValue(new SimpleDateFormat("yyyy/MM/dd").format(t.getBookingworkticket().getWorkEndTime()));
+            if (t.getBookingworkticket().getWorkStartTime()!= null){
+                row.createCell(3).setCellValue(new SimpleDateFormat("yyyy/MM/dd").format(t.getBookingworkticket().getWorkStartTime()));
             }
             //作业地址
             if (t.getWorkDescription()!= null){
-                        row.createCell(4).setCellValue(t.getWorkDescription());
-
+                 row.createCell(4).setCellValue(t.getWorkDescription());
             }
             row.createCell(5).setCellValue("是");
             //作业单位

master/src/main/resources/mybatis/invoice/TInvoiceBookingworkticketMapper.xml

@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTInvoiceBookingworkticketList" parameterType="TInvoiceBookingworkticket" resultMap="TInvoiceBookingworkticketResult">
         <include refid="selectTInvoiceBookingworkticketVo"/>
         <where>
-            <if test="workUnit != null and workUnit != ''"> and work_unit = #{workUnit}</if>
+            <if test="workUnit != null and workUnit != ''"> and work_unit like concat(concat('%', #{workUnit}), '%')</if>
             <if test="workArea != null and workArea != ''"> and work_area = #{workArea}</if>
             <if test="unitNumber != null and unitNumber != ''"> and unit_number = #{unitNumber}</if>
             <if test="floorLocation != null and floorLocation != ''"> and floor_location = #{floorLocation}</if>
@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bookingticketId != null "> and bookingticket_id = #{bookingticketId}</if>
             <if test="reservationNumber != null  and reservationNumber != ''"> and reservation_number = #{reservationNumber}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>-->
-            <if test="workUnit != null and workUnit != ''"> and b.work_unit = #{workUnit}</if>
+            <if test="workUnit != null and workUnit != ''">and work_unit like concat(concat('%', #{workUnit}), '%')</if>
             <if test="workArea != null and workArea != ''"> and b.work_area = #{workArea}</if>
             <if test="floorLocation != null and floorLocation != ''"> and FIND_IN_SET (#{floorLocation},b.floor_location) >0</if>
             <if test="workStartTime != null "> and b.work_start_time = #{workStartTime}</if>

ui/src/views/invoice/bookingworkticket/index.vue

@@ -11,7 +11,7 @@
         />
       </el-form-item>
       <el-form-item label="作业区域" prop="workArea">
-        <el-select v-model="queryParams.workArea" placeholder="请选择作业区域" clearable size="small" @change="handleQuery">
+        <el-select v-model="queryParams.workArea" placeholder="请选择作业区域" clearable size="small" @change="handleQuery" filterable>
           <el-option
             v-for="dict in workAreaOptions"
             :key="dict.id"
@@ -22,7 +22,7 @@
       </el-form-item>
       <el-form-item label="楼层位置" prop="floorLocation">
         <el-select v-model="queryParams.floorLocation" placeholder="请选择楼层位置" clearable size="small"
-                   @change="handleQuery">
+                   @change="handleQuery" filterable>
           <el-option
             v-for="dict in floorLocationOptions"
             :key="dict.dictValue"
@@ -31,35 +31,27 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label=" 作业开始时间" prop="workStartTime">
+      <el-form-item label="预约作业日期" prop="workStartTime">
         <el-date-picker clearable size="small" style="width: 200px"
                         v-model="queryParams.workStartTime"
                         type="date"
                         value-format="yyyy-MM-dd"
-                        placeholder="选择 作业开始时间"
+                        placeholder="选择预约作业日期"
                         @input="handleQuery">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="作业结束时间" prop="workEndTime">
-        <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams.workEndTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择作业结束时间"
-                        @input="handleQuery">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="作业创建时间" prop="createdate">
+
+      <el-form-item label="创建时间" prop="createdate">
         <el-date-picker clearable size="small" style="width: 200px"
                         v-model="queryParams.createdate"
                         type="date"
                         value-format="yyyy-MM-dd"
-                        placeholder="选择作业创建时间"
+                        placeholder="选择创建时间"
                         @input="handleQuery">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="作业类型" prop="workType">
-        <el-select v-model="queryParams.workType" placeholder="请选择作业类型" clearable size="small" @change="handleQuery">
+        <el-select v-model="queryParams.workType" placeholder="请选择作业类型" clearable size="small" @change="handleQuery" filterable>
           <el-option
             v-for="dict in workTypeOptions"
             :key="dict.dictValue"
@@ -68,24 +60,24 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="联系人" prop="contact">
-        <el-input
-          v-model="queryParams.contact"
-          placeholder="请输入联系人"
-          clearable
-          size="small"
-          @input="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系方式" prop="phonenumber">
-        <el-input
-          v-model="queryParams.phonenumber"
-          placeholder="请输入联系方式"
-          clearable
-          size="small"
-          @input="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="联系人" prop="contact">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.contact"-->
+<!--          placeholder="请输入联系人"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @input="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="联系方式" prop="phonenumber">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.phonenumber"-->
+<!--          placeholder="请输入联系方式"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @input="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -355,7 +347,7 @@
         </el-row>
       </el-form>
       <el-card v-for="(ruleForm, index) in ruleForm" :key="index" shadow="always">
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
           <el-row>
             <el-col :span="18">
               <el-form-item label="作业内容描述" prop="workDescription">
@@ -396,12 +388,12 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="作业人数" prop="workPeopleNumber">
-                <el-input v-model="ruleForm.workPeopleNumber"></el-input>
+                <el-input-number v-model="ruleForm.workPeopleNumber" :min="1" :max="999" ></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="预计作业时间" prop="estimateWorktime">
-                <el-input v-model="ruleForm.estimateWorktime"></el-input>
+                <el-input-number v-model="ruleForm.estimateWorktime" :min="1" :max="999" ></el-input-number>H
               </el-form-item>
             </el-col>
           </el-row>