修复了装置区域管理，用户单位管理导出数据展示

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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.invoice.controller;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -8,11 +9,12 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.invoice.domain.TInvoiceDevice;
 import com.ruoyi.project.invoice.service.ITInvoiceDeviceService;
+import com.ruoyi.project.system.service.ISysDeptService;
+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;
 
 /**
@@ -28,6 +30,12 @@ public class TInvoiceDeviceController extends BaseController
     @Autowired
     private ITInvoiceDeviceService tInvoiceDeviceService;
 
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 查询装置区域管理列表
      */
@@ -61,6 +69,19 @@ public class TInvoiceDeviceController extends BaseController
     public AjaxResult export(TInvoiceDevice tInvoiceDevice)
     {
         List<TInvoiceDevice> list = tInvoiceDeviceService.selectTInvoiceDeviceList(tInvoiceDevice);
+
+        for (TInvoiceDevice invoiceDevice : list) {
+            if (invoiceDevice.getDeptId()==4L){
+                invoiceDevice.setDeptName("N/A");
+            }
+            String regionalHeadName="";
+            for (String userId : invoiceDevice.getRegionalHead().split(",")) {
+                regionalHeadName+=sysUserService.selectUserById(Long.parseLong(userId)).getNickName()+",";
+            }
+            if (StringUtils.isNotEmpty(regionalHeadName)) {
+                invoiceDevice.setRegionalHeadName(regionalHeadName.substring(0,regionalHeadName.length()-1));
+            }
+        }
         ExcelUtil<TInvoiceDevice> util = new ExcelUtil<TInvoiceDevice>(TInvoiceDevice.class);
         return util.exportExcel(list, "device");
     }

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

@@ -5,7 +5,6 @@ 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;
@@ -54,7 +53,10 @@ public class TInvoiceUserUnitController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(TInvoiceUserUnit tInvoiceUserUnit)
     {
-        List<TInvoiceUserUnit> list = tInvoiceUserUnitService.selectTInvoiceUserUnitList(tInvoiceUserUnit);
+        List<TInvoiceUserUnit> list = tInvoiceUserUnitService.selectTInvoiceUserUnitListToExcel(tInvoiceUserUnit);
+        for (TInvoiceUserUnit invoiceUserUnit : list) {
+            invoiceUserUnit.setDeptName(invoiceUserUnit.getDeptId() == 4L ? "N/A" : invoiceUserUnit.getDeptName());
+        }
         ExcelUtil<TInvoiceUserUnit> util = new ExcelUtil<TInvoiceUserUnit>(TInvoiceUserUnit.class);
         return util.exportExcel(list, "unit");
     }

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

@@ -31,14 +31,19 @@ public class TInvoiceDevice extends BaseEntity
     private String workArea;
 
     /** 区域负责人 */
-    @Excel(name = "区域负责人")
     private String regionalHead;
 
+    @TableField(exist = false)
+    @Excel(name = "区域负责人")
+    private String regionalHeadName;
+
     /** 状态 0 ：正常 ；-1：删除 */
     private Long delFlag;
 
     /** 创建人 */
     @Excel(name = "创建人")
+    private String createrName;
+
     private String createrCode;
 
     /** 创建时间 */
@@ -47,24 +52,43 @@ public class TInvoiceDevice extends BaseEntity
     private Date createdate;
 
     /** 修改人 */
-    @Excel(name = "修改人")
+   // @Excel(name = "修改人")
     private Long updaterCode;
 
     /** 修改时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+   // @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
 
+    @TableField(exist = false)
+    @Excel(name = "部门名称")
+    private String deptName;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 
-    @TableField(exist = false)
-    private String deptName;
+
+
+    public String getRegionalHeadName() {
+        return regionalHeadName;
+    }
+
+    public void setRegionalHeadName(String regionalHeadName) {
+        this.regionalHeadName = regionalHeadName;
+    }
+
+    public String getCreaterName() {
+        return createrName;
+    }
+
+    public void setCreaterName(String createrName) {
+        this.createrName = createrName;
+    }
 
     public String getDeptName() {
         return deptName;

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

@@ -27,7 +27,10 @@ public class TInvoiceUserUnit extends BaseEntity
     private String userUnit;
 
     /** 用户 */
+    @TableField(exist = false)
     @Excel(name = "用户")
+    private String nickName;
+
     private String userIds;
 
     /** 状态 0 ：正常 ；-1：删除 */
@@ -43,27 +46,29 @@ public class TInvoiceUserUnit extends BaseEntity
     private Date createdate;
 
     /** 修改人 */
-    @Excel(name = "修改人")
+    //@Excel(name = "修改人")
     private Long updaterCode;
 
     /** 修改时间 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+   // @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
     /** 部门编号 */
     @Excel(name = "部门编号")
     private Long deptId;
 
+    @Excel(name = "部门名称")
+    @TableField(exist = false)
+    private String deptName;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 
-    @TableField(exist = false)
-    private String deptName;
 
-    @TableField(exist = false)
-    private String nickName;
+
+
 
     public String getNickName() {
         return nickName;

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

@@ -1,20 +1,21 @@
 package com.ruoyi.project.invoice.mapper;
 
-import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import com.ruoyi.project.invoice.domain.TInvoiceUserUnit;
 
+import java.util.List;
+
 /**
  * 用户单位管理Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-09-07
  */
-public interface TInvoiceUserUnitMapper 
+public interface TInvoiceUserUnitMapper
 {
     /**
      * 查询用户单位管理
-     * 
+     *
      * @param id 用户单位管理ID
      * @return 用户单位管理
      */
@@ -30,16 +31,19 @@ public interface TInvoiceUserUnitMapper
 
     /**
      * 查询用户单位管理列表
-     * 
+     *
      * @param tInvoiceUserUnit 用户单位管理
      * @return 用户单位管理集合
      */
     @DataScope(deptAlias = "d")
     public List<TInvoiceUserUnit> selectTInvoiceUserUnitList(TInvoiceUserUnit tInvoiceUserUnit);
 
+    @DataScope(deptAlias = "d")
+    public List<TInvoiceUserUnit> selectTInvoiceUserUnitListToExcel(TInvoiceUserUnit tInvoiceUserUnit);
+
     /**
      * 新增用户单位管理
-     * 
+     *
      * @param tInvoiceUserUnit 用户单位管理
      * @return 结果
      */
@@ -47,7 +51,7 @@ public interface TInvoiceUserUnitMapper
 
     /**
      * 修改用户单位管理
-     * 
+     *
      * @param tInvoiceUserUnit 用户单位管理
      * @return 结果
      */
@@ -55,7 +59,7 @@ public interface TInvoiceUserUnitMapper
 
     /**
      * 删除用户单位管理
-     * 
+     *
      * @param id 用户单位管理ID
      * @return 结果
      */
@@ -63,7 +67,7 @@ public interface TInvoiceUserUnitMapper
 
     /**
      * 批量删除用户单位管理
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

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

@@ -1,19 +1,20 @@
 package com.ruoyi.project.invoice.service;
 
-import java.util.List;
 import com.ruoyi.project.invoice.domain.TInvoiceUserUnit;
 
+import java.util.List;
+
 /**
  * 用户单位管理Service接口
- * 
+ *
  * @author ruoyi
  * @date 2022-09-07
  */
-public interface ITInvoiceUserUnitService 
+public interface ITInvoiceUserUnitService
 {
     /**
      * 查询用户单位管理
-     * 
+     *
      * @param id 用户单位管理ID
      * @return 用户单位管理
      */
@@ -21,15 +22,17 @@ public interface ITInvoiceUserUnitService
 
     /**
      * 查询用户单位管理列表
-     * 
+     *
      * @param tInvoiceUserUnit 用户单位管理
      * @return 用户单位管理集合
      */
     public List<TInvoiceUserUnit> selectTInvoiceUserUnitList(TInvoiceUserUnit tInvoiceUserUnit);
 
+    public List<TInvoiceUserUnit> selectTInvoiceUserUnitListToExcel(TInvoiceUserUnit tInvoiceUserUnit);
+
     /**
      * 新增用户单位管理
-     * 
+     *
      * @param tInvoiceUserUnit 用户单位管理
      * @return 结果
      */
@@ -37,7 +40,7 @@ public interface ITInvoiceUserUnitService
 
     /**
      * 修改用户单位管理
-     * 
+     *
      * @param tInvoiceUserUnit 用户单位管理
      * @return 结果
      */
@@ -45,7 +48,7 @@ public interface ITInvoiceUserUnitService
 
     /**
      * 批量删除用户单位管理
-     * 
+     *
      * @param ids 需要删除的用户单位管理ID
      * @return 结果
      */
@@ -53,7 +56,7 @@ public interface ITInvoiceUserUnitService
 
     /**
      * 删除用户单位管理信息
-     * 
+     *
      * @param id 用户单位管理ID
      * @return 结果
      */

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

@@ -1,11 +1,12 @@
 package com.ruoyi.project.invoice.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.project.invoice.mapper.TInvoiceUserUnitMapper;
 import com.ruoyi.project.invoice.domain.TInvoiceUserUnit;
+import com.ruoyi.project.invoice.mapper.TInvoiceUserUnitMapper;
 import com.ruoyi.project.invoice.service.ITInvoiceUserUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 用户单位管理Service业务层处理
@@ -55,6 +56,12 @@ public class TInvoiceUserUnitServiceImpl implements ITInvoiceUserUnitService
         return tInvoiceUserUnitMapper.selectTInvoiceUserUnitList(tInvoiceUserUnit);
     }
 
+    @Override
+    public List<TInvoiceUserUnit> selectTInvoiceUserUnitListToExcel(TInvoiceUserUnit tInvoiceUserUnit)
+    {
+        return tInvoiceUserUnitMapper.selectTInvoiceUserUnitListToExcel(tInvoiceUserUnit);
+    }
+
     /**
      * 新增用户单位管理
      *

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.invoice.mapper.TInvoiceDeviceMapper">
-    
+
     <resultMap type="TInvoiceDevice" id="TInvoiceDeviceResult">
         <result property="id"    column="id"    />
         <result property="devName"    column="dev_name"    />
@@ -17,16 +17,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
         <result property="deptName" column="dept_name" />
+        <result property="createrName" column="creater_name" />
     </resultMap>
 
     <sql id="selectTInvoiceDeviceVo">
-        select d.id, d.dev_name, d.work_area, d.regional_head, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_invoice_device d
+        select d.id, d.dev_name, d.work_area, d.regional_head, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name,su.nick_name as creater_name from t_invoice_device d
       left join sys_dept s on s.dept_id = d.dept_id
+        left join sys_user su on su.user_id=to_number(d.creater_code)
     </sql>
 
     <select id="selectTInvoiceDeviceList" parameterType="TInvoiceDevice" resultMap="TInvoiceDeviceResult">
         <include refid="selectTInvoiceDeviceVo"/>
-        <where>  
+        <where>
             <if test="devName != null  and devName != ''"> and dev_name like concat(concat('%', #{devName}), '%')</if>
             <if test="workArea != null  and workArea != ''"> and work_area = #{workArea}</if>
             <if test="regionalHead != null  and regionalHead != ''"> and regional_head = #{regionalHead}</if>
@@ -46,13 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
     </select>
-    
+
     <select id="selectTInvoiceDeviceById" parameterType="Long" resultMap="TInvoiceDeviceResult">
         <include refid="selectTInvoiceDeviceVo"/>
         where id = #{id}
     </select>
 
-        
+
     <insert id="insertTInvoiceDevice" parameterType="TInvoiceDevice">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_invoice_device.NEXTVAL as id FROM DUAL
@@ -113,5 +115,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

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

@@ -43,6 +43,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by user_unit
     </select>
 
+    <select id="selectTInvoiceUserUnitListToExcel" parameterType="TInvoiceUserUnit" resultMap="TInvoiceUserUnitResult">
+        select d.id, sd.dict_label user_unit, d.user_ids, d.del_flag, su.nick_name creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name,u.nick_name from t_invoice_user_unit d
+        left join sys_dept s on s.dept_id = d.dept_id
+        left join sys_user u on d.user_ids = u.user_id
+        left join sys_user su on d.creater_code = su.user_id
+        left join sys_dict_data sd on d.user_unit = sd.dict_value
+
+        <where>
+            <if test="userUnit != null  and userUnit != ''"> and user_unit = #{userUnit}</if>
+            <if test="userIds != null  and userIds != ''"> and user_ids = #{userIds}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            and d.del_flag = 0
+            and sd.dict_type='book_user_unit'
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by user_unit
+    </select>
+
     <select id="selectTInvoiceUserUnitById" parameterType="Long" resultMap="TInvoiceUserUnitResult">
         <include refid="selectTInvoiceUserUnitVo"/>
         where id = #{id}