-修改装置主管查询

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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.invoice.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -132,11 +133,10 @@ public class TApproveReserveInvoiceController extends BaseController {
 //            workService.updateById(invoice);
             TInvoiceDevice device = new TInvoiceDevice();
             device.setWorkArea(invoice.getWorkArea());
-            List<TInvoiceDevice> tInvoiceDevices = deviceService.selectTInvoiceDeviceList(device);
-            for (TInvoiceDevice tInvoiceDevice : tInvoiceDevices)   {
-                devSupId = tInvoiceDevice.getRegionalHead();
-                logger.info("========devSupId:" + devSupId);
-            }
+            TInvoiceDevice tInvoiceDevice = deviceService.selectRegionalHeadByWorkArea(invoice.getWorkArea());
+            logger.info("========tInvoiceDevice:" + JSON.toJSONString(tInvoiceDevice));
+            devSupId = tInvoiceDevice.getRegionalHead();
+            logger.info("========devSupId:" + devSupId);
         }
         //开始工作流、监听
         Authentication.setAuthenticatedUserId(applyUser);//设置当前申请人

master/src/main/java/com/ruoyi/project/invoice/mapper/TInvoiceDeviceMapper.java

@@ -1,28 +1,30 @@
 package com.ruoyi.project.invoice.mapper;
 
-import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.invoice.domain.TInvoiceDevice;
 
+import java.util.List;
+
 /**
  * 装置区域管理Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-09-06
  */
-public interface TInvoiceDeviceMapper 
+public interface TInvoiceDeviceMapper
 {
     /**
      * 查询装置区域管理
-     * 
+     *
      * @param id 装置区域管理ID
      * @return 装置区域管理
      */
     public TInvoiceDevice selectTInvoiceDeviceById(Long id);
+    public TInvoiceDevice selectRegionalHeadByWorkArea(String workArea);
 
     /**
      * 查询装置区域管理列表
-     * 
+     *
      * @param tInvoiceDevice 装置区域管理
      * @return 装置区域管理集合
      */
@@ -31,7 +33,7 @@ public interface TInvoiceDeviceMapper
 
     /**
      * 新增装置区域管理
-     * 
+     *
      * @param tInvoiceDevice 装置区域管理
      * @return 结果
      */
@@ -39,7 +41,7 @@ public interface TInvoiceDeviceMapper
 
     /**
      * 修改装置区域管理
-     * 
+     *
      * @param tInvoiceDevice 装置区域管理
      * @return 结果
      */
@@ -47,7 +49,7 @@ public interface TInvoiceDeviceMapper
 
     /**
      * 删除装置区域管理
-     * 
+     *
      * @param id 装置区域管理ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TInvoiceDeviceMapper
 
     /**
      * 批量删除装置区域管理
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/invoice/service/ITInvoiceDeviceService.java

@@ -1,27 +1,29 @@
 package com.ruoyi.project.invoice.service;
 
-import java.util.List;
 import com.ruoyi.project.invoice.domain.TInvoiceDevice;
 
+import java.util.List;
+
 /**
  * 装置区域管理Service接口
- * 
+ *
  * @author ruoyi
  * @date 2022-09-06
  */
-public interface ITInvoiceDeviceService 
+public interface ITInvoiceDeviceService
 {
     /**
      * 查询装置区域管理
-     * 
+     *
      * @param id 装置区域管理ID
      * @return 装置区域管理
      */
     public TInvoiceDevice selectTInvoiceDeviceById(Long id);
+    public TInvoiceDevice selectRegionalHeadByWorkArea(String workArea);
 
     /**
      * 查询装置区域管理列表
-     * 
+     *
      * @param tInvoiceDevice 装置区域管理
      * @return 装置区域管理集合
      */
@@ -29,7 +31,7 @@ public interface ITInvoiceDeviceService
 
     /**
      * 新增装置区域管理
-     * 
+     *
      * @param tInvoiceDevice 装置区域管理
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface ITInvoiceDeviceService
 
     /**
      * 修改装置区域管理
-     * 
+     *
      * @param tInvoiceDevice 装置区域管理
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface ITInvoiceDeviceService
 
     /**
      * 批量删除装置区域管理
-     * 
+     *
      * @param ids 需要删除的装置区域管理ID
      * @return 结果
      */
@@ -53,7 +55,7 @@ public interface ITInvoiceDeviceService
 
     /**
      * 删除装置区域管理信息
-     * 
+     *
      * @param id 装置区域管理ID
      * @return 结果
      */

master/src/main/java/com/ruoyi/project/invoice/service/impl/TInvoiceDeviceServiceImpl.java

@@ -30,6 +30,11 @@ public class TInvoiceDeviceServiceImpl implements ITInvoiceDeviceService
     {
         return tInvoiceDeviceMapper.selectTInvoiceDeviceById(id);
     }
+    @Override
+    public TInvoiceDevice selectRegionalHeadByWorkArea(String workArea)
+    {
+        return tInvoiceDeviceMapper.selectRegionalHeadByWorkArea(workArea);
+    }
 
     /**
      * 查询装置区域管理列表

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

@@ -44,6 +44,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ${params.dataScope}
     </select>
 
+    <select id="selectRegionalHeadByWorkArea" parameterType="String" resultMap="TInvoiceDeviceResult">
+        select regional_head  from t_invoice_device d
+        <where>
+            <if test="workArea != null  and workArea != ''"> and work_area = #{workArea}</if>
+            and d.del_flag = 0
+        </where>
+    </select>
+
     <select id="selectTInvoiceDeviceAllList"  resultType="java.lang.String">
         select d.work_area  from t_invoice_device d                                                                                                                                                   left join sys_dept s on s.dept_id = d.dept_id
         where d.del_flag = 0

ui/src/views/approve/approveDetail/invoice-detail.vue

@@ -91,7 +91,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" :disabled="isDevSup"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -100,7 +100,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="楼层位置" prop="floorLocation">
-              <el-select v-model="form.floorLocation" multiple placeholder="请选择楼层位置">
+              <el-select v-model="form.floorLocation" multiple placeholder="请选择楼层位置" :disabled="isDevSup">
                 <el-option
                   v-for="dict in floorLocationOptions"
                   :key="dict.dictValue"
@@ -113,16 +113,17 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label=" 作业开始" prop="workStartTime">
+            <el-form-item label="作业时间" prop="workStartTime" >
               <el-date-picker clearable size="small" style="width: 190px"
                               v-model="form.workStartTime"
                               type="date"
+                              :disabled="isDevSup"
                               value-format="yyyy-MM-dd"
-                              placeholder="选择 作业开始时间">
+                              placeholder="选择作业时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+<!--          <el-col :span="12">
             <el-form-item label="作业结束" prop="workEndTime">
               <el-date-picker clearable size="small" style="width: 190px"
                               v-model="form.workEndTime"
@@ -131,7 +132,7 @@
                               placeholder="选择作业结束时间">
               </el-date-picker>
             </el-form-item>
-          </el-col>
+          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">