修改统计分析榜单

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

@@ -104,7 +104,6 @@ public class BmConstructionPayController extends BaseController
     /**
      * 首页柱状图
      */
-    //@PreAuthorize("@ss.hasPermi('constructionPay:pay:remove')")
     @GetMapping("/indexEharts")
     public AjaxResult indexEharts(String year)
     {

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

@@ -102,7 +102,6 @@ public class BmDeptPlanController extends BaseController {
     /**
      * 首页-单位榜单
      */
-    @PreAuthorize("@ss.hasPermi('deptPlan:Plan:unitList')")
     @Log(title = " 单位榜单", businessType = BusinessType.INSERT)
     @PostMapping("/unitList")
     public TableDataInfo unitList() {
@@ -113,7 +112,6 @@ public class BmDeptPlanController extends BaseController {
     /**
      * 首页-单位榜单资金
      */
-    @PreAuthorize("@ss.hasPermi('deptPlan:Plan:unitAmountList')")
     @Log(title = " 单位榜单资金", businessType = BusinessType.INSERT)
     @PostMapping("/unitAmountList")
     public TableDataInfo unitAmountList() {
@@ -121,10 +119,30 @@ public class BmDeptPlanController extends BaseController {
         return getDataTable(bmDeptPlanVos);
     }
 
+    /**
+     * 统计分析-在谈线索-单位榜单
+     */
+    @Log(title = " 单位榜单", businessType = BusinessType.INSERT)
+    @PostMapping("/unitClueList")
+    public TableDataInfo unitClueList() {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectUnitClueList();
+        return getDataTable(bmDeptPlanVos);
+    }
+
+
+    /**
+     * 统计分析-签约项目-目标签约数
+     */
+    @Log(title = " 目标签约数", businessType = BusinessType.INSERT)
+    @PostMapping("/targetSigningList")
+    public TableDataInfo targetSigningList() {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectTargetSigningList();
+        return getDataTable(bmDeptPlanVos);
+    }
+
     /**
      * 统计分析-合同金额
      */
-    @PreAuthorize("@ss.hasPermi('deptPlan:Plan:totAmtList')")
     @Log(title = " 统计分析-合同金额", businessType = BusinessType.INSERT)
     @PostMapping("/totAmtList")
     public TableDataInfo totAmtList() {
@@ -145,7 +163,6 @@ public class BmDeptPlanController extends BaseController {
     /**
      * 统计分析-入归榜单
      */
-    //@PreAuthorize("@ss.hasPermi('deptPlan:Plan:totAmtList')")
     @PostMapping("/investmentList")
     public TableDataInfo investmentList() {
         List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectInvestmentList();

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

@@ -137,7 +137,7 @@ public class BmProjectController extends BaseController {
     /**
      * 首页查询待审核列表
      */
-    //@PreAuthorize("@ss.hasPermi('bmProject:project:toBeReviewedList')")
+    @PreAuthorize("@ss.hasPermi('bmProject:project:toBeReviewedList')")
     @GetMapping("/toBeReviewedList")
     public TableDataInfo toBeReviewedList(BmProject bmProject) {
         startPage();
@@ -148,7 +148,7 @@ public class BmProjectController extends BaseController {
     /**
      * 统计分析公共查询列表
      */
-    //@PreAuthorize("@ss.hasPermi('bmProject:project:statistics')")
+    @PreAuthorize("@ss.hasPermi('bmProject:project:statistics')")
     @GetMapping("/statistics/{projectStatus}")
     public TableDataInfo statisticsList(@PathVariable Long[] projectStatus) {
         startPage();

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

@@ -28,8 +28,8 @@ public class BmDeptPlan extends BaseEntity
      */
     private String deptName;
 
-    /** 计划 */
-    @Excel(name = "计划")
+    /**  目标线索数 */
+    @Excel(name = "目标线索数")
     private Long plan;
 
     /** 目标签约数 */

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

@@ -34,7 +34,7 @@ public class BmProjectPersion extends BaseEntity
 
     /** 身份证号码* */
     @Excel(name = "身份证号码*")
-    private String idCode;
+    private String idcode;
 
     /** 联系方式* */
     @Excel(name = "联系方式*")
@@ -78,12 +78,12 @@ public class BmProjectPersion extends BaseEntity
         return address;
     }
 
-    public String getIdCode() {
-        return idCode;
+    public String getIdcode() {
+        return idcode;
     }
 
-    public void setIdCode(String idCode) {
-        this.idCode = idCode;
+    public void setIdcode(String idcode) {
+        this.idcode = idcode;
     }
 
     public void setPhone(String phone)
@@ -98,18 +98,13 @@ public class BmProjectPersion extends BaseEntity
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("bmProjectId", getBmProjectId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("isDel", getIsDel())
-            .append("name", getName())
-            .append("address", getAddress())
-            .append("idcode", getIdCode())
-            .append("phone", getPhone())
-            .toString();
+        return "BmProjectPersion{" +
+                "id=" + id +
+                ", bmProjectId=" + bmProjectId +
+                ", name='" + name + '\'' +
+                ", address='" + address + '\'' +
+                ", idcode='" + idcode + '\'' +
+                ", phone='" + phone + '\'' +
+                '}';
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/BmDeptPlanVo.java

@@ -12,7 +12,7 @@ public class BmDeptPlanVo {
     private String deptName;
 
     /**
-     * 目标任务
+     * 目标投产
      *
      */
     private Integer targetInvestmentNum;
@@ -42,6 +42,32 @@ public class BmDeptPlanVo {
      */
     private BigDecimal totAmt;
 
+    /**
+     * 目标签约数
+     */
+    private Integer targetSigningNum;
+    /**
+     * 目前线索数
+     */
+    private Integer plan;
+
+
+    public Integer getPlan() {
+        return plan;
+    }
+
+    public void setPlan(Integer plan) {
+        this.plan = plan;
+    }
+
+    public Integer getTargetSigningNum() {
+        return targetSigningNum;
+    }
+
+    public void setTargetSigningNum(Integer targetSigningNum) {
+        this.targetSigningNum = targetSigningNum;
+    }
+
     public BigDecimal getTargetContractAmount() {
         return targetContractAmount;
     }

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

@@ -74,6 +74,18 @@ public interface BmDeptPlanMapper
      */
     public List<BmDeptPlanVo> selectUnitAmountList();
 
+    /**
+     * 统计分析-再谈线索-单位榜单
+     * @return
+     */
+    public List<BmDeptPlanVo> selectUnitClueList();
+
+    /**
+     * selectTargetSigningList
+     * @return
+     */
+    public List<BmDeptPlanVo> selectTargetSigningList();
+
     /**
      * 统计分析-合同金额
      * @return

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

@@ -124,6 +124,26 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
         return bmDeptPlanVos;
     }
 
+    /**
+     * 统计分析-再谈线索-单位榜单
+     * @return
+     */
+    @Override
+    public List<BmDeptPlanVo> selectUnitClueList() {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectUnitClueList();
+        return bmDeptPlanVos;
+    }
+
+    /**
+     * 统计分析-签约项目-目标签约数
+     * @return
+     */
+    @Override
+    public List<BmDeptPlanVo> selectTargetSigningList() {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectTargetSigningList();
+        return bmDeptPlanVos;
+    }
+
     /**
      * 统计分析-合同金额
      * @return

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

@@ -75,6 +75,18 @@ public interface IBmDeptPlanService
      */
     public List<BmDeptPlanVo> selectUnitAmountList();
 
+    /**
+     * 统计分析-再谈线索-单位榜单
+     * @return
+     */
+    public List<BmDeptPlanVo> selectUnitClueList();
+
+    /**
+     * 统计分析-签约项目-目标签约数
+     * @return
+     */
+    public List<BmDeptPlanVo> selectTargetSigningList();
+
     /**
      * 统计分析-合同金额
      * @return

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

@@ -112,14 +112,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUnitList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
     SELECT
 	ifnull(s1.dept_name,'') AS deptName,
-	ifnull(s1.target_investment_num,0) AS targetInvestmentNum,
+	ifnull(s1.plan,0) AS targetInvestmentNum,
 	ifnull(count( p.id ),0) AS successMission
     FROM
 	(
 	SELECT
 		sd.dept_name,
 		d.sys_dept_id,
-		d.target_investment_num
+		d.plan
 	FROM
 	    sys_dept sd
 		LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id and d.is_del = '0' and sd.del_flag = '0'
@@ -163,6 +163,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	d.target_arrival_amount DESC
     </select>
 
+    <select id="selectUnitClueList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    SELECT
+	ifnull(s1.dept_name,'') AS deptName,
+	ifnull(s1.plan,0) AS plan,
+	ifnull(count( p.id ),0) AS successMission
+    FROM
+	(
+	SELECT
+		sd.dept_name,
+		d.sys_dept_id,
+		d.plan
+	FROM
+	    sys_dept sd
+		LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id and d.is_del = '0' and sd.del_flag = '0'
+	) s1
+	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id and p.is_del = '0'
+    GROUP BY
+	s1.sys_dept_id
+    ORDER BY
+	successMission DESC,
+	plan DESC
+    </select>
+
+    <select id="selectTargetSigningList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    SELECT
+	ifnull(s1.dept_name,'') AS deptName,
+	ifnull(s1.target_signing_num,0) AS targetSigningNum,
+	ifnull(count( p.id ),0) AS successMission
+    FROM
+	(
+	SELECT
+		sd.dept_name,
+		d.sys_dept_id,
+		d.target_signing_num
+	FROM
+	    sys_dept sd
+		LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id and d.is_del = '0' and sd.del_flag = '0'
+	) s1
+	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id and p.is_del = '0' and p.project_status &gt; 4
+    GROUP BY
+	s1.sys_dept_id
+    ORDER BY
+	successMission DESC,
+	targetSigningNum DESC
+    </select>
+
     <select id="selectTotAmtList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
     SELECT
 	d.dept_name as deptName,
@@ -198,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		FROM
 			bm_project p
 			LEFT JOIN bm_construction_pay cp ON cp.bm_project_id = p.id
-			AND p.is_del = '0' and year(cp.create_time) = '2021'
+			AND p.is_del = '0' and year(cp.create_time) = #{year}
 		) s
 	GROUP BY
 		s.dept_id

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

@@ -221,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     FROM
 	sys_dept d
 	LEFT JOIN bm_project p ON d.dept_id = p.dept_id
-	AND d.del_flag = '0' and d.status = '0' and p.project_status in (1,2,3) and p.is_del = '0'
+	AND d.del_flag = '0' and d.status = '0' and p.project_status in (1,2,3,4) and p.is_del = '0'
 	AND YEAR (p.create_time ) = #{year}
     GROUP BY
 	d.dept_id

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

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDel"    column="is_del"    />
         <result property="name"    column="name"    />
         <result property="address"    column="address"    />
-        <result property="idCode"    column="idcode"    />
+        <result property="idcode"    column="idcode"    />
         <result property="phone"    column="phone"    />
     </resultMap>
 
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="idCode != null  and idCode != ''"> and idcode = #{idCode}</if>
+            <if test="idcode != null  and idcode != ''"> and idcode = #{idcode}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
         </where>
     </select>
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null">is_del,</if>
             <if test="name != null">name,</if>
             <if test="address != null">address,</if>
-            <if test="idCode != null">idcode,</if>
+            <if test="idcode != null">idcode,</if>
             <if test="phone != null">phone,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null">#{isDel},</if>
             <if test="name != null">#{name},</if>
             <if test="address != null">#{address},</if>
-            <if test="idCode != null">#{idCode},</if>
+            <if test="idcode != null">#{idcode},</if>
             <if test="phone != null">#{phone},</if>
          </trim>
     </insert>
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="name != null">name = #{name},</if>
             <if test="address != null">address = #{address},</if>
-            <if test="idCode != null">idcode = #{idCode},</if>
+            <if test="idcode != null">idcode = #{idcode},</if>
             <if test="phone != null">phone = #{phone},</if>
         </trim>
         where id = #{id}