-新增承包商管理功能

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

@@ -0,0 +1,105 @@
+package com.ruoyi.project.invoice.controller;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+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.page.TableDataInfo;
+import com.ruoyi.project.invoice.domain.TInvoiceContractor;
+import com.ruoyi.project.invoice.service.ITInvoiceContractorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 承包商信息Controller
+ *
+ * @author ruoyi
+ * @date 2022-08-24
+ */
+@RestController
+@RequestMapping("/invoice/contractor")
+public class TInvoiceContractorController extends BaseController
+{
+    @Autowired
+    private ITInvoiceContractorService tInvoiceContractorService;
+
+    /**
+     * 查询承包商信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:contractor:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TInvoiceContractor tInvoiceContractor)
+    {
+        startPage();
+        List<TInvoiceContractor> list = tInvoiceContractorService.selectTInvoiceContractorList(tInvoiceContractor);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出承包商信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:contractor:export')")
+    @Log(title = "承包商信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TInvoiceContractor tInvoiceContractor)
+    {
+        List<TInvoiceContractor> list = tInvoiceContractorService.selectTInvoiceContractorList(tInvoiceContractor);
+        ExcelUtil<TInvoiceContractor> util = new ExcelUtil<TInvoiceContractor>(TInvoiceContractor.class);
+        return util.exportExcel(list, "contractor");
+    }
+
+    /**
+     * 获取承包商信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:contractor:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tInvoiceContractorService.selectTInvoiceContractorById(id));
+    }
+
+    /**
+     * 新增承包商信息
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:contractor:add')")
+    @Log(title = "承包商信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TInvoiceContractor tInvoiceContractor)
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        tInvoiceContractor.setCreaterCode(userId.toString());
+        return toAjax(tInvoiceContractorService.insertTInvoiceContractor(tInvoiceContractor));
+    }
+
+    /**
+     * 修改承包商信息
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:contractor:edit')")
+    @Log(title = "承包商信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TInvoiceContractor tInvoiceContractor)
+    {
+        //获取操作人员ID
+        Long userId = getUserId();
+        tInvoiceContractor.setUpdaterCode(userId);
+        tInvoiceContractor.setUpdatedate(new Date());
+        return toAjax(tInvoiceContractorService.updateTInvoiceContractor(tInvoiceContractor));
+    }
+
+    /**
+     * 删除承包商信息
+     */
+    @PreAuthorize("@ss.hasPermi('invoice:contractor:remove')")
+    @Log(title = "承包商信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tInvoiceContractorService.deleteTInvoiceContractorByIds(ids));
+    }
+}

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

@@ -0,0 +1,216 @@
+package com.ruoyi.project.invoice.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 承包商信息对象 t_invoice_contractor
+ *
+ * @author ruoyi
+ * @date 2022-08-24
+ */
+public class TInvoiceContractor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 承包商公司名称 */
+    @Excel(name = "承包商公司名称")
+    private String contractorName;
+
+    /** 主要联系人 */
+    @Excel(name = "主要联系人")
+    private String contact;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phonenumber;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
+    /** 登录账户 */
+    @Excel(name = "登录账户")
+    private String username;
+
+    /** 状态 0 ：正常 ；-1：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    @TableField(exist = false)
+    private String password;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setContractorName(String contractorName)
+    {
+        this.contractorName = contractorName;
+    }
+
+    public String getContractorName()
+    {
+        return contractorName;
+    }
+    public void setContact(String contact)
+    {
+        this.contact = contact;
+    }
+
+    public String getContact()
+    {
+        return contact;
+    }
+    public void setPhonenumber(String phonenumber)
+    {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getPhonenumber()
+    {
+        return phonenumber;
+    }
+    public void setAddress(String address)
+    {
+        this.address = address;
+    }
+
+    public String getAddress()
+    {
+        return address;
+    }
+    public void setUsername(String username){ this.username = username;}
+
+    public String getUsername() { return username; }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setRemarks(String remarks)
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks()
+    {
+        return remarks;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("contractorName", getContractorName())
+            .append("contact", getContact())
+            .append("phonenumber", getPhonenumber())
+            .append("address", getAddress())
+            .append("username", getUsername())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .append("remarks", getRemarks())
+            .append("password", getPassword())
+            .toString();
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.ruoyi.project.invoice.mapper;
+
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.invoice.domain.TInvoiceContractor;
+
+import java.util.List;
+
+/**
+ * 承包商信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2022-08-24
+ */
+public interface TInvoiceContractorMapper
+{
+    /**
+     * 查询承包商信息
+     *
+     * @param id 承包商信息ID
+     * @return 承包商信息
+     */
+    public TInvoiceContractor selectTInvoiceContractorById(Long id);
+
+    /**
+     * 查询承包商信息列表
+     *
+     * @param tInvoiceContractor 承包商信息
+     * @return 承包商信息集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TInvoiceContractor> selectTInvoiceContractorList(TInvoiceContractor tInvoiceContractor);
+
+    /**
+     * 新增承包商信息
+     *
+     * @param tInvoiceContractor 承包商信息
+     * @return 结果
+     */
+    public int insertTInvoiceContractor(TInvoiceContractor tInvoiceContractor);
+
+    /**
+     * 修改承包商信息
+     *
+     * @param tInvoiceContractor 承包商信息
+     * @return 结果
+     */
+    public int updateTInvoiceContractor(TInvoiceContractor tInvoiceContractor);
+
+    /**
+     * 删除承包商信息
+     *
+     * @param id 承包商信息ID
+     * @return 结果
+     */
+    public int deleteTInvoiceContractorById(Long id);
+
+    /**
+     * 批量删除承包商信息
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTInvoiceContractorByIds(Long[] ids);
+}

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

@@ -0,0 +1,62 @@
+package com.ruoyi.project.invoice.service;
+
+import com.ruoyi.project.invoice.domain.TInvoiceContractor;
+
+import java.util.List;
+
+/**
+ * 承包商信息Service接口
+ *
+ * @author ruoyi
+ * @date 2022-08-24
+ */
+public interface ITInvoiceContractorService
+{
+    /**
+     * 查询承包商信息
+     *
+     * @param id 承包商信息ID
+     * @return 承包商信息
+     */
+    public TInvoiceContractor selectTInvoiceContractorById(Long id);
+
+    /**
+     * 查询承包商信息列表
+     *
+     * @param tInvoiceContractor 承包商信息
+     * @return 承包商信息集合
+     */
+    public List<TInvoiceContractor> selectTInvoiceContractorList(TInvoiceContractor tInvoiceContractor);
+
+    /**
+     * 新增承包商信息
+     *
+     * @param tInvoiceContractor 承包商信息
+     * @return 结果
+     */
+    public int insertTInvoiceContractor(TInvoiceContractor tInvoiceContractor);
+
+    /**
+     * 修改承包商信息
+     *
+     * @param tInvoiceContractor 承包商信息
+     * @return 结果
+     */
+    public int updateTInvoiceContractor(TInvoiceContractor tInvoiceContractor);
+
+    /**
+     * 批量删除承包商信息
+     *
+     * @param ids 需要删除的承包商信息ID
+     * @return 结果
+     */
+    public int deleteTInvoiceContractorByIds(Long[] ids);
+
+    /**
+     * 删除承包商信息信息
+     *
+     * @param id 承包商信息ID
+     * @return 结果
+     */
+    public int deleteTInvoiceContractorById(Long id);
+}

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

@@ -0,0 +1,94 @@
+package com.ruoyi.project.invoice.service.impl;
+
+import com.ruoyi.project.invoice.domain.TInvoiceContractor;
+import com.ruoyi.project.invoice.mapper.TInvoiceContractorMapper;
+import com.ruoyi.project.invoice.service.ITInvoiceContractorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 承包商信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-08-24
+ */
+@Service
+public class TInvoiceContractorServiceImpl implements ITInvoiceContractorService
+{
+    @Autowired
+    private TInvoiceContractorMapper tInvoiceContractorMapper;
+
+    /**
+     * 查询承包商信息
+     *
+     * @param id 承包商信息ID
+     * @return 承包商信息
+     */
+    @Override
+    public TInvoiceContractor selectTInvoiceContractorById(Long id)
+    {
+        return tInvoiceContractorMapper.selectTInvoiceContractorById(id);
+    }
+
+    /**
+     * 查询承包商信息列表
+     *
+     * @param tInvoiceContractor 承包商信息
+     * @return 承包商信息
+     */
+    @Override
+    public List<TInvoiceContractor> selectTInvoiceContractorList(TInvoiceContractor tInvoiceContractor)
+    {
+        return tInvoiceContractorMapper.selectTInvoiceContractorList(tInvoiceContractor);
+    }
+
+    /**
+     * 新增承包商信息
+     *
+     * @param tInvoiceContractor 承包商信息
+     * @return 结果
+     */
+    @Override
+    public int insertTInvoiceContractor(TInvoiceContractor tInvoiceContractor)
+    {
+        return tInvoiceContractorMapper.insertTInvoiceContractor(tInvoiceContractor);
+    }
+
+    /**
+     * 修改承包商信息
+     *
+     * @param tInvoiceContractor 承包商信息
+     * @return 结果
+     */
+    @Override
+    public int updateTInvoiceContractor(TInvoiceContractor tInvoiceContractor)
+    {
+        return tInvoiceContractorMapper.updateTInvoiceContractor(tInvoiceContractor);
+    }
+
+    /**
+     * 批量删除承包商信息
+     *
+     * @param ids 需要删除的承包商信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInvoiceContractorByIds(Long[] ids)
+    {
+        return tInvoiceContractorMapper.deleteTInvoiceContractorByIds(ids);
+    }
+
+    /**
+     * 删除承包商信息信息
+     *
+     * @param id 承包商信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInvoiceContractorById(Long id)
+    {
+        return tInvoiceContractorMapper.deleteTInvoiceContractorById(id);
+    }
+}

master/src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -1,21 +1,5 @@
 package com.ruoyi.project.system.controller;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.ruoyi.project.system.domain.SysPost;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServletUtils;
@@ -33,6 +17,14 @@ import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysPostService;
 import com.ruoyi.project.system.service.ISysRoleService;
 import com.ruoyi.project.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息
@@ -224,4 +216,17 @@ public class SysUserController extends BaseController
         return list;
     }
 
+
+    @GetMapping(value = { "/getUserByUserName/{username}" })
+    public AjaxResult getUserByUserName(@PathVariable("username") String username)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        if (StringUtils.isNotNull(username))
+        {
+            ajax.put(AjaxResult.DATA_TAG, userService.selectUserByUserName(username));
+        }
+        return ajax;
+    }
+
+
 }

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

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.invoice.mapper.TInvoiceContractorMapper">
+
+    <resultMap type="TInvoiceContractor" id="TInvoiceContractorResult">
+        <result property="id"    column="id"    />
+        <result property="contractorName"    column="contractor_name"    />
+        <result property="contact"    column="contact"    />
+        <result property="phonenumber"    column="phonenumber"    />
+        <result property="address"    column="address"    />
+        <result property="username"    column="username"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTInvoiceContractorVo">
+        select d.id, d.contractor_name, d.contact, d.phonenumber, d.address, d.username, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_invoice_contractor d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTInvoiceContractorList" parameterType="TInvoiceContractor" resultMap="TInvoiceContractorResult">
+        select d.id, d.contractor_name, d.contact, d.phonenumber, d.address, d.username, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,u.password from t_invoice_contractor d
+        left join sys_user u on d.username=u.user_name and u.del_flag=0
+        <where>
+            <if test="contractorName != null  and contractorName != ''"> and contractor_name like concat(concat('%', #{contractorName}), '%')</if>
+            <if test="contact != null  and contact != ''"> and contact = #{contact}</if>
+            <if test="phonenumber != null  and phonenumber != ''"> and phonenumber = #{phonenumber}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="username != null  and username != ''"> and username = #{username}</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
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectTInvoiceContractorById" parameterType="Long" resultMap="TInvoiceContractorResult">
+        <include refid="selectTInvoiceContractorVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTInvoiceContractor" parameterType="TInvoiceContractor">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_invoice_contractor.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_invoice_contractor
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="contractorName != null">contractor_name,</if>
+            <if test="contact != null">contact,</if>
+            <if test="phonenumber != null">phonenumber,</if>
+            <if test="address != null">address,</if>
+            <if test="username != null">username,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="contractorName != null">#{contractorName},</if>
+            <if test="contact != null">#{contact},</if>
+            <if test="phonenumber != null">#{phonenumber},</if>
+            <if test="address != null">#{address},</if>
+            <if test="username != null">#{username},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTInvoiceContractor" parameterType="TInvoiceContractor">
+        update t_invoice_contractor
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contractorName != null">contractor_name = #{contractorName},</if>
+            <if test="contact != null">contact = #{contact},</if>
+            <if test="phonenumber != null">phonenumber = #{phonenumber},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="username != null">username = #{username},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTInvoiceContractorById" parameterType="Long">
+        update t_invoice_contractor set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTInvoiceContractorByIds" parameterType="String">
+        update t_invoice_contractor set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+</mapper>

ui/src/api/invoice/contractor.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询承包商信息列表
+export function listContractor(query) {
+  return request({
+    url: '/invoice/contractor/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询承包商信息详细
+export function getContractor(id) {
+  return request({
+    url: '/invoice/contractor/' + id,
+    method: 'get'
+  })
+}
+
+// 新增承包商信息
+export function addContractor(data) {
+  return request({
+    url: '/invoice/contractor',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改承包商信息
+export function updateContractor(data) {
+  return request({
+    url: '/invoice/contractor',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除承包商信息
+export function delContractor(id) {
+  return request({
+    url: '/invoice/contractor/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出承包商信息
+export function exportContractor(query) {
+  return request({
+    url: '/invoice/contractor/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/system/user.js

@@ -143,3 +143,11 @@ export function userDataScope(data) {
     data: data
   })
 }
+
+// 用户数据权限
+export function getUserByUserName(userName) {
+  return request({
+    url: '/system/user/getUserByUserName/' + praseStrEmpty(userName),
+    method: 'get'
+  })
+}

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

@@ -0,0 +1,632 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="承包商公司名称" prop="contractorName">
+        <el-input
+          v-model="queryParams.contractorName"
+          placeholder="请输入承包商公司名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="主要联系人" prop="contact">
+        <el-input
+          v-model="queryParams.contact"
+          placeholder="请输入主要联系人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="phonenumber">
+        <el-input
+          v-model="queryParams.phonenumber"
+          placeholder="请输入联系电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          placeholder="请输入备注"
+          clearable
+          size="small"
+          @keyup.enter.native="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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['invoice:contractor:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['invoice:contractor:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['invoice:contractor:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['invoice:contractor:edit']"
+        >导入
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['invoice:contractor:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="contractorList" @selection-change="handleSelectionChange"
+              :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="承包商公司名称" align="center" prop="contractorName" :show-overflow-tooltip="true"/>
+      <el-table-column label="主要联系人" align="center" prop="contact" :show-overflow-tooltip="true"/>
+      <el-table-column label="联系电话" align="center" prop="phonenumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="地址" align="center" prop="address" :show-overflow-tooltip="true"/>
+      <el-table-column label="登录账号" align="center" prop="username" :show-overflow-tooltip="true"/>
+      <el-table-column label="登录密码" align="center" prop="password" :show-overflow-tooltip="true"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['invoice:contractor:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['invoice:contractor:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改承包商信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" :gutter="20">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="承包商公司名称" prop="contractorName">
+              <el-input v-model="form.contractorName" placeholder="请输入承包商公司名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="主要联系人" prop="contact">
+              <el-input v-model="form.contact" placeholder="请输入主要联系人"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入联系电话"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入地址"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-form-item label="备注" prop="remarks">
+            <el-input v-model="form.remarks" placeholder="请输入备注"/>
+          </el-form-item>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="success" @click="setUser">设置登录用户</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog v-dialogDrag :title="userTitle" :visible.sync="userOpen" width="600px" append-to-body>
+      <el-form ref="userForm" :model="userForm" :rules="userRules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('姓名')" prop="nickName">
+              <el-input v-model="userForm.nickName" :placeholder="$t('请输入') + $t('姓名')"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('归属部门')" prop="deptId">
+              <treeselect v-model="userForm.deptId" :options="deptOptions" :show-count="true"
+                          :placeholder="$t('请选择') + $t('归属部门')"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('手机号码')" prop="phonenumber">
+              <el-input v-model="userForm.phonenumber" :placeholder="$t('请输入') + $t('手机号码')" maxlength="11"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('邮箱')" prop="email">
+              <el-input v-model="userForm.email" :placeholder="$t('请输入') + $t('邮箱')" maxlength="50"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="userForm.userId == undefined" :label="$t('用户名称')" prop="userName">
+              <el-input v-model="userForm.userName" :placeholder="$t('请输入') + $t('用户名称')"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="userForm.userId == undefined" :label="$t('用户密码')" prop="password">
+              <el-input v-model="userForm.password" :placeholder="$t('请输入') + $t('用户密码')" type="password"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('备注')">
+              <el-input v-model="userForm.remark" type="textarea" :placeholder="$t('请输入') + $t('内容')"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitUser">{{ $t('确 定') }}</el-button>
+        <el-button @click="userCancel">{{ $t('取 消') }}</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-checkbox v-model="upload.updateSupport"/>
+          是否更新已经存在的用户数据
+          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listContractor,
+  getContractor,
+  delContractor,
+  addContractor,
+  updateContractor,
+  exportContractor,
+  importTemplate
+} from "@/api/invoice/contractor";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import User from "@/views/system/user";
+import {addUser, getUserByUserName, updateUser} from "@/api/system/user";
+
+export default {
+  name: "Contractor",
+  components: {Treeselect},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 承包商信息表格数据
+      contractorList: [],
+      // 弹出层标题
+      title: "",
+      userTitle: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight: 300,
+      // 是否显示弹出层
+      open: false,
+      userOpen: false,
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/invoice/contractor/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        contractorName: null,
+        contact: null,
+        phonenumber: null,
+        address: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      userForm: {},
+      // 表单校验
+      rules: {
+        contractorName: [
+          {required: true, message: this.$t('承包商名称') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        contact: [
+          {required: true, message: this.$t('主要联系人') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        phonenumber: [
+          {required: true, message: this.$t('联系电话') + this.$t('不能为空'), trigger: "blur"},
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: this.$t('请输入正确的手机号码'),
+            trigger: "blur"
+          }
+        ],
+        address: [
+          {required: true, message: this.$t('地址') + this.$t('不能为空'), trigger: "blur"}
+        ],
+      },
+      userRules: {
+        userName: [
+          {required: true, message: this.$t('用户名称') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        nickName: [
+          {required: true, message: this.$t('用户姓名') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        deptId: [
+          {required: true, message: this.$t('归属部门') + this.$t('不能为空'), trigger: "change"}
+        ],
+        password: [
+          {required: true, message: this.$t('用户密码') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        email: [
+          {required: true, message: this.$t('邮箱') + this.$t('不能为空'), trigger: "blur"},
+          {
+            type: "email",
+            message: this.$t('请输入正确的邮箱地址'),
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          {required: true, message: this.$t('手机号码') + this.$t('不能为空'), trigger: "blur"},
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: this.$t('请输入正确的手机号码'),
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 250
+    })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    setUser() {
+      this.userTitle = "设置登录用户"
+      this.userOpen = true;
+      if (this.form.username != undefined) {
+        getUserByUserName(this.form.username).then(response => {
+          console.log(response)
+          if (response.data != null)
+            this.userForm = response.data;
+        });
+      }
+      this.userForm.nickName = this.form.contractorName;
+      this.userForm.phonenumber = this.form.phonenumber;
+    },
+    submitUser: function () {
+      this.$refs["userForm"].validate(valid => {
+        if (valid) {
+          if (this.userForm.userId != undefined) {
+            updateUser(this.userForm).then(response => {
+              this.msgSuccess(this.$t('修改成功'));
+              this.userOpen = false;
+              this.getList();
+            });
+          } else {
+            addUser(this.userForm).then(response => {
+              this.msgSuccess(this.$t('新增成功'));
+              this.userOpen = false;
+              this.getList();
+            });
+          }
+        }
+      });
+      this.form.username = this.userForm.userName;
+      this.submitForm();
+    },
+    userCancel() {
+      this.userOpen = false;
+      this.userReset();
+    },
+    setContractorName(name) {
+      this.userForm.nickName = name;
+    },
+    /** 查询承包商信息列表 */
+    getList() {
+      this.loading = true;
+      listContractor(this.queryParams).then(response => {
+        this.contractorList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        contractorName: null,
+        contact: null,
+        phonenumber: null,
+        address: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    userReset() {
+      this.userForm = {
+        id: null,
+        nickName: null,
+        phonenumber: null,
+        email: null,
+        userName: null,
+        password: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      this.resetForm("userForm");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.userReset();
+      this.open = true;
+      this.title = "添加承包商信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.userReset();
+      const id = row.id || this.ids
+      getContractor(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改承包商信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateContractor(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addContractor(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delContractor(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有承包商信息数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportContractor(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        this.download(response.msg);
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
+  }
+};
+</script>