Browse Source

新增游客登录,进行项目上报

Administrator 4 years ago
parent
commit
7fa73dbc94

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -6,6 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,6 +25,7 @@ import com.ruoyi.framework.config.ServerConfig;
  * @author ruoyi
  */
 @RestController
+@CrossOrigin(maxAge = 3600)
 public class CommonController
 {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);

+ 112 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectReportController.java

@@ -0,0 +1,112 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.List;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.project.BmProjectReport;
+import com.ruoyi.system.service.project.IBmProjectReportService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目上报Controller(游客上报,不需要权限)
+ * 
+ * @author ruoyi
+ * @date 2021-05-31
+ */
+@RestController
+@RequestMapping("/bmProjectReport/report")
+public class BmProjectReportController extends BaseController
+{
+    @Autowired
+    private IBmProjectReportService bmProjectReportService;
+
+    /**
+     * 查询项目上报列表
+     */
+    //@PreAuthorize("@ss.hasPermi('BmProjectReport:report:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BmProjectReport bmProjectReport)
+    {
+        startPage();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNotNull(loginUser)){
+            Long deptId = loginUser.getUser().getDeptId();
+            bmProjectReport.setSysDeptId(Integer.valueOf(deptId.toString()));
+        }
+        List<BmProjectReport> list = bmProjectReportService.selectBmProjectReportList(bmProjectReport);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目上报列表
+     */
+    //@PreAuthorize("@ss.hasPermi('BmProjectReport:report:export')")
+    @Log(title = "项目上报", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(BmProjectReport bmProjectReport)
+    {
+        List<BmProjectReport> list = bmProjectReportService.selectBmProjectReportList(bmProjectReport);
+        ExcelUtil<BmProjectReport> util = new ExcelUtil<BmProjectReport>(BmProjectReport.class);
+        return util.exportExcel(list, "report");
+    }
+
+    /**
+     * 获取项目上报详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('BmProjectReport:report:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(bmProjectReportService.selectBmProjectReportById(id));
+    }
+
+    /**
+     * 新增项目上报
+     */
+    //@PreAuthorize("@ss.hasPermi('BmProjectReport:report:add')")
+    @Log(title = "项目上报", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BmProjectReport bmProjectReport)
+    {
+        return toAjax(bmProjectReportService.insertBmProjectReport(bmProjectReport));
+    }
+
+    /**
+     * 修改项目上报
+     */
+    //@PreAuthorize("@ss.hasPermi('BmProjectReport:report:edit')")
+    @Log(title = "项目上报", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BmProjectReport bmProjectReport)
+    {
+        return toAjax(bmProjectReportService.updateBmProjectReport(bmProjectReport));
+    }
+
+    /**
+     * 删除项目上报
+     */
+    //@PreAuthorize("@ss.hasPermi('BmProjectReport:report:remove')")
+    @Log(title = "项目上报", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bmProjectReportService.deleteBmProjectReportByIds(ids));
+    }
+}

+ 2 - 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -44,7 +44,7 @@ public class BaseEntity implements Serializable
     private Long isDel;
 
     /**
-     * 项目id
+     * 部门id
      */
     private Integer sysDeptId;
 
@@ -62,6 +62,7 @@ public class BaseEntity implements Serializable
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
+
     public String getSearchValue()
     {
         return searchValue;

+ 1 - 0
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -114,6 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/*/api-docs").anonymous()
                 .antMatchers("/druid/**").anonymous()
                 .antMatchers("/common/upload").anonymous()
+                .antMatchers("/bmProjectReport/report").anonymous()
                 /*以下为测试新增,上线删除*/
 
                 // 除上面外的所有请求全部需要鉴权认证

+ 168 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmProjectReport.java

@@ -0,0 +1,168 @@
+package com.ruoyi.system.domain.project;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目上报对象 bm_project_report
+ * 
+ * @author ruoyi
+ * @date 2021-05-31
+ */
+public class BmProjectReport extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目上报id */
+    private Long id;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 投资额度 */
+    @Excel(name = "投资额度")
+    private String investmentQuota;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String contactsName;
+
+    /** 联系方式 */
+    @Excel(name = "联系方式")
+    private String contactsPhone;
+
+    /** 项目介绍 */
+    @Excel(name = "项目介绍")
+    private String projectIntroduction;
+
+    /** 上报状态 */
+    @Excel(name = "上报状态")
+    private String reportStatus;
+
+    /** 附件url */
+    @Excel(name = "附件url")
+    private String url;
+
+    /** 项目id* */
+    @Excel(name = "项目id*")
+    private Long bmProjectId;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private Long isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setProjectName(String projectName) 
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName() 
+    {
+        return projectName;
+    }
+    public void setInvestmentQuota(String investmentQuota) 
+    {
+        this.investmentQuota = investmentQuota;
+    }
+
+    public String getInvestmentQuota() 
+    {
+        return investmentQuota;
+    }
+    public void setContactsName(String contactsName) 
+    {
+        this.contactsName = contactsName;
+    }
+
+    public String getContactsName() 
+    {
+        return contactsName;
+    }
+    public void setContactsPhone(String contactsPhone) 
+    {
+        this.contactsPhone = contactsPhone;
+    }
+
+    public String getContactsPhone() 
+    {
+        return contactsPhone;
+    }
+    public void setProjectIntroduction(String projectIntroduction) 
+    {
+        this.projectIntroduction = projectIntroduction;
+    }
+
+    public String getProjectIntroduction() 
+    {
+        return projectIntroduction;
+    }
+    public void setReportStatus(String reportStatus) 
+    {
+        this.reportStatus = reportStatus;
+    }
+
+    public String getReportStatus() 
+    {
+        return reportStatus;
+    }
+    public void setUrl(String url) 
+    {
+        this.url = url;
+    }
+
+    public String getUrl() 
+    {
+        return url;
+    }
+    public void setBmProjectId(Long bmProjectId) 
+    {
+        this.bmProjectId = bmProjectId;
+    }
+
+    public Long getBmProjectId() 
+    {
+        return bmProjectId;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectName", getProjectName())
+            .append("investmentQuota", getInvestmentQuota())
+            .append("contactsName", getContactsName())
+            .append("contactsPhone", getContactsPhone())
+            .append("projectIntroduction", getProjectIntroduction())
+            .append("reportStatus", getReportStatus())
+            .append("url", getUrl())
+            .append("bmProjectId", getBmProjectId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 62 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/project/BmProjectReportMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper.project;
+
+import com.ruoyi.system.domain.project.BmProjectReport;
+
+import java.util.List;
+
+/**
+ * 项目上报Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-31
+ */
+public interface BmProjectReportMapper 
+{
+    /**
+     * 查询项目上报
+     * 
+     * @param id 项目上报ID
+     * @return 项目上报
+     */
+    public BmProjectReport selectBmProjectReportById(Long id);
+
+    /**
+     * 查询项目上报列表
+     * 
+     * @param bmProjectReport 项目上报
+     * @return 项目上报集合
+     */
+    public List<BmProjectReport> selectBmProjectReportList(BmProjectReport bmProjectReport);
+
+    /**
+     * 新增项目上报
+     * 
+     * @param bmProjectReport 项目上报
+     * @return 结果
+     */
+    public int insertBmProjectReport(BmProjectReport bmProjectReport);
+
+    /**
+     * 修改项目上报
+     * 
+     * @param bmProjectReport 项目上报
+     * @return 结果
+     */
+    public int updateBmProjectReport(BmProjectReport bmProjectReport);
+
+    /**
+     * 删除项目上报
+     * 
+     * @param id 项目上报ID
+     * @return 结果
+     */
+    public int deleteBmProjectReportById(Long id);
+
+    /**
+     * 批量删除项目上报
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBmProjectReportByIds(Long[] ids);
+}

+ 96 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectReportServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl.project;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.project.BmProjectReport;
+import com.ruoyi.system.mapper.project.BmProjectReportMapper;
+import com.ruoyi.system.service.project.IBmProjectReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目上报Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-05-31
+ */
+@Service
+public class BmProjectReportServiceImpl implements IBmProjectReportService
+{
+    @Autowired
+    private BmProjectReportMapper bmProjectReportMapper;
+
+    /**
+     * 查询项目上报
+     * 
+     * @param id 项目上报ID
+     * @return 项目上报
+     */
+    @Override
+    public BmProjectReport selectBmProjectReportById(Long id)
+    {
+        return bmProjectReportMapper.selectBmProjectReportById(id);
+    }
+
+    /**
+     * 查询项目上报列表
+     * 
+     * @param bmProjectReport 项目上报
+     * @return 项目上报
+     */
+    @Override
+    public List<BmProjectReport> selectBmProjectReportList(BmProjectReport bmProjectReport)
+    {
+        return bmProjectReportMapper.selectBmProjectReportList(bmProjectReport);
+    }
+
+    /**
+     * 新增项目上报
+     * 
+     * @param bmProjectReport 项目上报
+     * @return 结果
+     */
+    @Override
+    public int insertBmProjectReport(BmProjectReport bmProjectReport)
+    {
+        bmProjectReport.setCreateTime(DateUtils.getNowDate());
+        return bmProjectReportMapper.insertBmProjectReport(bmProjectReport);
+    }
+
+    /**
+     * 修改项目上报
+     * 
+     * @param bmProjectReport 项目上报
+     * @return 结果
+     */
+    @Override
+    public int updateBmProjectReport(BmProjectReport bmProjectReport)
+    {
+        bmProjectReport.setUpdateTime(DateUtils.getNowDate());
+        return bmProjectReportMapper.updateBmProjectReport(bmProjectReport);
+    }
+
+    /**
+     * 批量删除项目上报
+     * 
+     * @param ids 需要删除的项目上报ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmProjectReportByIds(Long[] ids)
+    {
+        return bmProjectReportMapper.deleteBmProjectReportByIds(ids);
+    }
+
+    /**
+     * 删除项目上报信息
+     * 
+     * @param id 项目上报ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmProjectReportById(Long id)
+    {
+        return bmProjectReportMapper.deleteBmProjectReportById(id);
+    }
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmProjectReportService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service.project;
+
+import com.ruoyi.system.domain.project.BmProjectReport;
+import java.util.List;
+
+/**
+ * 项目上报Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-05-31
+ */
+public interface IBmProjectReportService 
+{
+    /**
+     * 查询项目上报
+     * 
+     * @param id 项目上报ID
+     * @return 项目上报
+     */
+    public BmProjectReport selectBmProjectReportById(Long id);
+
+    /**
+     * 查询项目上报列表
+     * 
+     * @param bmProjectReport 项目上报
+     * @return 项目上报集合
+     */
+    public List<BmProjectReport> selectBmProjectReportList(BmProjectReport bmProjectReport);
+
+    /**
+     * 新增项目上报
+     * 
+     * @param bmProjectReport 项目上报
+     * @return 结果
+     */
+    public int insertBmProjectReport(BmProjectReport bmProjectReport);
+
+    /**
+     * 修改项目上报
+     * 
+     * @param bmProjectReport 项目上报
+     * @return 结果
+     */
+    public int updateBmProjectReport(BmProjectReport bmProjectReport);
+
+    /**
+     * 批量删除项目上报
+     * 
+     * @param ids 需要删除的项目上报ID
+     * @return 结果
+     */
+    public int deleteBmProjectReportByIds(Long[] ids);
+
+    /**
+     * 删除项目上报信息
+     * 
+     * @param id 项目上报ID
+     * @return 结果
+     */
+    public int deleteBmProjectReportById(Long id);
+}

+ 121 - 0
ruoyi-system/src/main/resources/mapper/system/project/BmProjectReportMapper.xml

@@ -0,0 +1,121 @@
+<?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.system.mapper.project.BmProjectReportMapper">
+    
+    <resultMap type="BmProjectReport" id="BmProjectReportResult">
+        <result property="id"    column="id"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="investmentQuota"    column="investment_quota"    />
+        <result property="contactsName"    column="contacts_name"    />
+        <result property="contactsPhone"    column="contacts_phone"    />
+        <result property="projectIntroduction"    column="project_introduction"    />
+        <result property="reportStatus"    column="report_status"    />
+        <result property="url"    column="url"    />
+        <result property="bmProjectId"    column="bm_project_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="sysDeptId"    column="sys_dept_id"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectBmProjectReportVo">
+        select id, project_name, investment_quota, contacts_name, contacts_phone, project_introduction, report_status, url, bm_project_id, create_by, create_time, update_by, update_time, is_del, sys_dept_id, remark from bm_project_report
+    </sql>
+
+    <select id="selectBmProjectReportList" parameterType="BmProjectReport" resultMap="BmProjectReportResult">
+        <include refid="selectBmProjectReportVo"/>
+        <where>  
+            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+            <if test="investmentQuota != null  and investmentQuota != ''"> and investment_quota = #{investmentQuota}</if>
+            <if test="contactsName != null  and contactsName != ''"> and contacts_name like concat('%', #{contactsName}, '%')</if>
+            <if test="contactsPhone != null  and contactsPhone != ''"> and contacts_phone = #{contactsPhone}</if>
+            <if test="projectIntroduction != null  and projectIntroduction != ''"> and project_introduction = #{projectIntroduction}</if>
+            <if test="reportStatus != null  and reportStatus != ''"> and report_status = #{reportStatus}</if>
+            <if test="url != null  and url != ''"> and url = #{url}</if>
+            <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
+            <if test="sysDeptId != null "> and sys_dept_id = #{sysDeptId}</if>
+            <if test="isDel != null "> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectBmProjectReportById" parameterType="Long" resultMap="BmProjectReportResult">
+        <include refid="selectBmProjectReportVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBmProjectReport" parameterType="BmProjectReport" useGeneratedKeys="true" keyProperty="id">
+        insert into bm_project_report
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectName != null">project_name,</if>
+            <if test="investmentQuota != null">investment_quota,</if>
+            <if test="contactsName != null">contacts_name,</if>
+            <if test="contactsPhone != null">contacts_phone,</if>
+            <if test="projectIntroduction != null">project_introduction,</if>
+            <if test="reportStatus != null">report_status,</if>
+            <if test="url != null">url,</if>
+            <if test="bmProjectId != null">bm_project_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="sysDeptId != null">sys_dept_id,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectName != null">#{projectName},</if>
+            <if test="investmentQuota != null">#{investmentQuota},</if>
+            <if test="contactsName != null">#{contactsName},</if>
+            <if test="contactsPhone != null">#{contactsPhone},</if>
+            <if test="projectIntroduction != null">#{projectIntroduction},</if>
+            <if test="reportStatus != null">#{reportStatus},</if>
+            <if test="url != null">#{url},</if>
+            <if test="bmProjectId != null">#{bmProjectId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="sysDeptId != null">#{sysDeptId},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBmProjectReport" parameterType="BmProjectReport">
+        update bm_project_report
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectName != null">project_name = #{projectName},</if>
+            <if test="investmentQuota != null">investment_quota = #{investmentQuota},</if>
+            <if test="contactsName != null">contacts_name = #{contactsName},</if>
+            <if test="contactsPhone != null">contacts_phone = #{contactsPhone},</if>
+            <if test="projectIntroduction != null">project_introduction = #{projectIntroduction},</if>
+            <if test="reportStatus != null">report_status = #{reportStatus},</if>
+            <if test="url != null">url = #{url},</if>
+            <if test="bmProjectId != null">bm_project_id = #{bmProjectId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="sysDeptId != null">sys_dept_id = #{sysDeptId},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBmProjectReportById" parameterType="Long">
+        delete from bm_project_report where id = #{id}
+    </delete>
+
+    <delete id="deleteBmProjectReportByIds" parameterType="String">
+        delete from bm_project_report where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 53 - 0
ruoyi-ui/src/api/projectReport/index.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询项目上报列表
+export function listReport(query) {
+  return request({
+    url: '/bmProjectReport/report/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询项目上报详细
+export function getReport(id) {
+  return request({
+    url: '/bmProjectReport/report/' + id,
+    method: 'get'
+  })
+}
+
+// 新增项目上报
+export function addReport(data) {
+  return request({
+    url: '/bmProjectReport/report',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改项目上报
+export function updateReport(data) {
+  return request({
+    url: '/bmProjectReport/report',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除项目上报
+export function delReport(id) {
+  return request({
+    url: '/bmProjectReport/report/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出项目上报
+export function exportReport(query) {
+  return request({
+    url: '/bmProjectReport/report/export',
+    method: 'get',
+    params: query
+  })
+}

+ 403 - 0
ruoyi-ui/src/views/management/report/index.vue

@@ -0,0 +1,403 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input
+          v-model="queryParams.projectName"
+          placeholder="请输入项目名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="投资额度" prop="investmentQuota">
+        <el-input
+          v-model="queryParams.investmentQuota"
+          placeholder="请输入投资额度"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="联系人" prop="contactsName">
+        <el-input
+          v-model="queryParams.contactsName"
+          placeholder="请输入联系人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="contactsPhone">
+        <el-input
+          v-model="queryParams.contactsPhone"
+          placeholder="请输入联系方式"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="上报状态" prop="reportStatus">
+        <el-select v-model="queryParams.reportStatus" placeholder="请选择上报状态" clearable size="small">
+          <el-option label="未上报" value="0" />
+          <el-option label="已上报" value="1" />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="项目id*" prop="bmProjectId">
+        <el-input
+          v-model="queryParams.bmProjectId"
+          placeholder="请输入项目id*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+<!--      <el-form-item label="是否删除" prop="isDel">
+        <el-select v-model="queryParams.isDel" placeholder="请选择是否删除" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>-->
+      <el-form-item>
+        <el-button type="primary" 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"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['BmProjectReport:report:add']"
+        >新增</el-button>
+      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['BmProjectReport:report:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="multiple"
+          @click="handleReport"
+        >上报</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['BmProjectReport:report:remove']"
+        >删除</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['BmProjectReport:report:export']"
+        >导出</el-button>
+      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="项目上报id" align="center" prop="id" />-->
+      <el-table-column label="项目名称" align="center" prop="projectName" />
+      <el-table-column label="投资额度" align="center" prop="investmentQuota" />
+      <el-table-column label="联系人" align="center" prop="contactsName" />
+      <el-table-column label="联系方式" align="center" prop="contactsPhone" />
+      <el-table-column label="项目介绍" align="center" prop="projectIntroduction" />
+      <el-table-column label="上报状态" align="center" prop="reportStatus" />
+      <el-table-column label="附件url" align="center" prop="url" />
+<!--      <el-table-column label="项目id*" align="center" prop="bmProjectId" />-->
+<!--      <el-table-column label="是否删除" align="center" prop="isDel" />-->
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" 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="['BmProjectReport:report:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['BmProjectReport:report: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目名称" prop="projectName">
+          <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+        </el-form-item>
+        <el-form-item label="投资额度" prop="investmentQuota">
+          <el-input v-model="form.investmentQuota" placeholder="请输入投资额度" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="contactsName">
+          <el-input v-model="form.contactsName" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contactsPhone">
+          <el-input v-model="form.contactsPhone" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="项目介绍">
+          <editor v-model="form.projectIntroduction" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="附件url" prop="url">
+          <el-input v-model="form.url" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="是否删除" prop="isDel">
+          <el-select v-model="form.isDel" placeholder="请选择是否删除">
+            <el-option label="否" value="0"/>
+            <el-option label="是" value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属部门" prop="sysDeptId">
+          <treeselect v-model="form.sysDeptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listReport, getReport, delReport, addReport, updateReport, exportReport } from "@/api/projectReport/index";
+import Editor from '@/components/Editor';
+import { treeselect } from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Report",
+  components: {
+    Editor,
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 部门树选项
+      deptOptions: undefined,
+      // 总条数
+      total: 0,
+      // 项目上报表格数据
+      reportList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectName: null,
+        investmentQuota: null,
+        contactsName: null,
+        contactsPhone: null,
+        projectIntroduction: null,
+        reportStatus: null,
+        url: null,
+        bmProjectId: null,
+        // 部门树选项
+        deptOptions: undefined,
+        isDel: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询项目上报列表 */
+    getList() {
+      this.loading = true;
+      listReport(this.queryParams).then(response => {
+        this.reportList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        // 部门树选项
+        deptOptions: undefined,
+        projectName: null,
+        investmentQuota: null,
+        contactsName: null,
+        contactsPhone: null,
+        projectIntroduction: null,
+        reportStatus: "0",
+        url: null,
+        bmProjectId: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isDel: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    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.open = true;
+      this.title = "添加项目上报";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getReport(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改项目上报";
+      });
+    },
+
+    /** 项目上报 */
+    handleReport(row){
+      this.reset();
+      this.form.id = row.id || this.ids;
+      this.form.reportStatus = '1';
+      updateReport(this.form).then(response => {
+        this.msgSuccess("上报成功");
+        this.open = false;
+        this.getList();
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateReport(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addReport(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除项目上报编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delReport(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有项目上报数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportReport(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>