fix 修改招商部分问题

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmDeptPlanAreaController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.project;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.project.BmDeptPlanArea;
+import com.ruoyi.system.service.project.IBmDeptPlanAreaService;
+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.core.page.TableDataInfo;
+
+/**
+ * 两区及乡镇单位部门招商计划Controller
+ * 
+ * @author ruoyi
+ * @date 2021-07-05
+ */
+@RestController
+@RequestMapping("/dept/area")
+public class BmDeptPlanAreaController extends BaseController
+{
+    @Autowired
+    private IBmDeptPlanAreaService bmDeptPlanAreaService;
+
+    /**
+     * 查询两区及乡镇单位部门招商计划列表
+     */
+    @PreAuthorize("@ss.hasPermi('dept:area:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BmDeptPlanArea bmDeptPlanArea)
+    {
+        startPage();
+        List<BmDeptPlanArea> list = bmDeptPlanAreaService.selectBmDeptPlanAreaList(bmDeptPlanArea);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出两区及乡镇单位部门招商计划列表
+     */
+    @PreAuthorize("@ss.hasPermi('dept:area:export')")
+    @Log(title = "两区及乡镇单位部门招商计划", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(BmDeptPlanArea bmDeptPlanArea)
+    {
+        List<BmDeptPlanArea> list = bmDeptPlanAreaService.selectBmDeptPlanAreaList(bmDeptPlanArea);
+        ExcelUtil<BmDeptPlanArea> util = new ExcelUtil<BmDeptPlanArea>(BmDeptPlanArea.class);
+        return util.exportExcel(list, "area");
+    }
+
+    /**
+     * 获取两区及乡镇单位部门招商计划详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('dept:area:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(bmDeptPlanAreaService.selectBmDeptPlanAreaById(id));
+    }
+
+    /**
+     * 新增两区及乡镇单位部门招商计划
+     */
+    @PreAuthorize("@ss.hasPermi('dept:area:add')")
+    @Log(title = "两区及乡镇单位部门招商计划", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BmDeptPlanArea bmDeptPlanArea)
+    {
+        return toAjax(bmDeptPlanAreaService.insertBmDeptPlanArea(bmDeptPlanArea));
+    }
+
+    /**
+     * 修改两区及乡镇单位部门招商计划
+     */
+    @PreAuthorize("@ss.hasPermi('dept:area:edit')")
+    @Log(title = "两区及乡镇单位部门招商计划", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BmDeptPlanArea bmDeptPlanArea)
+    {
+        return toAjax(bmDeptPlanAreaService.updateBmDeptPlanArea(bmDeptPlanArea));
+    }
+
+    /**
+     * 删除两区及乡镇单位部门招商计划
+     */
+    @PreAuthorize("@ss.hasPermi('dept:area:remove')")
+    @Log(title = "两区及乡镇单位部门招商计划", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bmDeptPlanAreaService.deleteBmDeptPlanAreaByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectController.java

@@ -3,7 +3,12 @@ package com.ruoyi.web.controller.project;
 import java.util.List;
 import java.util.Map;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.project.BmProject;
 import com.ruoyi.system.domain.project.BmProjectStatus;
@@ -44,6 +49,24 @@ public class BmProjectController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(BmProject bmProject) {
         startPage();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNotNull(loginUser)){
+            List<SysRole> roles = loginUser.getUser().getRoles();
+            boolean flag = false;
+            if (roles.size() > 0){
+                for (SysRole role : roles) {
+                    String roleKey = role.getRoleKey();
+                    if (StringUtils.isNotBlank(roleKey) && ("manage".equals(roleKey)||"admin".equals(roleKey))){
+                        flag = true;
+                        break;
+                    }
+                }
+            }
+            if (!flag){
+                Long deptId = loginUser.getUser().getDeptId();
+                bmProject.setSysDeptId(deptId.toString());
+            }
+        }
         List<BmProject> list = bmProjectService.selectBmProjectList(bmProject);
         return getDataTable(list);
     }

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

@@ -57,7 +57,7 @@ public class BmProjectReportController extends BaseController
             if (roles.size() > 0){
                 for (SysRole role : roles) {
                      String roleKey = role.getRoleKey();
-                     if (StringUtils.isNotBlank(roleKey) && "admin".equals(roleKey)){
+                     if (StringUtils.isNotBlank(roleKey) && ("manage".equals(roleKey)||"admin".equals(roleKey))){
                          flag = true;
                          break;
                      }
@@ -65,7 +65,7 @@ public class BmProjectReportController extends BaseController
             }
             if (!flag){
                 Long deptId = loginUser.getUser().getDeptId();
-                bmProjectReport.setSysDeptId(Integer.valueOf(deptId.toString()));
+                bmProjectReport.setSysDeptId(deptId.toString());
                 bmProjectReport.setReportStatus("1");
             }
         }

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

@@ -46,7 +46,7 @@ public class BaseEntity implements Serializable
     /**
      * 部门id
      */
-    private Integer sysDeptId;
+    private String sysDeptId;
 
     /** 备注 */
     private String remark;
@@ -148,11 +148,11 @@ public class BaseEntity implements Serializable
         this.isDel = isDel;
     }
 
-    public Integer getSysDeptId() {
+    public String getSysDeptId() {
         return sysDeptId;
     }
 
-    public void setSysDeptId(Integer sysDeptId) {
+    public void setSysDeptId(String sysDeptId) {
         this.sysDeptId = sysDeptId;
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmDeptPlan.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- *  部门招商计划对象 bm_dept_plany
+ *  部门招商计划对象 bm_dept_plan
  * 
  * @author ruoyi
  * @date 2021-03-09
@@ -26,27 +26,24 @@ public class BmDeptPlan extends BaseEntity
     /**
      * 部门名称
      */
+    @Excel(name = "部门名称")
     private String deptName;
 
-    /**  目标线索数 */
-    @Excel(name = "目标线索数")
-    private Long plan;
 
-    /** 目标签约数 */
-    @Excel(name = "目标签约数")
-    private Long targetSigningNum;
 
-    /** 目标合同金额 */
-    @Excel(name = "目标合同金额")
+    /** 当年实际到位资金目标任务(万元) */
+    @Excel(name = "当年实际到位资金目标任务(万元)")
     private BigDecimal targetContractAmount;
 
-    /** 目标到资金额 */
-    @Excel(name = "目标到资金额")
+    /** 当年新签约金额目标任务(万元) */
+    @Excel(name = "当年新签约金额目标任务(万元)")
     private BigDecimal targetArrivalAmount;
 
-    /** 目标投产项目数 */
-    @Excel(name = "目标投产项目数")
-    private Long targetInvestmentNum;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String remark;
 
     public String getDeptName() {
         return deptName;
@@ -75,24 +72,7 @@ public class BmDeptPlan extends BaseEntity
     {
         return year;
     }
-    public void setPlan(Long plan) 
-    {
-        this.plan = plan;
-    }
 
-    public Long getPlan() 
-    {
-        return plan;
-    }
-    public void setTargetSigningNum(Long targetSigningNum) 
-    {
-        this.targetSigningNum = targetSigningNum;
-    }
-
-    public Long getTargetSigningNum() 
-    {
-        return targetSigningNum;
-    }
     public void setTargetContractAmount(BigDecimal targetContractAmount) 
     {
         this.targetContractAmount = targetContractAmount;
@@ -111,32 +91,14 @@ public class BmDeptPlan extends BaseEntity
     {
         return targetArrivalAmount;
     }
-    public void setTargetInvestmentNum(Long targetInvestmentNum) 
-    {
-        this.targetInvestmentNum = targetInvestmentNum;
-    }
 
-    public Long getTargetInvestmentNum() 
-    {
-        return targetInvestmentNum;
+    @Override
+    public String getRemark() {
+        return remark;
     }
 
     @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("sysDeptId", getSysDeptId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("isDel", getIsDel())
-            .append("year", getYear())
-            .append("plan", getPlan())
-            .append("targetSigningNum", getTargetSigningNum())
-            .append("targetContractAmount", getTargetContractAmount())
-            .append("targetArrivalAmount", getTargetArrivalAmount())
-            .append("targetInvestmentNum", getTargetInvestmentNum())
-            .toString();
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmDeptPlanArea.java

@@ -0,0 +1,306 @@
+package com.ruoyi.system.domain.project;
+
+import java.math.BigDecimal;
+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_dept_plan_area
+ * 
+ * @author ruoyi
+ * @date 2021-07-05
+ */
+public class BmDeptPlanArea extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id* */
+    private Long id;
+
+    /** 部门id* */
+    @Excel(name = "部门id*")
+    private Long sysDeptId;
+
+    /** 是否删除(0未删除、1已删除)* */
+    @Excel(name = "是否删除(0未删除、1已删除)*")
+    private Long isDel;
+
+    /** 年份 */
+    @Excel(name = "年份")
+    private String year;
+
+    /** 新签约亿元以上项目数 */
+    @Excel(name = "新签约亿元以上项目数")
+    private BigDecimal projectMillionNum;
+
+    /** 工业项目数 */
+    @Excel(name = "工业项目数")
+    private Integer projectIndustryNum;
+
+    /** 1～5亿元项目 */
+    @Excel(name = "1～5亿元项目")
+    private Integer projectOneNum;
+
+    /** 5～10亿元项目 */
+    @Excel(name = "5～10亿元项目")
+    private Integer projectTwoNum;
+
+    /** 10亿元以上 */
+    @Excel(name = "10亿元以上")
+    private Integer projectThrNum;
+
+    /** 15亿元以上 */
+    @Excel(name = "15亿元以上")
+    private Integer projectFourNum;
+
+    /** 20亿元以上 */
+    @Excel(name = "20亿元以上")
+    private Integer projectFiveNum;
+
+    /** 实际利用市外资金（亿元） */
+    @Excel(name = "实际利用市外资金", readConverterExp = "亿=元")
+    private BigDecimal projectCityMoney;
+
+    /** 入省库项目(个数) */
+    @Excel(name = "入省库项目(个数)")
+    private Integer projectProNum;
+
+    /** 十大新兴产业项目数(个数) */
+    @Excel(name = "十大新兴产业项目数(个数)")
+    private Integer projectRisNum;
+
+    /** 现代服务业项目数(个数) */
+    @Excel(name = "现代服务业项目数(个数)")
+    private Integer projectSerNum;
+
+    /** 15亿元以上项目数(个数) */
+    @Excel(name = "15亿元以上项目数(个数)")
+    private Integer projectProFiveNum;
+
+    /** 500强投资新注册公司数(个数) */
+    @Excel(name = "500强投资新注册公司数(个数)")
+    private Integer projectInvestmentNum;
+
+    /** 入统(个数) */
+    @Excel(name = "入统(个数)")
+    private Integer projectIntegrationNum;
+
+    /** 小升规(个数) */
+    @Excel(name = "小升规(个数)")
+    private Integer projectSmallNum;
+
+    /** 新入规(个数) */
+    @Excel(name = "新入规(个数)")
+    private Integer projectNewNum;
+
+    /**
+     * 部门名称
+     */
+    @Excel(name = "部门名称")
+    private String deptName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setYear(String year) 
+    {
+        this.year = year;
+    }
+
+    public String getYear() 
+    {
+        return year;
+    }
+    public void setProjectMillionNum(BigDecimal projectMillionNum) 
+    {
+        this.projectMillionNum = projectMillionNum;
+    }
+
+    public BigDecimal getProjectMillionNum() 
+    {
+        return projectMillionNum;
+    }
+    public void setProjectIndustryNum(Integer projectIndustryNum) 
+    {
+        this.projectIndustryNum = projectIndustryNum;
+    }
+
+    public Integer getProjectIndustryNum() 
+    {
+        return projectIndustryNum;
+    }
+    public void setProjectOneNum(Integer projectOneNum) 
+    {
+        this.projectOneNum = projectOneNum;
+    }
+
+    public Integer getProjectOneNum() 
+    {
+        return projectOneNum;
+    }
+    public void setProjectTwoNum(Integer projectTwoNum) 
+    {
+        this.projectTwoNum = projectTwoNum;
+    }
+
+    public Integer getProjectTwoNum() 
+    {
+        return projectTwoNum;
+    }
+    public void setProjectThrNum(Integer projectThrNum) 
+    {
+        this.projectThrNum = projectThrNum;
+    }
+
+    public Integer getProjectThrNum() 
+    {
+        return projectThrNum;
+    }
+    public void setProjectFourNum(Integer projectFourNum) 
+    {
+        this.projectFourNum = projectFourNum;
+    }
+
+    public Integer getProjectFourNum() 
+    {
+        return projectFourNum;
+    }
+    public void setProjectFiveNum(Integer projectFiveNum) 
+    {
+        this.projectFiveNum = projectFiveNum;
+    }
+
+    public Integer getProjectFiveNum() 
+    {
+        return projectFiveNum;
+    }
+    public void setProjectCityMoney(BigDecimal projectCityMoney) 
+    {
+        this.projectCityMoney = projectCityMoney;
+    }
+
+    public BigDecimal getProjectCityMoney() 
+    {
+        return projectCityMoney;
+    }
+    public void setProjectProNum(Integer projectProNum) 
+    {
+        this.projectProNum = projectProNum;
+    }
+
+    public Integer getProjectProNum() 
+    {
+        return projectProNum;
+    }
+    public void setProjectRisNum(Integer projectRisNum) 
+    {
+        this.projectRisNum = projectRisNum;
+    }
+
+    public Integer getProjectRisNum() 
+    {
+        return projectRisNum;
+    }
+    public void setProjectSerNum(Integer projectSerNum) 
+    {
+        this.projectSerNum = projectSerNum;
+    }
+
+    public Integer getProjectSerNum() 
+    {
+        return projectSerNum;
+    }
+    public void setProjectProFiveNum(Integer projectProFiveNum) 
+    {
+        this.projectProFiveNum = projectProFiveNum;
+    }
+
+    public Integer getProjectProFiveNum() 
+    {
+        return projectProFiveNum;
+    }
+    public void setProjectInvestmentNum(Integer projectInvestmentNum) 
+    {
+        this.projectInvestmentNum = projectInvestmentNum;
+    }
+
+    public Integer getProjectInvestmentNum() 
+    {
+        return projectInvestmentNum;
+    }
+    public void setProjectIntegrationNum(Integer projectIntegrationNum) 
+    {
+        this.projectIntegrationNum = projectIntegrationNum;
+    }
+
+    public Integer getProjectIntegrationNum() 
+    {
+        return projectIntegrationNum;
+    }
+    public void setProjectSmallNum(Integer projectSmallNum) 
+    {
+        this.projectSmallNum = projectSmallNum;
+    }
+
+    public Integer getProjectSmallNum() 
+    {
+        return projectSmallNum;
+    }
+    public void setProjectNewNum(Integer projectNewNum) 
+    {
+        this.projectNewNum = projectNewNum;
+    }
+
+    public Integer getProjectNewNum() 
+    {
+        return projectNewNum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("sysDeptId", getSysDeptId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("year", getYear())
+            .append("projectMillionNum", getProjectMillionNum())
+            .append("projectIndustryNum", getProjectIndustryNum())
+            .append("projectOneNum", getProjectOneNum())
+            .append("projectTwoNum", getProjectTwoNum())
+            .append("projectThrNum", getProjectThrNum())
+            .append("projectFourNum", getProjectFourNum())
+            .append("projectFiveNum", getProjectFiveNum())
+            .append("projectCityMoney", getProjectCityMoney())
+            .append("projectProNum", getProjectProNum())
+            .append("projectRisNum", getProjectRisNum())
+            .append("projectSerNum", getProjectSerNum())
+            .append("projectProFiveNum", getProjectProFiveNum())
+            .append("projectInvestmentNum", getProjectInvestmentNum())
+            .append("projectIntegrationNum", getProjectIntegrationNum())
+            .append("projectSmallNum", getProjectSmallNum())
+            .append("projectNewNum", getProjectNewNum())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -61,7 +61,8 @@ public class BmProjectReport extends BaseEntity
 
     /** 项目id* */
     @Excel(name = "项目id*")
-    private String bmProjectId;
+    private Long bmProjectId;
+
 
     public String getIvestor() {
         return ivestor;
@@ -159,14 +160,17 @@ public class BmProjectReport extends BaseEntity
     {
         return url;
     }
+    public void setBmProjectId(Long bmProjectId)
+    {
+        this.bmProjectId = bmProjectId;
+    }
 
-    public String getBmProjectId() {
+    public Long getBmProjectId()
+    {
         return bmProjectId;
     }
 
-    public void setBmProjectId(String bmProjectId) {
-        this.bmProjectId = bmProjectId;
-    }
+
 
     @Override
     public String toString() {

ruoyi-system/src/main/java/com/ruoyi/system/mapper/project/BmDeptPlanAreaMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper.project;
+
+import com.ruoyi.system.domain.project.BmDeptPlanArea;
+
+import java.util.List;
+
+
+/**
+ * 两区及乡镇单位部门招商计划Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-07-05
+ */
+public interface BmDeptPlanAreaMapper 
+{
+    /**
+     * 查询两区及乡镇单位部门招商计划
+     * 
+     * @param id 两区及乡镇单位部门招商计划ID
+     * @return 两区及乡镇单位部门招商计划
+     */
+    public BmDeptPlanArea selectBmDeptPlanAreaById(Long id);
+
+    /**
+     * 查询两区及乡镇单位部门招商计划列表
+     * 
+     * @param bmDeptPlanArea 两区及乡镇单位部门招商计划
+     * @return 两区及乡镇单位部门招商计划集合
+     */
+    public List<BmDeptPlanArea> selectBmDeptPlanAreaList(BmDeptPlanArea bmDeptPlanArea);
+
+    /**
+     * 新增两区及乡镇单位部门招商计划
+     * 
+     * @param bmDeptPlanArea 两区及乡镇单位部门招商计划
+     * @return 结果
+     */
+    public int insertBmDeptPlanArea(BmDeptPlanArea bmDeptPlanArea);
+
+    /**
+     * 修改两区及乡镇单位部门招商计划
+     * 
+     * @param bmDeptPlanArea 两区及乡镇单位部门招商计划
+     * @return 结果
+     */
+    public int updateBmDeptPlanArea(BmDeptPlanArea bmDeptPlanArea);
+
+    /**
+     * 删除两区及乡镇单位部门招商计划
+     * 
+     * @param id 两区及乡镇单位部门招商计划ID
+     * @return 结果
+     */
+    public int deleteBmDeptPlanAreaById(Long id);
+
+    /**
+     * 批量删除两区及乡镇单位部门招商计划
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteBmDeptPlanAreaByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmDeptPlanAreaServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.system.service.impl.project;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.project.BmDeptPlanArea;
+import com.ruoyi.system.mapper.project.BmDeptPlanAreaMapper;
+import com.ruoyi.system.service.project.IBmDeptPlanAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 两区及乡镇单位部门招商计划Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-07-05
+ */
+@Service
+public class BmDeptPlanAreaServiceImpl implements IBmDeptPlanAreaService
+{
+    @Autowired
+    private BmDeptPlanAreaMapper bmDeptPlanAreaMapper;
+
+    /**
+     * 查询两区及乡镇单位部门招商计划
+     * 
+     * @param id 两区及乡镇单位部门招商计划ID
+     * @return 两区及乡镇单位部门招商计划
+     */
+    @Override
+    public BmDeptPlanArea selectBmDeptPlanAreaById(Long id)
+    {
+        return bmDeptPlanAreaMapper.selectBmDeptPlanAreaById(id);
+    }
+
+    /**
+     * 查询两区及乡镇单位部门招商计划列表
+     * 
+     * @param bmDeptPlanArea 两区及乡镇单位部门招商计划
+     * @return 两区及乡镇单位部门招商计划
+     */
+    @Override
+    public List<BmDeptPlanArea> selectBmDeptPlanAreaList(BmDeptPlanArea bmDeptPlanArea)
+    {
+        return bmDeptPlanAreaMapper.selectBmDeptPlanAreaList(bmDeptPlanArea);
+    }
+
+    /**
+     * 新增两区及乡镇单位部门招商计划
+     * 
+     * @param bmDeptPlanArea 两区及乡镇单位部门招商计划
+     * @return 结果
+     */
+    @Override
+    public int insertBmDeptPlanArea(BmDeptPlanArea bmDeptPlanArea)
+    {
+        bmDeptPlanArea.setCreateTime(DateUtils.getNowDate());
+        return bmDeptPlanAreaMapper.insertBmDeptPlanArea(bmDeptPlanArea);
+    }
+
+    /**
+     * 修改两区及乡镇单位部门招商计划
+     * 
+     * @param bmDeptPlanArea 两区及乡镇单位部门招商计划
+     * @return 结果
+     */
+    @Override
+    public int updateBmDeptPlanArea(BmDeptPlanArea bmDeptPlanArea)
+    {
+        bmDeptPlanArea.setUpdateTime(DateUtils.getNowDate());
+        return bmDeptPlanAreaMapper.updateBmDeptPlanArea(bmDeptPlanArea);
+    }
+
+    /**
+     * 批量删除两区及乡镇单位部门招商计划
+     * 
+     * @param ids 需要删除的两区及乡镇单位部门招商计划ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmDeptPlanAreaByIds(Long[] ids)
+    {
+        return bmDeptPlanAreaMapper.deleteBmDeptPlanAreaByIds(ids);
+    }
+
+    /**
+     * 删除两区及乡镇单位部门招商计划信息
+     * 
+     * @param id 两区及乡镇单位部门招商计划ID
+     * @return 结果
+     */
+    @Override
+    public int deleteBmDeptPlanAreaById(Long id)
+    {
+        return bmDeptPlanAreaMapper.deleteBmDeptPlanAreaById(id);
+    }
+}

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service.impl.project;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.project.BmProjectReport;
 import com.ruoyi.system.mapper.project.BmProjectReportMapper;
@@ -39,6 +41,7 @@ public class BmProjectReportServiceImpl implements IBmProjectReportService
      * @return 项目上报
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<BmProjectReport> selectBmProjectReportList(BmProjectReport bmProjectReport)
     {
         return bmProjectReportMapper.selectBmProjectReportList(bmProjectReport);

ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmDeptPlanAreaService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service.project;
+
+import com.ruoyi.system.domain.project.BmDeptPlanArea;
+
+import java.util.List;
+
+/**
+ * 两区及乡镇单位部门招商计划Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-07-05
+ */
+public interface IBmDeptPlanAreaService 
+{
+    /**
+     * 查询两区及乡镇单位部门招商计划
+     * 
+     * @param id 两区及乡镇单位部门招商计划ID
+     * @return 两区及乡镇单位部门招商计划
+     */
+    public BmDeptPlanArea selectBmDeptPlanAreaById(Long id);
+
+    /**
+     * 查询两区及乡镇单位部门招商计划列表
+     * 
+     * @param bmDeptPlanArea 两区及乡镇单位部门招商计划
+     * @return 两区及乡镇单位部门招商计划集合
+     */
+    public List<BmDeptPlanArea> selectBmDeptPlanAreaList(BmDeptPlanArea bmDeptPlanArea);
+
+    /**
+     * 新增两区及乡镇单位部门招商计划
+     * 
+     * @param bmDeptPlanArea 两区及乡镇单位部门招商计划
+     * @return 结果
+     */
+    public int insertBmDeptPlanArea(BmDeptPlanArea bmDeptPlanArea);
+
+    /**
+     * 修改两区及乡镇单位部门招商计划
+     * 
+     * @param bmDeptPlanArea 两区及乡镇单位部门招商计划
+     * @return 结果
+     */
+    public int updateBmDeptPlanArea(BmDeptPlanArea bmDeptPlanArea);
+
+    /**
+     * 批量删除两区及乡镇单位部门招商计划
+     * 
+     * @param ids 需要删除的两区及乡镇单位部门招商计划ID
+     * @return 结果
+     */
+    public int deleteBmDeptPlanAreaByIds(Long[] ids);
+
+    /**
+     * 删除两区及乡镇单位部门招商计划信息
+     * 
+     * @param id 两区及乡镇单位部门招商计划ID
+     * @return 结果
+     */
+    public int deleteBmDeptPlanAreaById(Long id);
+}

ruoyi-system/src/main/resources/mapper/system/project/BmDeptPlanAreaMapper.xml

@@ -0,0 +1,168 @@
+<?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.BmDeptPlanAreaMapper">
+    
+    <resultMap type="BmDeptPlanArea" id="BmDeptPlanAreaResult">
+        <result property="id"    column="id"    />
+        <result property="sysDeptId"    column="sys_dept_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="year"    column="year"    />
+        <result property="projectMillionNum"    column="project_million_num"    />
+        <result property="projectIndustryNum"    column="project_industry_num"    />
+        <result property="projectOneNum"    column="project_one_num"    />
+        <result property="projectTwoNum"    column="project_two_num"    />
+        <result property="projectThrNum"    column="project_thr_num"    />
+        <result property="projectFourNum"    column="project_four_num"    />
+        <result property="projectFiveNum"    column="project_five_num"    />
+        <result property="projectCityMoney"    column="project_city_money"    />
+        <result property="projectProNum"    column="project_pro_num"    />
+        <result property="projectRisNum"    column="project_ris_num"    />
+        <result property="projectSerNum"    column="project_ser_num"    />
+        <result property="projectProFiveNum"    column="project_pro_five_num"    />
+        <result property="projectInvestmentNum"    column="project_investment_num"    />
+        <result property="projectIntegrationNum"    column="project_integration_num"    />
+        <result property="projectSmallNum"    column="project_small_num"    />
+        <result property="projectNewNum"    column="project_new_num"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectBmDeptPlanAreaVo">
+        select id, sys_dept_id, create_by, create_time, update_by, update_time, is_del, year, project_million_num, project_industry_num, project_one_num, project_two_num, project_thr_num, project_four_num, project_five_num, project_city_money, project_pro_num, project_ris_num, project_ser_num, project_pro_five_num, project_investment_num, project_integration_num, project_small_num, project_new_num, remark from bm_dept_plan_area
+    </sql>
+
+    <select id="selectBmDeptPlanAreaList" parameterType="BmDeptPlanArea" resultMap="BmDeptPlanAreaResult">
+        select a.id, a.sys_dept_id, a.create_by, a.create_time, a.update_by, a.update_time, a.is_del, a.year, a.project_million_num, a.project_industry_num, a.project_one_num, a.project_two_num, a.project_thr_num, a.project_four_num, a.project_five_num, a.project_city_money, a.project_pro_num, a.project_ris_num, a.project_ser_num, a.project_pro_five_num, a.project_investment_num, a.project_integration_num, a.project_small_num, a.project_new_num, a.remark
+        from bm_dept_plan_area a
+        left join sys_dept d on a.sys_dept_id = d.dept_id and a.is_del = '0'
+        <where>  
+            <if test="sysDeptId != null "> and a.sys_dept_id = #{sysDeptId}</if>
+            <if test="year != null  and year != ''"> and a.year = #{year}</if>
+            <if test="projectMillionNum != null "> and a.project_million_num = #{projectMillionNum}</if>
+            <if test="projectIndustryNum != null "> and a.project_industry_num = #{projectIndustryNum}</if>
+            <if test="projectOneNum != null "> and a.project_one_num = #{projectOneNum}</if>
+            <if test="projectTwoNum != null "> and a.project_two_num = #{projectTwoNum}</if>
+            <if test="projectThrNum != null "> and a.project_thr_num = #{projectThrNum}</if>
+            <if test="projectFourNum != null "> and a.project_four_num = #{projectFourNum}</if>
+            <if test="projectFiveNum != null "> and a.project_five_num = #{projectFiveNum}</if>
+            <if test="projectCityMoney != null "> and a.project_city_money = #{projectCityMoney}</if>
+            <if test="projectProNum != null "> and a.project_pro_num = #{projectProNum}</if>
+            <if test="projectRisNum != null "> and a.project_ris_num = #{projectRisNum}</if>
+            <if test="projectSerNum != null "> and a.project_ser_num = #{projectSerNum}</if>
+            <if test="projectProFiveNum != null "> and a.project_pro_five_num = #{projectProFiveNum}</if>
+            <if test="projectInvestmentNum != null "> and a.project_investment_num = #{projectInvestmentNum}</if>
+            <if test="projectIntegrationNum != null "> and a.project_integration_num = #{projectIntegrationNum}</if>
+            <if test="projectSmallNum != null "> and a.project_small_num = #{projectSmallNum}</if>
+            <if test="projectNewNum != null "> and a.project_new_num = #{projectNewNum}</if>
+        </where>
+        order by a.create_time DESC
+    </select>
+    
+    <select id="selectBmDeptPlanAreaById" parameterType="Long" resultMap="BmDeptPlanAreaResult">
+        <include refid="selectBmDeptPlanAreaVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBmDeptPlanArea" parameterType="BmDeptPlanArea" useGeneratedKeys="true" keyProperty="id">
+        insert into bm_dept_plan_area
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sysDeptId != null">sys_dept_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="year != null">year,</if>
+            <if test="projectMillionNum != null">project_million_num,</if>
+            <if test="projectIndustryNum != null">project_industry_num,</if>
+            <if test="projectOneNum != null">project_one_num,</if>
+            <if test="projectTwoNum != null">project_two_num,</if>
+            <if test="projectThrNum != null">project_thr_num,</if>
+            <if test="projectFourNum != null">project_four_num,</if>
+            <if test="projectFiveNum != null">project_five_num,</if>
+            <if test="projectCityMoney != null">project_city_money,</if>
+            <if test="projectProNum != null">project_pro_num,</if>
+            <if test="projectRisNum != null">project_ris_num,</if>
+            <if test="projectSerNum != null">project_ser_num,</if>
+            <if test="projectProFiveNum != null">project_pro_five_num,</if>
+            <if test="projectInvestmentNum != null">project_investment_num,</if>
+            <if test="projectIntegrationNum != null">project_integration_num,</if>
+            <if test="projectSmallNum != null">project_small_num,</if>
+            <if test="projectNewNum != null">project_new_num,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sysDeptId != null">#{sysDeptId},</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="year != null">#{year},</if>
+            <if test="projectMillionNum != null">#{projectMillionNum},</if>
+            <if test="projectIndustryNum != null">#{projectIndustryNum},</if>
+            <if test="projectOneNum != null">#{projectOneNum},</if>
+            <if test="projectTwoNum != null">#{projectTwoNum},</if>
+            <if test="projectThrNum != null">#{projectThrNum},</if>
+            <if test="projectFourNum != null">#{projectFourNum},</if>
+            <if test="projectFiveNum != null">#{projectFiveNum},</if>
+            <if test="projectCityMoney != null">#{projectCityMoney},</if>
+            <if test="projectProNum != null">#{projectProNum},</if>
+            <if test="projectRisNum != null">#{projectRisNum},</if>
+            <if test="projectSerNum != null">#{projectSerNum},</if>
+            <if test="projectProFiveNum != null">#{projectProFiveNum},</if>
+            <if test="projectInvestmentNum != null">#{projectInvestmentNum},</if>
+            <if test="projectIntegrationNum != null">#{projectIntegrationNum},</if>
+            <if test="projectSmallNum != null">#{projectSmallNum},</if>
+            <if test="projectNewNum != null">#{projectNewNum},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBmDeptPlanArea" parameterType="BmDeptPlanArea">
+        update bm_dept_plan_area
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sysDeptId != null">sys_dept_id = #{sysDeptId},</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="year != null">year = #{year},</if>
+            <if test="projectMillionNum != null">project_million_num = #{projectMillionNum},</if>
+            <if test="projectIndustryNum != null">project_industry_num = #{projectIndustryNum},</if>
+            <if test="projectOneNum != null">project_one_num = #{projectOneNum},</if>
+            <if test="projectTwoNum != null">project_two_num = #{projectTwoNum},</if>
+            <if test="projectThrNum != null">project_thr_num = #{projectThrNum},</if>
+            <if test="projectFourNum != null">project_four_num = #{projectFourNum},</if>
+            <if test="projectFiveNum != null">project_five_num = #{projectFiveNum},</if>
+            <if test="projectCityMoney != null">project_city_money = #{projectCityMoney},</if>
+            <if test="projectProNum != null">project_pro_num = #{projectProNum},</if>
+            <if test="projectRisNum != null">project_ris_num = #{projectRisNum},</if>
+            <if test="projectSerNum != null">project_ser_num = #{projectSerNum},</if>
+            <if test="projectProFiveNum != null">project_pro_five_num = #{projectProFiveNum},</if>
+            <if test="projectInvestmentNum != null">project_investment_num = #{projectInvestmentNum},</if>
+            <if test="projectIntegrationNum != null">project_integration_num = #{projectIntegrationNum},</if>
+            <if test="projectSmallNum != null">project_small_num = #{projectSmallNum},</if>
+            <if test="projectNewNum != null">project_new_num = #{projectNewNum},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBmDeptPlanAreaById" parameterType="Long">
+        delete from bm_dept_plan_area where id = #{id}
+    </delete>
+
+    <delete id="deleteBmDeptPlanAreaByIds" parameterType="String">
+        delete from bm_dept_plan_area where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/project/BmDeptPlanMapper.xml

@@ -13,31 +13,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="isDel"    column="is_del"    />
         <result property="year"    column="year"    />
-        <result property="plan"    column="plan"    />
-        <result property="targetSigningNum"    column="target_signing_num"    />
         <result property="targetContractAmount"    column="target_contract_amount"    />
         <result property="targetArrivalAmount"    column="target_arrival_amount"    />
-        <result property="targetInvestmentNum"    column="target_investment_num"    />
+        <result property="remark"    column="remark"    />
         <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectBmDeptPlanVo">
-        select id, sys_dept_id, create_by, create_time, update_by, update_time, is_del, year, plan, target_signing_num, target_contract_amount, target_arrival_amount, target_investment_num from bm_dept_Plan
+        select id, sys_dept_id, create_by, create_time, update_by, update_time, is_del, year,  target_contract_amount, target_arrival_amount, remark from bm_dept_Plan
     </sql>
 
     <select id="selectBmDeptPlanList" parameterType="BmDeptPlan" resultMap="BmDeptPlanResult">
-        select p.id, p.sys_dept_id, p.create_by, p.create_time, p.update_by, p.update_time, p.is_del, p.year, p.plan, p.target_signing_num, p.target_contract_amount, p.target_arrival_amount, p.target_investment_num, d.dept_name
+        select p.id, p.sys_dept_id, p.create_by, p.create_time, p.update_by, p.update_time, p.is_del, p.year, p.target_contract_amount, p.target_arrival_amount, p.remark, d.dept_name
         from bm_dept_plan p
         left join sys_dept d on p.sys_dept_id = d.dept_id and p.is_del = '0'
         <where>
+            is_del = '0'
             <if test="sysDeptId != null "> and sys_dept_id = #{sysDeptId}</if>
-            <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="year != null  and year != ''"> and year = #{year}</if>
-            <if test="plan != null "> and plan = #{plan}</if>
-            <if test="targetSigningNum != null "> and target_signing_num = #{targetSigningNum}</if>
             <if test="targetContractAmount != null "> and target_contract_amount = #{targetContractAmount}</if>
             <if test="targetArrivalAmount != null "> and target_arrival_amount = #{targetArrivalAmount}</if>
-            <if test="targetInvestmentNum != null "> and target_investment_num = #{targetInvestmentNum}</if>
         </where>
         order by p.create_time DESC
     </select>
@@ -57,11 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null">is_del,</if>
             <if test="year != null">year,</if>
-            <if test="plan != null">plan,</if>
-            <if test="targetSigningNum != null">target_signing_num,</if>
             <if test="targetContractAmount != null">target_contract_amount,</if>
             <if test="targetArrivalAmount != null">target_arrival_amount,</if>
-            <if test="targetInvestmentNum != null">target_investment_num,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sysDeptId != null">#{sysDeptId},</if>
@@ -71,11 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="year != null">#{year},</if>
-            <if test="plan != null">#{plan},</if>
-            <if test="targetSigningNum != null">#{targetSigningNum},</if>
             <if test="targetContractAmount != null">#{targetContractAmount},</if>
             <if test="targetArrivalAmount != null">#{targetArrivalAmount},</if>
-            <if test="targetInvestmentNum != null">#{targetInvestmentNum},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -89,11 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="year != null">year = #{year},</if>
-            <if test="plan != null">plan = #{plan},</if>
-            <if test="targetSigningNum != null">target_signing_num = #{targetSigningNum},</if>
             <if test="targetContractAmount != null">target_contract_amount = #{targetContractAmount},</if>
             <if test="targetArrivalAmount != null">target_arrival_amount = #{targetArrivalAmount},</if>
-            <if test="targetInvestmentNum != null">target_investment_num = #{targetInvestmentNum},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-system/src/main/resources/mapper/system/project/BmProjectMapper.xml

@@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_dept d on p.dept_id = d.dept_id and p.is_del = '0'
         left join sys_dict_data sdd on p.project_status = sdd.dict_value and sdd.dict_type = 'project_status'
         <where>
+            <if test="deptId != null">and p.dept_id = #{deptId}</if>
             <if test="name != null  and name != ''"> and p.name like concat('%', #{name}, '%')</if>
             <if test="industryCategory != null  and industryCategory != ''"> and p.industry_category = #{industryCategory}</if>
             <if test="industry != null  and industry != ''"> and p.industry = #{industry}</if>

ruoyi-ui/src/api/area/index.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询两区及乡镇单位部门招商计划列表
+export function listArea(query) {
+  return request({
+    url: '/dept/area/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询两区及乡镇单位部门招商计划详细
+export function getArea(id) {
+  return request({
+    url: '/dept/area/' + id,
+    method: 'get'
+  })
+}
+
+// 新增两区及乡镇单位部门招商计划
+export function addArea(data) {
+  return request({
+    url: '/dept/area',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改两区及乡镇单位部门招商计划
+export function updateArea(data) {
+  return request({
+    url: '/dept/area',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除两区及乡镇单位部门招商计划
+export function delArea(id) {
+  return request({
+    url: '/dept/area/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出两区及乡镇单位部门招商计划
+export function exportArea(query) {
+  return request({
+    url: '/dept/area/export',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/settings.js

@@ -35,6 +35,6 @@ module.exports = {
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
   errorLog: 'production',
-  apiUrl: 'http://192.168.101.11:8080'
+  apiUrl: 'http://192.168.101.11:8010'
   // apiUrl: 'http://47.99.82.249:80'
 }

ruoyi-ui/src/views/area/index.vue

@@ -0,0 +1,391 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="年份" prop="configName">
+        <el-date-picker
+          v-model="queryParams.year"
+          type="year"
+          value-format="yyyy"
+          placeholder="选择年"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="部门" prop="sysDeptId">
+        <el-cascader :options="typeOptionstwo" :props="{value: 'id'}" @change="changeBtn" :show-all-levels="false"></el-cascader>
+      </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="['dept:area: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="['dept:area:edit']"
+        >修改</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="['dept:area: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="['dept:area:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="部门名称" align="center" prop="deptName" />
+      <el-table-column label="年份" align="center" prop="year" />
+      <el-table-column label="新签约亿元以上项目数(个数)" align="center" prop="projectMillionNum" />
+      <el-table-column label="工业项目数(个数)" align="center" prop="projectIndustryNum" />
+      <el-table-column label="1～5亿元项目" align="center" prop="projectOneNum" />
+      <el-table-column label="5～10亿元项目" align="center" prop="projectTwoNum" />
+      <el-table-column label="10亿元以上" align="center" prop="projectThrNum" />
+      <el-table-column label="15亿元以上" align="center" prop="projectFourNum" />
+      <el-table-column label="20亿元以上" align="center" prop="projectFiveNum" />
+      <el-table-column label="实际利用市外资金" align="center" prop="projectCityMoney" />
+      <el-table-column label="入省库项目(个数)" align="center" prop="projectProNum" />
+      <el-table-column label="十大新兴产业项目数(个数)" align="center" prop="projectRisNum" />
+      <el-table-column label="现代服务业项目数(个数)" align="center" prop="projectSerNum" />
+      <el-table-column label="15亿元以上项目数(个数)" align="center" prop="projectProFiveNum" />
+      <el-table-column label="500强投资新注册公司数(个数)" align="center" prop="projectInvestmentNum" />
+      <el-table-column label="入统(个数)" align="center" prop="projectIntegrationNum" />
+      <el-table-column label="小升规(个数)" align="center" prop="projectSmallNum" />
+      <el-table-column label="新入规(个数)" align="center" prop="projectNewNum" />
+      <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="['dept:area:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['dept:area: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="year">
+          <el-input v-model="form.year" placeholder="请输入年份" />
+        </el-form-item>
+        <el-form-item label="新签约亿元以上项目数" prop="projectMillionNum">
+          <el-input v-model="form.projectMillionNum" placeholder="请输入新签约亿元以上项目数" />
+        </el-form-item>
+        <el-form-item label="工业项目数" prop="projectIndustryNum">
+          <el-input v-model="form.projectIndustryNum" placeholder="请输入工业项目数" />
+        </el-form-item>
+        <el-form-item label="1～5亿元项目" prop="projectOneNum">
+          <el-input v-model="form.projectOneNum" placeholder="请输入1～5亿元项目" />
+        </el-form-item>
+        <el-form-item label="5～10亿元项目" prop="projectTwoNum">
+          <el-input v-model="form.projectTwoNum" placeholder="请输入5～10亿元项目" />
+        </el-form-item>
+        <el-form-item label="10亿元以上" prop="projectThrNum">
+          <el-input v-model="form.projectThrNum" placeholder="请输入10亿元以上" />
+        </el-form-item>
+        <el-form-item label="15亿元以上" prop="projectFourNum">
+          <el-input v-model="form.projectFourNum" placeholder="请输入15亿元以上" />
+        </el-form-item>
+        <el-form-item label="20亿元以上" prop="projectFiveNum">
+          <el-input v-model="form.projectFiveNum" placeholder="请输入20亿元以上" />
+        </el-form-item>
+        <el-form-item label="实际利用市外资金" prop="projectCityMoney">
+          <el-input v-model="form.projectCityMoney" placeholder="请输入实际利用市外资金" />
+        </el-form-item>
+        <el-form-item label="入省库项目(个数)" prop="projectProNum">
+          <el-input v-model="form.projectProNum" placeholder="请输入入省库项目(个数)" />
+        </el-form-item>
+        <el-form-item label="十大新兴产业项目数(个数)" prop="projectRisNum">
+          <el-input v-model="form.projectRisNum" placeholder="请输入十大新兴产业项目数(个数)" />
+        </el-form-item>
+        <el-form-item label="现代服务业项目数(个数)" prop="projectSerNum">
+          <el-input v-model="form.projectSerNum" placeholder="请输入现代服务业项目数(个数)" />
+        </el-form-item>
+        <el-form-item label="15亿元以上项目数(个数)" prop="projectProFiveNum">
+          <el-input v-model="form.projectProFiveNum" placeholder="请输入15亿元以上项目数(个数)" />
+        </el-form-item>
+        <el-form-item label="500强投资新注册公司数(个数)" prop="projectInvestmentNum">
+          <el-input v-model="form.projectInvestmentNum" placeholder="请输入500强投资新注册公司数(个数)" />
+        </el-form-item>
+        <el-form-item label="入统(个数)" prop="projectIntegrationNum">
+          <el-input v-model="form.projectIntegrationNum" placeholder="请输入入统(个数)" />
+        </el-form-item>
+        <el-form-item label="小升规(个数)" prop="projectSmallNum">
+          <el-input v-model="form.projectSmallNum" placeholder="请输入小升规(个数)" />
+        </el-form-item>
+        <el-form-item label="新入规(个数)" prop="projectNewNum">
+          <el-input v-model="form.projectNewNum" 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 { listArea, getArea, delArea, addArea, updateArea, exportArea } from "@/api/area/index";
+import { listConfigfieu } from '@/api/system/config'
+
+export default {
+  name: "Area",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 两区及乡镇单位部门招商计划表格数据
+      areaList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+
+      typeOptionstwo:[],
+
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sysDeptId: null,
+        isDel: null,
+        year: null,
+        projectMillionNum: null,
+        projectIndustryNum: null,
+        projectOneNum: null,
+        projectTwoNum: null,
+        projectThrNum: null,
+        projectFourNum: null,
+        projectFiveNum: null,
+        projectCityMoney: null,
+        projectProNum: null,
+        projectRisNum: null,
+        projectSerNum: null,
+        projectProFiveNum: null,
+        projectInvestmentNum: null,
+        projectIntegrationNum: null,
+        projectSmallNum: null,
+        projectNewNum: null,
+        typeOptionstwo:[]
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getListthuy()
+
+  },
+  methods: {
+    /** 查询两区及乡镇单位部门招商计划列表 */
+    getList() {
+      this.loading = true;
+      listArea(this.queryParams).then(response => {
+        this.areaList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    getListthuy() {
+      this.loading = true;
+      listConfigfieu().then((response) => {
+        console.log(response.data)
+        this.typeOptionstwo = response.data;
+        // this.fileList =  this.queryParams.attachment
+        // this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        sysDeptId: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isDel: null,
+        year: null,
+        projectMillionNum: null,
+        projectIndustryNum: null,
+        projectOneNum: null,
+        projectTwoNum: null,
+        projectThrNum: null,
+        projectFourNum: null,
+        projectFiveNum: null,
+        projectCityMoney: null,
+        projectProNum: null,
+        projectRisNum: null,
+        projectSerNum: null,
+        projectProFiveNum: null,
+        projectInvestmentNum: null,
+        projectIntegrationNum: null,
+        projectSmallNum: null,
+        projectNewNum: 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
+      getArea(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) {
+            updateArea(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addArea(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 delArea(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有两区及乡镇单位部门招商计划数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportArea(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/deptplan/index.vue

@@ -25,8 +25,8 @@
            :key="dict.deptId"
            :label="dict.deptName"
            :value="dict.deptId"
-         /> -->
-       </el-select>
+         />
+       </el-select>-->
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -84,11 +84,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="年度" align="center" prop="year" />
       <el-table-column label="部门" align="center" prop="deptName" />
-      <el-table-column label="目标线索数" align="center" prop="plan" />
-      <el-table-column label="目标签约数" align="center" prop="targetSigningNum" />
-      <el-table-column label="目标合同金额" align="center" prop="targetContractAmount" />
-      <el-table-column label="目标到资金额" align="center" prop="targetArrivalAmount" />
-      <el-table-column label="目标投产项目数" align="center" prop="targetInvestmentNum" />
+      <el-table-column label="当年实际到位资金目标任务(万元)" align="center" prop="targetContractAmount" />
+      <el-table-column label="当年新签约金额目标任务(万元)" align="center" prop="targetArrivalAmount" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -133,20 +130,13 @@
         <el-form-item label="部门" prop="sysDeptId">
           <el-cascader :options="typeOptionstwo" :props="{value: 'id'}"   v-model="form.sysDeptId" @change="changeBtn1" :show-all-levels="false"></el-cascader>
         </el-form-item>
-        <el-form-item label="目标线索数" prop="plan">
-          <el-input v-model="form.plan" placeholder="请输入目标线索数" />
-        </el-form-item>
-        <el-form-item label="目标签约数" prop="targetSigningNum">
-          <el-input v-model="form.targetSigningNum" placeholder="请输入目标签约数" />
-        </el-form-item>
-        <el-form-item label="目标合同金额" prop="targetContractAmount">
-          <el-input v-model="form.targetContractAmount" placeholder="请输入目标合同金额" />
-        </el-form-item>
-        <el-form-item label="目标到资金额" prop="targetArrivalAmount">
-          <el-input v-model="form.targetArrivalAmount" placeholder="请输入目标到资金额" />
+
+
+        <el-form-item label="当年实际到位资金目标任务(万元)" prop="targetContractAmount">
+          <el-input v-model="form.targetContractAmount" placeholder="请输入当年实际到位资金目标任务(万元)" />
         </el-form-item>
-        <el-form-item label="目标投产项目数" prop="targetInvestmentNum">
-          <el-input v-model="form.targetInvestmentNum" placeholder="请输入目标投产项目数" />
+        <el-form-item label="当年新签约金额目标任务(万元)" prop="targetArrivalAmount">
+          <el-input v-model="form.targetArrivalAmount" placeholder="请输入当年新签约金额目标任务(万元)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -192,11 +182,8 @@ export default {
         sysDeptId: null,
         isDel: null,
         year: null,
-        plan: null,
-        targetSigningNum: null,
         targetContractAmount: null,
         targetArrivalAmount: null,
-        targetInvestmentNum: null,
         typeOptionstwo:[]
       },
       // 表单参数
@@ -205,20 +192,11 @@ export default {
       },
       // 表单校验
       rules: {
-         targetSigningNum:[
-                  { required: true, message: '请输入目标签约数', trigger: 'change' }
-                ],
         targetContractAmount:[
-                  { required: true, message: '请输入目标合同金额', trigger: 'change' }
+                  { required: true, message: '请输入当年实际到位资金目标任务(万元)', trigger: 'change' }
                 ],
         targetArrivalAmount:[
-                  { required: true, message: '请输入目标到资金额', trigger: 'change' }
-                ],
-        targetInvestmentNum:[
-                  { required: true, message: '请输入目标投产项目数', trigger: 'change' }
-                ],
-        plan:[
-                  { required: true, message: '请输入计划', trigger: 'change' }
+                  { required: true, message: '请输入当年新签约金额目标任务(万元)', trigger: 'change' }
                 ],
         sysDeptId: [
                     { required: true, message: '请选择部门', trigger: 'change' }
@@ -287,11 +265,8 @@ export default {
         updateTime: null,
         isDel: null,
         year: null,
-        plan: null,
-        targetSigningNum: null,
         targetContractAmount: null,
-        targetArrivalAmount: null,
-        targetInvestmentNum: null
+        targetArrivalAmount: null
       };
       this.resetForm("form");
     },