增加防止接口重复提交

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmCompanyShareholder;
 import com.ruoyi.system.service.project.IBmCompanyShareholderService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmCompanyShareholderController extends BaseController
     @PreAuthorize("@ss.hasPermi('shareholder:shareholder:add')")
     @Log(title = "注册企业股东构成", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmCompanyShareholder bmCompanyShareholder)
     {
         return toAjax(bmCompanyShareholderService.insertBmCompanyShareholder(bmCompanyShareholder));

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.project.BmConstructionEq;
 import com.ruoyi.system.service.project.IBmConstructionEqService;
@@ -80,6 +81,7 @@ public class BmConstructionEqController extends BaseController
     @PreAuthorize("@ss.hasPermi('constructionEq:constructionEq:add')")
     @Log(title = "项目设备安装 (最少一条记录)", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmConstructionEq bmConstructionEq)
     {
         return toAjax(bmConstructionEqService.insertBmConstructionEq(bmConstructionEq));

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmConstructionPay;
 import com.ruoyi.system.service.project.IBmConstructionPayService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -71,6 +72,7 @@ public class BmConstructionPayController extends BaseController
     @PreAuthorize("@ss.hasPermi('constructionPay:pay:add')")
     @Log(title = "新增", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmConstructionPay bmConstructionPay)
     {
         return toAjax(bmConstructionPayService.insertBmConstructionPay(bmConstructionPay));

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmConstructionPayInfo;
 import com.ruoyi.system.service.project.IBmConstructionPayInfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmConstructionPayInfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('constructionPayInfo:payInfo:add')")
     @Log(title = "项目入统", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmConstructionPayInfo bmConstructionPayInfo)
     {
         return bmConstructionPayInfoService.insertBmConstructionPayInfo(bmConstructionPayInfo);

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmConstructionRate;
 import com.ruoyi.system.service.project.IBmConstructionRateService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmConstructionRateController extends BaseController
     @PreAuthorize("@ss.hasPermi('constructionRate:rate:add')")
     @Log(title = "项目施工进度", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmConstructionRate bmConstructionRate)
     {
         return toAjax(bmConstructionRateService.insertBmConstructionRate(bmConstructionRate));

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.project;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmDeptPlan;
 import com.ruoyi.system.domain.vo.BmDeptPlanVo;
 import com.ruoyi.system.service.project.IBmDeptPlanService;
@@ -73,6 +74,7 @@ public class BmDeptPlanController extends BaseController {
     @PreAuthorize("@ss.hasPermi('deptPlan:Plan:add')")
     @Log(title = " 部门招商计划", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmDeptPlan bmDeptPlan) {
         return toAjax(bmDeptPlanService.insertBmDeptPlan(bmDeptPlan));
     }

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectConstruction;
 import com.ruoyi.system.service.project.IBmProjectConstructionService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmProjectConstructionController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectConstruction:construction:add')")
     @Log(title = "项目施工", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectConstruction bmProjectConstruction)
     {
         return bmProjectConstructionService.insertBmProjectConstruction(bmProjectConstruction);

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.project;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.project.BmProject;
 import com.ruoyi.system.domain.project.BmProjectStatus;
@@ -74,6 +75,7 @@ public class BmProjectController extends BaseController {
     @PreAuthorize("@ss.hasPermi('bmProject:project:add')")
     @Log(title = "项目(添加线索)", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProject bmProject) {
         return bmProjectService.insertBmProject(bmProject);
     }

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectInfo;
 import com.ruoyi.system.service.project.IBmProjectInfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmProjectInfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectInfo:info:add')")
     @Log(title = "项目-线索信息", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectInfo bmProjectInfo)
     {
         return toAjax(bmProjectInfoService.insertBmProjectInfo(bmProjectInfo));

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.project.BmProjectInvestor;
 import com.ruoyi.system.service.project.IBmProjectInvestorService;
@@ -75,6 +76,7 @@ public class BmProjectInvestorController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectInvestor:investor:add')")
     @Log(title = "项目投资方-企业", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectInvestor bmProjectInvestor)
     {
         return toAjax(bmProjectInvestorService.insertBmProjectInvestor(bmProjectInvestor));

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectOrderinfo;
 import com.ruoyi.system.service.project.IBmProjectOrderinfoService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmProjectOrderinfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectOrderInfo:orderinfo:add')")
     @Log(title = "项目签约", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectOrderinfo bmProjectOrderinfo)
     {
         return bmProjectOrderinfoService.insertBmProjectOrderinfo(bmProjectOrderinfo);

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

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.project;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.project.BmProjectPersion;
 import com.ruoyi.system.service.project.IBmProjectPersionService;
@@ -76,6 +77,7 @@ public class BmProjectPersionController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectPersion:persion:add')")
     @Log(title = "项目投资方-自然人", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectPersion bmProjectPersion)
     {
         return toAjax(bmProjectPersionService.insertBmProjectPersion(bmProjectPersion));

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectProduct;
 import com.ruoyi.system.service.project.IBmProjectProductService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmProjectProductController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectProduct:product:add')")
     @Log(title = "项目投产", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectProduct bmProjectProduct)
     {
         return toAjax(bmProjectProductService.insertBmProjectProduct(bmProjectProduct));

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

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.project.BmProjectReferral;
 import com.ruoyi.system.service.project.IBmProjectReferralService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -75,6 +76,7 @@ public class BmProjectReferralController extends BaseController
     @PreAuthorize("@ss.hasPermi('projectReferral:referral:add')")
     @Log(title = "项目引荐", businessType = BusinessType.INSERT)
     @PostMapping
+    @RepeatSubmit
     public AjaxResult add(@RequestBody BmProjectReferral bmProjectReferral)
     {
         return toAjax(bmProjectReferralService.insertBmProjectReferral(bmProjectReferral));

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

@@ -23,6 +23,11 @@ public class BmDeptPlan extends BaseEntity
     @Excel(name = "年度")
     private String year;
 
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
     /** 计划 */
     @Excel(name = "计划")
     private Long plan;
@@ -43,7 +48,15 @@ public class BmDeptPlan extends BaseEntity
     @Excel(name = "目标投产项目数")
     private Long targetInvestmentNum;
 
-    public void setId(Long id) 
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

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

@@ -36,7 +36,8 @@ public class BmProjectInfoServiceImpl implements IBmProjectInfoService
     @Override
     public BmProjectInfo selectBmProjectInfoById(Long id)
     {
-        return bmProjectInfoMapper.selectBmProjectInfoById(id);
+        BmProjectInfo bmProjectInfo = bmProjectInfoMapper.selectBmProjectInfoById(id);
+        return bmProjectInfo;
     }
 
     /**

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

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="targetContractAmount"    column="target_contract_amount"    />
         <result property="targetArrivalAmount"    column="target_arrival_amount"    />
         <result property="targetInvestmentNum"    column="target_investment_num"    />
+        <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectBmDeptPlanVo">
@@ -25,9 +26,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectBmDeptPlanList" parameterType="BmDeptPlan" resultMap="BmDeptPlanResult">
-        <include refid="selectBmDeptPlanVo"/>
+        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
+        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>
@@ -45,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertBmDeptPlan" parameterType="BmDeptPlan" useGeneratedKeys="true" keyProperty="id">
-        insert into bm_dept_Plan
+        insert into bm_dept_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="sysDeptId != null">sys_dept_id,</if>
             <if test="createBy != null">create_by,</if>
@@ -77,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateBmDeptPlan" parameterType="BmDeptPlan">
-        update bm_dept_Plan
+        update bm_dept_plan
         <trim prefix="SET" suffixOverrides=",">
             <if test="sysDeptId != null">sys_dept_id = #{sysDeptId},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -96,11 +98,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteBmDeptPlanById" parameterType="Long">
-        delete from bm_dept_Plan where id = #{id}
+        delete from bm_dept_plan where id = #{id}
     </delete>
 
     <delete id="deleteBmDeptPlanByIds" parameterType="String">
-        delete from bm_dept_Plan where id in 
+        delete from bm_dept_plan where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

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

@@ -33,6 +33,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isFrameorder"    column="is_frameorder"    />
         <result property="attachment"    column="attachment"    />
         <result property="description"    column="description"    />
+        <collection  property="referralList"  javaType="java.util.List"  resultMap="BmProjectReferralResult" />
+    </resultMap>
+
+    <resultMap type="BmProjectReferral" id="BmProjectReferralResult">
+        <result property="id"    column="r_id"    />
+        <result property="bmProjectId"    column="r_bm_project_id"    />
+        <result property="createBy"    column="r_create_by"    />
+        <result property="createTime"    column="r_create_time"    />
+        <result property="updateBy"    column="r_update_by"    />
+        <result property="updateTime"    column="r_update_time"    />
+        <result property="isDel"    column="r_is_del"    />
+        <result property="phone"    column="r_phone"    />
+        <result property="sysDeptId"    column="r_sys_dept_id"    />
+        <result property="investmentAllcocation"    column="r_investment_allcocation"    />
+        <result property="referral"    column="r_referral"    />
+        <result property="referralPhone"    column="r_referral_phone"    />
     </resultMap>
 
     <sql id="selectBmProjectInfoVo">
@@ -70,12 +86,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectBmProjectInfoById" parameterType="Long" resultMap="BmProjectInfoResult">
-        <include refid="selectBmProjectInfoVo"/>
-        where bm_project_id = #{id}
+    SELECT
+	i.id,
+	i.bm_project_id,
+	i.create_by,
+	i.create_time,
+	i.update_by,
+	i.update_time,
+	i.NAME,
+	i.is_del,
+	i.contactor,
+	i.phone,
+	i.need_amt,
+	i.fixed_assets,
+	i.product_name,
+	i.product_qty,
+	i.product_price,
+	i.product_tax,
+	i.product_emp,
+	i.planned_land,
+	i.independent_land,
+	i.circulation_lan,
+	i.need_room,
+	i.need_factory_room,
+	i.need_bus_room,
+	i.other,
+	i.address,
+	i.is_frameorder,
+	i.attachment,
+	i.description,
+	r.id as r_id,
+	r.bm_project_id as r_bm_project_id,
+	r.create_by as r_create_by,
+	r.create_time as r_create_time,
+	r.update_by as r_update_by,
+	r.update_time as r_update_time,
+	r.is_del as r_is_del,
+	r.phone as r_phone,
+	r.sys_dept_id as r_sys_dept_id,
+	r.investment_allcocation as r_investment_allcocation,
+	r.referral as r_referral,
+	r.referral_phone as r_referral_phone
+    FROM
+	bm_project_info i
+	LEFT JOIN bm_project_referral r ON i.bm_project_id = r.bm_project_id
+	AND i.is_del = '0'
+        where i.bm_project_id = #{id}
     </select>
         
     <insert id="insertBmProjectInfo" parameterType="BmProjectInfo" useGeneratedKeys="true" keyProperty="id">
-        insert into bm_project_info
+        insert ignore into bm_project_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bmProjectId != null">bm_project_id,</if>
             <if test="createBy != null">create_by,</if>

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

@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertBmProjectOrderinfo" parameterType="BmProjectOrderinfo" useGeneratedKeys="true" keyProperty="id">
-        insert into bm_project_orderinfo
+        insert ignore into bm_project_orderinfo
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="bmProjectId != null">bm_project_id,</if>
             <if test="createBy != null">create_by,</if>