张丁 修改用户主管

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

@@ -5,13 +5,17 @@ import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.server.Sys;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.invoice.domain.TInvoiceUserUnit;
 import com.ruoyi.project.invoice.service.ITInvoiceUserUnitService;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -27,6 +31,9 @@ public class TInvoiceUserUnitController extends BaseController
     @Autowired
     private ITInvoiceUserUnitService tInvoiceUserUnitService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 查询用户单位管理列表
      */
@@ -62,6 +69,24 @@ public class TInvoiceUserUnitController extends BaseController
         return AjaxResult.success(tInvoiceUserUnitService.selectTInvoiceUserUnitById(id));
     }
 
+    /**
+     * 获取用户单位找到对应的用户主管的信息
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:unit:query')")
+    @GetMapping(value = "/getUserByUnit/{Unit}")
+    public AjaxResult getInfoByUnit(@PathVariable("Unit") Long id)
+    {
+        List<SysUser> sysUserList=new ArrayList<SysUser>();
+       List<TInvoiceUserUnit>  tInvoiceUserUnitList=  tInvoiceUserUnitService.selectTInvoiceUserUnitByUnit(id);
+              for(TInvoiceUserUnit t:tInvoiceUserUnitList){
+
+               SysUser sysUser =sysUserService.selectUserById(Long.parseLong(t.getUserIds()));
+                  sysUserList.add(sysUser);
+    };
+
+        return AjaxResult.success(sysUserList);
+    }
+
     /**
      * 新增用户单位管理
      */

master/src/main/java/com/ruoyi/project/invoice/domain/TInvoiceBookingworkticket.java

@@ -87,7 +87,7 @@ public class TInvoiceBookingworkticket extends BaseEntity
 
     /** 用户主管 */
     @Excel(name = "用户主管")
-    private Long userMg;
+    private String userMg;
 
     /** 用户单位 */
     @Excel(name = "用户单位")
@@ -249,12 +249,12 @@ public class TInvoiceBookingworkticket extends BaseEntity
     {
         return deptId;
     }
-    public void setUserMg(Long userMg)
+    public void setUserMg(String userMg)
     {
         this.userMg = userMg;
     }
 
-    public Long getUserMg()
+    public String getUserMg()
     {
         return userMg;
     }

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

@@ -20,6 +20,14 @@ public interface TInvoiceUserUnitMapper
      */
     public TInvoiceUserUnit selectTInvoiceUserUnitById(Long id);
 
+    /**
+     * 查询用户单位管理
+     *
+     * @param id 用户单位管理ID
+     * @return 用户单位管理
+     */
+    public List<TInvoiceUserUnit> selectTInvoiceUserUnitByUnit(Long id);
+
     /**
      * 查询用户单位管理列表
      * 

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

@@ -58,4 +58,12 @@ public interface ITInvoiceUserUnitService
      * @return 结果
      */
     public int deleteTInvoiceUserUnitById(Long id);
+
+    /**
+     * 根据用户单位查询对应信息
+     *
+     * @param id 用户单位管理
+     * @return
+     */
+    List<TInvoiceUserUnit> selectTInvoiceUserUnitByUnit(Long id);
 }

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

@@ -31,6 +31,18 @@ public class TInvoiceUserUnitServiceImpl implements ITInvoiceUserUnitService
         return tInvoiceUserUnitMapper.selectTInvoiceUserUnitById(id);
     }
 
+    /**
+     * 根据用户单位查询对应信息
+     *
+     * @param id 用户单位管理
+     * @return
+     */
+    @Override
+    public List<TInvoiceUserUnit> selectTInvoiceUserUnitByUnit(Long id)
+    {
+        return tInvoiceUserUnitMapper.selectTInvoiceUserUnitByUnit(id);
+    }
+
     /**
      * 查询用户单位管理列表
      *

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

@@ -46,6 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selectTInvoiceUserUnitByUnit" parameterType="Long" resultMap="TInvoiceUserUnitResult">
+        <include refid="selectTInvoiceUserUnitVo"/>
+        where user_unit = #{id}
+    </select>
+
     <insert id="insertTInvoiceUserUnit" parameterType="TInvoiceUserUnit">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_invoice_user_unit.NEXTVAL as id FROM DUAL

ui/src/api/invoice/unit.js

@@ -17,6 +17,14 @@ export function getUnit(id) {
   })
 }
 
+// 查询用户单位二级下拉框
+export function getUserByUnit(id) {
+  return request({
+    url: '/invoice/unit/getUserByUnit/' + id,
+    method: 'get'
+  })
+}
+
 // 新增用户单位管理
 export function addUnit(data) {
   return request({

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

@@ -258,9 +258,9 @@
           <el-select v-model="form.userMg" placeholder="请先选择好用户单位">
              <el-option
               v-for="dict in userMgOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="parseInt(dict.dictValue)"
+            :key="dict.userId"
+            :label="dict.nickName"
+            :value="dict.nickName"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -375,6 +375,8 @@
 import { listBookingworkticket, getBookingworkticket, delBookingworkticket, addBookingworkticket, updateBookingworkticket, exportBookingworkticket, importTemplate, seeBookingworkticket} from "@/api/invoice/bookingworkticket";
 import { listWorkcontent, getWorkcontent, delWorkcontent, addWorkcontent, updateWorkcontent, exportWorkcontent,getWorkcontentBybookingticketId} from "@/api/invoice/workcontent";
 import { listDevice, getDevice, delDevice, updateDevice, exportDevice} from "@/api/invoice/device";
+import { listUnit, getUnit, delUnit, addUnit, updateUnit, exportUnit,getUserByUnit} from "@/api/invoice/unit";
+import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus,userDataScope } from "@/api/system/user";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -529,9 +531,7 @@ export default {
     this.getDicts("book_floor_location").then(response => {
       this.floorLocationOptions = response.data;
     });
-    this.getDicts("book_user_mg").then(response => {
-      this.userMgOptions = response.data;
-    });
+   
       this.getDicts("book_user_unit").then(response => {
       this.userUnitOptions = response.data;
     });
@@ -550,15 +550,10 @@ export default {
 
   },
   methods: {
-    //查询用户单位下拉框
-     getOneCategorys() {
-      getOneCategorys().then(response => {
-        this.userUnitOptions = response.data;
-      });
-    },
     //根据用户单位 查询对应选择的用户主管  根据用户单位 字段 查找对应的多个主管 返回 Sysuser的集合(id,name)
         checkCategoryPromotion(oneId){
-      getTwoCategorys(oneId).then(response => {
+         
+      getUserByUnit(oneId).then(response => {
         this.form.userMg=null;
         this.userMgOptions = response.data;
         //   let arr=  response.data.userIds.split(',');