fix 修改招商部分问题

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

@@ -2,8 +2,11 @@ package com.ruoyi.web.controller.project;
 
 import java.util.List;
 
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.project.BmDeptPlanArea;
+import com.ruoyi.system.domain.vo.BmDeptPlanVo;
 import com.ruoyi.system.service.project.IBmDeptPlanAreaService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,4 +104,18 @@ public class BmDeptPlanAreaController extends BaseController
     {
         return toAjax(bmDeptPlanAreaService.deleteBmDeptPlanAreaByIds(ids));
     }
+
+
+    /**
+     * 首页-两区及乡镇榜单
+     */
+    @Log(title = "市值榜单", businessType = BusinessType.INSERT)
+    @PostMapping("/areaList")
+    public TableDataInfo areaList(String year) {
+        if (StringUtils.isBlank(year)){
+            year = DateUtils.getYear();
+        }
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanAreaService.selectAreaList(year);
+        return getDataTable(bmDeptPlanVos);
+    }
 }

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

@@ -4,6 +4,8 @@ import java.util.List;
 import java.util.Map;
 
 import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.project.BmDeptPlan;
 import com.ruoyi.system.domain.vo.BmDeptPlanVo;
 import com.ruoyi.system.service.project.IBmDeptPlanService;
@@ -100,22 +102,15 @@ public class BmDeptPlanController extends BaseController {
     }
 
     /**
-     * 首页-单位榜单
+     * 首页-市值榜单
      */
-    @Log(title = " 单位榜单", businessType = BusinessType.INSERT)
+    @Log(title = "市值榜单", businessType = BusinessType.INSERT)
     @PostMapping("/unitList")
-    public TableDataInfo unitList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectUnitList();
-        return getDataTable(bmDeptPlanVos);
-    }
-
-    /**
-     * 首页-单位榜单资金
-     */
-    @Log(title = " 单位榜单资金", businessType = BusinessType.INSERT)
-    @PostMapping("/unitAmountList")
-    public TableDataInfo unitAmountList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectUnitAmountList();
+    public TableDataInfo unitList(String year) {
+        if (StringUtils.isBlank(year)){
+            year = DateUtils.getYear();
+        }
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectUnitList(year);
         return getDataTable(bmDeptPlanVos);
     }
 
@@ -124,19 +119,25 @@ public class BmDeptPlanController extends BaseController {
      */
     @Log(title = " 单位榜单", businessType = BusinessType.INSERT)
     @PostMapping("/unitClueList")
-    public TableDataInfo unitClueList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectUnitClueList();
+    public TableDataInfo unitClueList( String year) {
+        if (StringUtils.isBlank(year)){
+            year = DateUtils.getYear();
+        }
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectUnitClueList(year);
         return getDataTable(bmDeptPlanVos);
     }
 
 
     /**
-     * 统计分析-签约项目-目标签约数
+     * 统计分析-签约项目-两区及乡镇榜单
      */
     @Log(title = " 目标签约数", businessType = BusinessType.INSERT)
     @PostMapping("/targetSigningList")
-    public TableDataInfo targetSigningList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectTargetSigningList();
+    public TableDataInfo targetSigningList(String year) {
+        if (StringUtils.isBlank(year)){
+            year = DateUtils.getYear();
+        }
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectTargetSigningList(year);
         return getDataTable(bmDeptPlanVos);
     }
 
@@ -145,17 +146,35 @@ public class BmDeptPlanController extends BaseController {
      */
     @Log(title = " 统计分析-合同金额", businessType = BusinessType.INSERT)
     @PostMapping("/totAmtList")
-    public TableDataInfo totAmtList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectTotAmtList();
+    public TableDataInfo totAmtList( String year) {
+        if (StringUtils.isBlank(year)){
+            year = DateUtils.getYear();
+        }
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectTotAmtList(year);
         return getDataTable(bmDeptPlanVos);
     }
 
 
+    /**
+     * 统计分析-在建项目-榜单
+     */
+    @PostMapping("/projectUnitAmountUnit")
+    public AjaxResult projectUnitAmountUnit( String year) {
+        if (StringUtils.isBlank(year)){
+            year = DateUtils.getYear();
+        }
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectProjectUnitAmountUnit(year);
+        return AjaxResult.success(bmDeptPlanVos);
+    }
+
     /**
      * 统计分析-在建项目-柱状图
      */
-    @GetMapping("/projectUnitAmountEharts")
-    public AjaxResult projectUnitAmountEharts(String year) {
+    @PostMapping("/projectUnitAmountEharts")
+    public AjaxResult projectUnitAmountEharts( String year) {
+        if (StringUtils.isBlank(year)){
+            year = DateUtils.getYear();
+        }
         Map<String, Object> map = bmDeptPlanService.selectProjectUnitAmountEharts(year);
         return AjaxResult.success(map);
     }
@@ -164,16 +183,22 @@ public class BmDeptPlanController extends BaseController {
      * 统计分析-入归榜单
      */
     @PostMapping("/investmentList")
-    public TableDataInfo investmentList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectInvestmentList();
+    public TableDataInfo investmentList( String year) {
+        if (StringUtils.isBlank(year)){
+            year = DateUtils.getYear();
+        }
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectInvestmentList(year);
         return getDataTable(bmDeptPlanVos);
     }
 
     /**
      * 统计分析-投产项目-柱状图
      */
-    @GetMapping("/projectInvestmentEharts")
-    public AjaxResult projectInvestmentEharts(String year) {
+    @PostMapping("/projectInvestmentEharts")
+    public AjaxResult projectInvestmentEharts( String year) {
+        if (StringUtils.isBlank(year)){
+            year = DateUtils.getYear();
+        }
         Map<String, Object> map = bmDeptPlanService.selectProjectInvestmentEharts(year);
         return AjaxResult.success(map);
     }

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

@@ -192,7 +192,7 @@ public class BmProjectController extends BaseController {
     /**
      * 统计分析-在谈线索-柱状图
      */
-    @GetMapping("/projectEharts")
+    @PostMapping("/projectEharts")
     public AjaxResult projectEharts(String year) {
         Map<String, Object> stringObjectMap = bmProjectService.selectProjectEharts(year);
         return AjaxResult.success(stringObjectMap);
@@ -201,7 +201,7 @@ public class BmProjectController extends BaseController {
     /**
      * 统计分析-签约项目-柱状图
      */
-    @GetMapping("/projectContractEharts")
+    @PostMapping("/projectContractEharts")
     public AjaxResult projectContractEharts(String year) {
         Map<String, Object> stringObjectMap = bmProjectService.selectProjectContractEharts(year);
         return AjaxResult.success(stringObjectMap);

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -52,6 +52,16 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return dateTimeNow(YYYY_MM_DD);
     }
 
+    /**
+     * 获取当前年, 默认格式为yyyy
+     *
+     * @return String
+     */
+    public static String getYear()
+    {
+        return dateTimeNow(YYYY);
+    }
+
     public static final String getTime()
     {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

@@ -6,6 +6,8 @@ import java.util.Iterator;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.ObjectUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -34,19 +36,17 @@ import com.ruoyi.system.domain.SysOperLog;
 
 /**
  * 操作日志记录处理
- * 
+ *
  * @author ruoyi
  */
 @Aspect
 @Component
-public class LogAspect
-{
+public class LogAspect {
     private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
 
     // 配置织入点
     @Pointcut("@annotation(com.ruoyi.common.annotation.Log)")
-    public void logPointCut()
-    {
+    public void logPointCut() {
     }
 
     /**
@@ -55,31 +55,26 @@ public class LogAspect
      * @param joinPoint 切点
      */
     @AfterReturning(pointcut = "logPointCut()", returning = "jsonResult")
-    public void doAfterReturning(JoinPoint joinPoint, Object jsonResult)
-    {
+    public void doAfterReturning(JoinPoint joinPoint, Object jsonResult) {
         handleLog(joinPoint, null, jsonResult);
     }
 
     /**
      * 拦截异常操作
-     * 
+     *
      * @param joinPoint 切点
-     * @param e 异常
+     * @param e         异常
      */
     @AfterThrowing(value = "logPointCut()", throwing = "e")
-    public void doAfterThrowing(JoinPoint joinPoint, Exception e)
-    {
+    public void doAfterThrowing(JoinPoint joinPoint, Exception e) {
         handleLog(joinPoint, e, null);
     }
 
-    protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult)
-    {
-        try
-        {
+    protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult) {
+        try {
             // 获得注解
             Log controllerLog = getAnnotationLog(joinPoint);
-            if (controllerLog == null)
-            {
+            if (controllerLog == null) {
                 return;
             }
 
@@ -96,13 +91,11 @@ public class LogAspect
             operLog.setJsonResult(JSON.toJSONString(jsonResult));
 
             operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
-            if (loginUser != null)
-            {
+            if (loginUser != null) {
                 operLog.setOperName(loginUser.getUsername());
             }
 
-            if (e != null)
-            {
+            if (e != null) {
                 operLog.setStatus(BusinessStatus.FAIL.ordinal());
                 operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
             }
@@ -116,9 +109,7 @@ public class LogAspect
             getControllerMethodDescription(joinPoint, controllerLog, operLog);
             // 保存数据库
             AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
-        }
-        catch (Exception exp)
-        {
+        } catch (Exception exp) {
             // 记录本地异常日志
             log.error("==前置通知异常==");
             log.error("异常信息:{}", exp.getMessage());
@@ -128,13 +119,12 @@ public class LogAspect
 
     /**
      * 获取注解中对方法的描述信息 用于Controller层注解
-     * 
-     * @param log 日志
+     *
+     * @param log     日志
      * @param operLog 操作日志
      * @throws Exception
      */
-    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception
-    {
+    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception {
         // 设置action动作
         operLog.setBusinessType(log.businessType().ordinal());
         // 设置标题
@@ -142,8 +132,7 @@ public class LogAspect
         // 设置操作人类别
         operLog.setOperatorType(log.operatorType().ordinal());
         // 是否需要保存request，参数和值
-        if (log.isSaveRequestData())
-        {
+        if (log.isSaveRequestData()) {
             // 获取参数的信息，传入到数据库中。
             setRequestValue(joinPoint, operLog);
         }
@@ -151,20 +140,16 @@ public class LogAspect
 
     /**
      * 获取请求的参数，放到log中
-     * 
+     *
      * @param operLog 操作日志
      * @throws Exception 异常
      */
-    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception
-    {
+    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception {
         String requestMethod = operLog.getRequestMethod();
-        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))
-        {
+        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)) {
             String params = argsArrayToString(joinPoint.getArgs());
             operLog.setOperParam(StringUtils.substring(params, 0, 2000));
-        }
-        else
-        {
+        } else {
             Map<?, ?> paramsMap = (Map<?, ?>) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
             operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
         }
@@ -173,14 +158,12 @@ public class LogAspect
     /**
      * 是否存在注解，如果存在就获取
      */
-    private Log getAnnotationLog(JoinPoint joinPoint) throws Exception
-    {
+    private Log getAnnotationLog(JoinPoint joinPoint) throws Exception {
         Signature signature = joinPoint.getSignature();
         MethodSignature methodSignature = (MethodSignature) signature;
         Method method = methodSignature.getMethod();
 
-        if (method != null)
-        {
+        if (method != null) {
             return method.getAnnotation(Log.class);
         }
         return null;
@@ -189,15 +172,11 @@ public class LogAspect
     /**
      * 参数拼装
      */
-    private String argsArrayToString(Object[] paramsArray)
-    {
+    private String argsArrayToString(Object[] paramsArray) {
         String params = "";
-        if (paramsArray != null && paramsArray.length > 0)
-        {
-            for (int i = 0; i < paramsArray.length; i++)
-            {
-                if (!isFilterObject(paramsArray[i]))
-                {
+        if (paramsArray != null && paramsArray.length > 0) {
+            for (int i = 0; i < paramsArray.length; i++) {
+                if (paramsArray[i] != null && !isFilterObject(paramsArray[i])) {
                     Object jsonObj = JSON.toJSON(paramsArray[i]);
                     params += jsonObj.toString() + " ";
                 }
@@ -208,31 +187,23 @@ public class LogAspect
 
     /**
      * 判断是否需要过滤的对象。
-     * 
+     *
      * @param o 对象信息。
      * @return 如果是需要过滤的对象，则返回true；否则返回false。
      */
     @SuppressWarnings("rawtypes")
-    public boolean isFilterObject(final Object o)
-    {
+    public boolean isFilterObject(final Object o) {
         Class<?> clazz = o.getClass();
-        if (clazz.isArray())
-        {
+        if (clazz.isArray()) {
             return clazz.getComponentType().isAssignableFrom(MultipartFile.class);
-        }
-        else if (Collection.class.isAssignableFrom(clazz))
-        {
+        } else if (Collection.class.isAssignableFrom(clazz)) {
             Collection collection = (Collection) o;
-            for (Iterator iter = collection.iterator(); iter.hasNext();)
-            {
+            for (Iterator iter = collection.iterator(); iter.hasNext(); ) {
                 return iter.next() instanceof MultipartFile;
             }
-        }
-        else if (Map.class.isAssignableFrom(clazz))
-        {
+        } else if (Map.class.isAssignableFrom(clazz)) {
             Map map = (Map) o;
-            for (Iterator iter = map.entrySet().iterator(); iter.hasNext();)
-            {
+            for (Iterator iter = map.entrySet().iterator(); iter.hasNext(); ) {
                 Map.Entry entry = (Map.Entry) iter.next();
                 return entry.getValue() instanceof MultipartFile;
             }

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

@@ -3,69 +3,69 @@ package com.ruoyi.system.domain.vo;
 import java.math.BigDecimal;
 
 /**
- * 首页单位榜单
+ * 首页市值榜单
+ * @author Administrator
  */
 public class BmDeptPlanVo {
     /**
      * 单位名称
      */
     private String deptName;
+    /**
+     * 实际到资金额
+     */
+    private BigDecimal targetContractAmount;
 
     /**
-     * 目标投产
-     *
+     *新签约目标金额
      */
-    private Integer targetInvestmentNum;
+    private BigDecimal targetArrivalAmount;
 
     /**
-     * 完成目标
+     * 首页柱状图到资金额
      */
-    private Integer successMission;
+    private BigDecimal payForMoney;
 
     /**
-     * 目标到资
+     * 新签约亿元以上项目的个数
      */
-    private BigDecimal targetArrivalAmount;
+    private Integer projectMillionNum;
+    /**
+     * 实际利用市外资金金额
+     */
+    private BigDecimal projectCityMoney;
 
     /**
-     *实际到资
+     * 入省项目个数
      */
-    private BigDecimal payForMoney;
+    private Integer projectPronNum;
 
     /**
-     * 目标合同金额
+     * 统计分析_在谈线索_柱状图_完成目标数
      */
-    private BigDecimal targetContractAmount;
+    private Integer successMission;
 
     /**
-     *总投资金额
+     * 统计分析_签约项目_柱状图_合同金额
      */
     private BigDecimal totAmt;
 
     /**
-     * 目标签约数
+     * 统计分析_榜单中_目标任务合计
      */
-    private Integer targetSigningNum;
+    private String plan;
+
     /**
-     * 目前线索数
+     * 统计分析_榜单中_目标任务合计(签约项目和投产项目入归目标处使用)
      */
-    private Integer plan;
-
+    private String targetSigningNum;
 
-    public Integer getPlan() {
-        return plan;
-    }
-
-    public void setPlan(Integer plan) {
-        this.plan = plan;
-    }
-
-    public Integer getTargetSigningNum() {
-        return targetSigningNum;
+    public String getDeptName() {
+        return deptName;
     }
 
-    public void setTargetSigningNum(Integer targetSigningNum) {
-        this.targetSigningNum = targetSigningNum;
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
     }
 
     public BigDecimal getTargetContractAmount() {
@@ -76,14 +76,6 @@ public class BmDeptPlanVo {
         this.targetContractAmount = targetContractAmount;
     }
 
-    public BigDecimal getTotAmt() {
-        return totAmt;
-    }
-
-    public void setTotAmt(BigDecimal totAmt) {
-        this.totAmt = totAmt;
-    }
-
     public BigDecimal getTargetArrivalAmount() {
         return targetArrivalAmount;
     }
@@ -100,20 +92,28 @@ public class BmDeptPlanVo {
         this.payForMoney = payForMoney;
     }
 
-    public String getDeptName() {
-        return deptName;
+    public Integer getProjectMillionNum() {
+        return projectMillionNum;
     }
 
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
+    public void setProjectMillionNum(Integer projectMillionNum) {
+        this.projectMillionNum = projectMillionNum;
+    }
+
+    public BigDecimal getProjectCityMoney() {
+        return projectCityMoney;
+    }
+
+    public void setProjectCityMoney(BigDecimal projectCityMoney) {
+        this.projectCityMoney = projectCityMoney;
     }
 
-    public Integer getTargetInvestmentNum() {
-        return targetInvestmentNum;
+    public Integer getProjectPronNum() {
+        return projectPronNum;
     }
 
-    public void setTargetInvestmentNum(Integer targetInvestmentNum) {
-        this.targetInvestmentNum = targetInvestmentNum;
+    public void setProjectPronNum(Integer projectPronNum) {
+        this.projectPronNum = projectPronNum;
     }
 
     public Integer getSuccessMission() {
@@ -123,4 +123,28 @@ public class BmDeptPlanVo {
     public void setSuccessMission(Integer successMission) {
         this.successMission = successMission;
     }
+
+    public BigDecimal getTotAmt() {
+        return totAmt;
+    }
+
+    public void setTotAmt(BigDecimal totAmt) {
+        this.totAmt = totAmt;
+    }
+
+    public String getPlan() {
+        return plan;
+    }
+
+    public void setPlan(String plan) {
+        this.plan = plan;
+    }
+
+    public String getTargetSigningNum() {
+        return targetSigningNum;
+    }
+
+    public void setTargetSigningNum(String targetSigningNum) {
+        this.targetSigningNum = targetSigningNum;
+    }
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper.project;
 
 import com.ruoyi.system.domain.project.BmDeptPlanArea;
+import com.ruoyi.system.domain.vo.BmDeptPlanVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -60,4 +62,10 @@ public interface BmDeptPlanAreaMapper
      * @return 结果
      */
     public int deleteBmDeptPlanAreaByIds(Long[] ids);
+
+    /**
+     * 两区及乡镇榜单
+     * @return
+     */
+    public List<BmDeptPlanVo> selectAreaList(@Param("year") String year);
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper.project;
 
 import com.ruoyi.system.domain.project.BmDeptPlan;
 import com.ruoyi.system.domain.vo.BmDeptPlanVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -63,54 +64,57 @@ public interface BmDeptPlanMapper
     public int deleteBmDeptPlanByIds(Long[] ids);
 
     /**
-     * 首页-单位榜单
+     * 首页-市值榜单
      * @return
      */
-    public List<BmDeptPlanVo> selectUnitList();
+    public List<BmDeptPlanVo> selectUnitList(@Param("year") String year);
+
 
-    /**
-     * 首页-单位榜单资金
-     * @return
-     */
-    public List<BmDeptPlanVo> selectUnitAmountList();
 
     /**
-     * 统计分析-再谈线索-单位榜单
+     * 统计分析-在谈线索-单位榜单
      * @return
      */
-    public List<BmDeptPlanVo> selectUnitClueList();
+    public List<BmDeptPlanVo> selectUnitClueList(@Param("year")String year);
 
     /**
      * selectTargetSigningList
      * @return
      */
-    public List<BmDeptPlanVo> selectTargetSigningList();
+    public List<BmDeptPlanVo> selectTargetSigningList(@Param("year")String year);
 
     /**
      * 统计分析-合同金额
      * @return
      */
-    public List<BmDeptPlanVo> selectTotAmtList();
+    public List<BmDeptPlanVo> selectTotAmtList(@Param("year")String year);
 
     /**
      * 统计分析-在建项目-柱状图
      * @return
      */
-    public List<BmDeptPlanVo> selectProjectUnitAmountEharts(String year);
+    public List<BmDeptPlanVo> selectProjectUnitAmountEharts(@Param("year")String year);
+
+    /**
+     * 统计分析-在建项目-榜单
+     * @param year
+     * @return
+     */
+    public List<BmDeptPlanVo> selectProjectUnitAmountUnit(@Param("year")String year);
 
     /**
      * 统计分析-入归榜单
      * >8 根据字典值来判断是否是已经入归(项目完成)状态
      * @return
      */
-    public List<BmDeptPlanVo> selectInvestmentList();
+    public List<BmDeptPlanVo> selectInvestmentList(@Param("year")String year);
 
     /**
      * 统计分析-投产项目-柱状图
      * @param year
      * @return
      */
-    public List<BmDeptPlanVo> selectProjectInvestmentEharts(String year);
+    public List<BmDeptPlanVo> selectProjectInvestmentEharts(@Param("year")String year);
 
 
 }

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

@@ -3,6 +3,7 @@ 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.domain.vo.BmDeptPlanVo;
 import com.ruoyi.system.mapper.project.BmDeptPlanAreaMapper;
 import com.ruoyi.system.service.project.IBmDeptPlanAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -94,4 +95,14 @@ public class BmDeptPlanAreaServiceImpl implements IBmDeptPlanAreaService
     {
         return bmDeptPlanAreaMapper.deleteBmDeptPlanAreaById(id);
     }
+
+    /**
+     * 两区及乡镇榜单
+     * @return
+     */
+    @Override
+    public List<BmDeptPlanVo> selectAreaList(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanAreaMapper.selectAreaList(year);
+        return bmDeptPlanVos;
+    }
 }

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

@@ -109,28 +109,20 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
      * @return
      */
     @Override
-    public List<BmDeptPlanVo> selectUnitList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectUnitList();
+    public List<BmDeptPlanVo> selectUnitList(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectUnitList(year);
         return bmDeptPlanVos;
     }
 
-    /**
-     * 首页-单位榜单资金
-     * @return
-     */
-    @Override
-    public List<BmDeptPlanVo> selectUnitAmountList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectUnitAmountList();
-        return bmDeptPlanVos;
-    }
+
 
     /**
      * 统计分析-再谈线索-单位榜单
      * @return
      */
     @Override
-    public List<BmDeptPlanVo> selectUnitClueList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectUnitClueList();
+    public List<BmDeptPlanVo> selectUnitClueList(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectUnitClueList(year);
         return bmDeptPlanVos;
     }
 
@@ -139,8 +131,8 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
      * @return
      */
     @Override
-    public List<BmDeptPlanVo> selectTargetSigningList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectTargetSigningList();
+    public List<BmDeptPlanVo> selectTargetSigningList(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectTargetSigningList(year);
         return bmDeptPlanVos;
     }
 
@@ -149,8 +141,8 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
      * @return
      */
     @Override
-    public List<BmDeptPlanVo> selectTotAmtList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectTotAmtList();
+    public List<BmDeptPlanVo> selectTotAmtList(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectTotAmtList(year);
         return bmDeptPlanVos;
     }
 
@@ -176,14 +168,25 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
         return map;
     }
 
+    /**
+     * 统计分析-在建项目-榜单
+     * @param year
+     * @return
+     */
+    @Override
+    public List<BmDeptPlanVo> selectProjectUnitAmountUnit(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectProjectUnitAmountUnit(year);
+        return bmDeptPlanVos;
+    }
+
     /**
      * 统计分析-入归榜单
      * @return
      */
 
     @Override
-    public List<BmDeptPlanVo> selectInvestmentList() {
-        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectInvestmentList();
+    public List<BmDeptPlanVo> selectInvestmentList(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectInvestmentList(year);
         return bmDeptPlanVos;
     }
 

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

@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.project;
 
 import com.ruoyi.system.domain.project.BmDeptPlanArea;
+import com.ruoyi.system.domain.vo.BmDeptPlanVo;
 
 import java.util.List;
 
@@ -59,4 +60,10 @@ public interface IBmDeptPlanAreaService
      * @return 结果
      */
     public int deleteBmDeptPlanAreaById(Long id);
+
+    /**
+     * 两区及乡镇榜单
+     * @return
+     */
+    public List<BmDeptPlanVo> selectAreaList(String year);
 }

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

@@ -67,31 +67,26 @@ public interface IBmDeptPlanService
      * 首页-单位榜单
      * @return
      */
-    public List<BmDeptPlanVo> selectUnitList();
+    public List<BmDeptPlanVo> selectUnitList(String year);
 
-    /**
-     * 首页-单位榜单资金
-     * @return
-     */
-    public List<BmDeptPlanVo> selectUnitAmountList();
 
     /**
      * 统计分析-再谈线索-单位榜单
      * @return
      */
-    public List<BmDeptPlanVo> selectUnitClueList();
+    public List<BmDeptPlanVo> selectUnitClueList(String year);
 
     /**
      * 统计分析-签约项目-目标签约数
      * @return
      */
-    public List<BmDeptPlanVo> selectTargetSigningList();
+    public List<BmDeptPlanVo> selectTargetSigningList(String year);
 
     /**
      * 统计分析-合同金额
      * @return
      */
-    public List<BmDeptPlanVo> selectTotAmtList();
+    public List<BmDeptPlanVo> selectTotAmtList(String year);
 
     /**
      * 统计分析-在建项目-柱状图
@@ -100,11 +95,19 @@ public interface IBmDeptPlanService
      */
     public Map<String,Object> selectProjectUnitAmountEharts(String year);
 
+
+    /**
+     * 统计分析-在建项目-榜单
+     * @param year
+     * @return
+     */
+    public List<BmDeptPlanVo> selectProjectUnitAmountUnit(String year);
+
     /**
      * 统计分析-入归榜单
      * @return
      */
-    public List<BmDeptPlanVo> selectInvestmentList();
+    public List<BmDeptPlanVo> selectInvestmentList(String year);
 
     /**
      * 统计分析-投产项目-柱状图

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

@@ -165,4 +165,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectAreaList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+		select a.project_million_num, a.project_city_money, a.project_pro_num,  d.dept_name
+		from bm_dept_plan_area a
+		left join sys_dept d on a.sys_dept_id = d.dept_id
+		where
+		a.is_del = '0'
+		and a.year = #{year}
+    </select>
 </mapper>

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

@@ -99,67 +99,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
 
-    <select id="selectUnitList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
-    SELECT
-	ifnull( s1.dept_name, '' ) AS deptName,
-	ifnull( s1.plan, 0 ) AS targetInvestmentNum,
-	ifnull( count( p.id ), 0 ) AS successMission
-    FROM
-	(
-	SELECT
-		sd.dept_id,
-		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'
-	WHERE
-		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.dept_id
-    ORDER BY
-	successMission DESC,
-	targetInvestmentNum DESC
+    <select id="selectUnitList" parameterType="String"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+		select ifnull(p.target_contract_amount,0) as target_contract_amount , ifnull(p.target_arrival_amount,0) as target_arrival_amount, d.dept_name from bm_dept_plan p right join sys_dept d on p.sys_dept_id = d.dept_id
+		where
+		p.is_del = '0'
+		and p.year = #{year}
     </select>
 
-    <select id="selectUnitAmountList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
-    SELECT
-	sd.dept_name AS deptName,
-	ifnull(d.target_arrival_amount,0) AS targetArrivalAmount,
-	ifnull(s1.payForMoney,0) as payForMoney
-    FROM
-    sys_dept sd
-	LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id
-	AND d.is_del = '0'
-	LEFT JOIN (
-	SELECT
-		sum(s.payForMoney ) AS payForMoney,
-		s.dept_id
-	FROM
-		(
-		SELECT
-			cp.pay_for_money AS payForMoney,
-			p.dept_id
-		FROM
-			bm_project p
-			LEFT JOIN bm_construction_pay cp ON cp.bm_project_id = p.id
-			AND p.is_del = '0'
-		) s
-	GROUP BY
-		s.dept_id
-	) s1 ON s1.dept_id = d.sys_dept_id
-	where sd.del_flag = '0'
-    ORDER BY
-	s1.payForMoney DESC,
-	d.target_arrival_amount DESC
-    </select>
 
-    <select id="selectUnitClueList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+
+    <select id="selectUnitClueList" parameterType="string"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
     SELECT
 	ifnull( s1.dept_name, '' ) AS deptName,
 	ifnull( s1.plan, 0 ) AS plan,
@@ -169,17 +118,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	SELECT
 		sd.dept_id,
 		sd.dept_name,
-		d.sys_dept_id,
-		d.plan
+		a.sys_dept_id,
+		(ifnull(a.project_million_num,0)+ ifnull(a.project_pro_num,0)+ ifnull(a.project_investment_num,0))as plan
 	FROM
 		sys_dept sd
-		LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id
-		AND d.is_del = '0'
+		LEFT JOIN `bm_dept_plan_area` a ON a.sys_dept_id = sd.dept_id
+		AND a.is_del = '0'
 	WHERE
 		sd.del_flag = '0'
 	) s1
 	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id
 	AND p.is_del = '0'
+	and year(p.create_time) = #{year}
     GROUP BY
 	s1.dept_id
     ORDER BY
@@ -187,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	plan DESC
     </select>
 
-    <select id="selectTargetSigningList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    <select id="selectTargetSigningList" parameterType="String"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
     SELECT
 	ifnull(s1.dept_name,'') AS deptName,
 	ifnull(s1.target_signing_num,0) AS targetSigningNum,
@@ -197,14 +147,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	SELECT
 	    sd.dept_id,
 		sd.dept_name,
-		d.sys_dept_id,
-		d.target_signing_num
+		a.sys_dept_id,
+		(ifnull(a.project_million_num,0)+ ifnull(a.project_pro_num,0)+ ifnull(a.project_investment_num,0))as 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'
+		LEFT JOIN `bm_dept_plan_area` a ON a.sys_dept_id = sd.dept_id and a.is_del = '0'
 		where 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
+	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id and p.is_del = '0' and p.project_status &gt; 4 and year(p.create_time) = #{year}
     GROUP BY
 	s1.dept_id
     ORDER BY
@@ -212,22 +162,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	targetSigningNum DESC
     </select>
 
-    <select id="selectTotAmtList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    <select id="selectTotAmtList"  parameterType="String" resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
     SELECT
 	d.dept_name AS deptName,
-	ifnull( dp.target_contract_amount, 0 ) AS targetContractAmount,
+	ifnull( dp.target_arrival_amount, 0 ) AS targetArrivalAmount,
 	ifnull( p.tot_amt, 0 ) AS totAmt
     FROM
 	sys_dept d
 	LEFT JOIN bm_project p ON p.dept_id = d.dept_id
-	AND p.is_del = '0'
-	LEFT JOIN bm_dept_plan dp ON dp.sys_dept_id = d.dept_id
+	AND p.is_del = '0' and year(p.create_time) = #{year}
+	LEFT JOIN bm_dept_plan dp ON dp.sys_dept_id = d.dept_id and year(dp.create_time) = #{year}
     WHERE
 	d.del_flag = '0'
     GROUP BY
 	d.dept_id
     ORDER BY
-	targetContractAmount DESC,
+	targetArrivalAmount DESC,
 	totAmt DESC
     </select>
 
@@ -238,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	ifnull( s1.payForMoney, 0 ) AS payForMoney
     FROM
 	sys_dept sd
-	LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id
+	LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id and  year(d.create_time) = #{year}
 	AND d.is_del = '0'
 	LEFT JOIN (
 	SELECT
@@ -263,22 +213,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	s1.payForMoney DESC
     </select>
 
+    <select id="selectProjectUnitAmountUnit"  parameterType="string" resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    SELECT
+	sd.dept_name AS deptName,
+	ifnull( s1.payForMoney, 0 ) AS payForMoney,
+	ifnull(d.target_contract_amount,0) as targetContractAmount
+    FROM
+	sys_dept sd
+	LEFT JOIN `bm_dept_plan` d ON d.sys_dept_id = sd.dept_id
+	AND d.is_del = '0' and year(d.create_time) = #{year}
+	LEFT JOIN (
+	SELECT
+		sum( s.payForMoney ) AS payForMoney,
+		s.dept_id
+	FROM
+		(
+		SELECT
+			cp.pay_for_money AS payForMoney,
+			p.dept_id
+		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) = #{year}
+		) s
+	GROUP BY
+		s.dept_id
+	) s1 ON s1.dept_id = d.sys_dept_id
+	WHERE
+	sd.del_flag = '0'
+    ORDER BY
+	s1.payForMoney DESC
+    </select>
+
 
-    <select id="selectInvestmentList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    <select id="selectInvestmentList" parameterType="string"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
     SELECT
 	d.dept_name AS deptName,
-	ifnull( dp.target_investment_num, 0 ) AS targetInvestmentNum,
+	(ifnull( dp.project_million_num, 0 )+ ifnull( dp.project_pro_num, 0 )+ ifnull( dp.project_investment_num, 0 )) AS targetSigningNum,
 	ifnull( count(p.id), 0 ) AS successMission
     FROM
 	sys_dept d
 	LEFT JOIN bm_project p ON p.dept_id = d.dept_id
-	and p.is_del = '0' and p.project_status &gt; 8
-	LEFT JOIN bm_dept_plan dp ON dp.sys_dept_id = d.dept_id
+	and p.is_del = '0' and p.project_status &gt; 8 and year(p.create_time) = #{year}
+	LEFT JOIN bm_dept_plan_area dp ON dp.sys_dept_id = d.dept_id and year(dp.create_time) = #{year}
 	where d.del_flag = '0'
     GROUP BY
 	d.dept_id
 	order by successMission DESC,
-	targetInvestmentNum DESC
+	targetSigningNum DESC
     </select>
 
 
@@ -291,7 +273,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	sys_dept d
 	LEFT JOIN bm_project p ON p.dept_id = d.dept_id
 	and p.is_del = '0' and p.project_status &gt; 8 and year(p.create_time) = #{year}
-	LEFT JOIN bm_dept_plan dp ON dp.sys_dept_id = d.dept_id
 	where d.del_flag = '0'
     GROUP BY
 	d.dept_id

ruoyi-ui/src/api/index.js

@@ -1,47 +1,47 @@
-import request  from '@/utils/request'
-
-// 首页-柱状图
-export function getIndexEharts(query) {
-  return request({
-    url: '/constructionPay/pay/indexEharts',
-    method: 'get',
-    params: query
-  })
-}
-// 获取用户详细信息
-export function toBeReviewedList() {
-  return request({
-    url: '/bmProject/project/toBeReviewedList',
-    method: 'get'
-  })
-}
-// 审核/提交
-export function setExamine() {
-  return request({
-    url: '/bmProject/project/examine',
-    method: 'post'
-  })
-}
-
-// 驳回项目
-export function setReject() {
-  return request({
-    url: '/bmProject/project/reject',
-    method: 'post'
-  })
-}
-
-// 首页-单位榜单-资金
-export function getUnitAmountList() {
-  return request({
-    url: '/deptPlan/plan/unitAmountList',
-    method: 'post'
-  })
-}
-// 首页-单位榜单-任务
-export function getUnitList() {
-  return request({
-    url: '/deptPlan/plan/unitList',
-    method: 'post'
-  })
-}
+import request  from '@/utils/request'
+
+// 首页-柱状图
+export function getIndexEharts(query) {
+  return request({
+    url: '/constructionPay/pay/indexEharts',
+    method: 'get',
+    params: query
+  })
+}
+// 获取用户详细信息
+export function toBeReviewedList() {
+  return request({
+    url: '/bmProject/project/toBeReviewedList',
+    method: 'get'
+  })
+}
+// 审核/提交
+export function setExamine() {
+  return request({
+    url: '/bmProject/project/examine',
+    method: 'post'
+  })
+}
+
+// 驳回项目
+export function setReject() {
+  return request({
+    url: '/bmProject/project/reject',
+    method: 'post'
+  })
+}
+
+// 首页-单位榜单-市直
+export function getUnitAmountList() {
+  return request({
+    url: '/deptPlan/plan/unitList',
+    method: 'post'
+  })
+}
+// 首页-单位榜单-两区及乡镇
+export function getUnitList() {
+  return request({
+    url: '/dept/area/areaList',
+    method: 'post'
+  })
+}

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

@@ -1,108 +1,108 @@
-import request  from '@/utils/request'
+import request  from '@/utils/request'
 
-// 在谈线索-柱状图
-export function getIndexEharts(query) {
-  return request({
-    url: '/bmProject/project/projectEharts',
+// 在谈线索-柱状图
+export function getIndexEharts(query) {
+  return request({
+    url: '/bmProject/project/projectEharts',
     method: 'get',
-    params: query
-  })
+    params: query
+  })
 }
-// 确认审核
-export function setPass(data) {
-  return request({
-    url: '/bmProject/project/pass',
+// 确认审核
+export function setPass(data) {
+  return request({
+    url: '/bmProject/project/pass',
     method: 'post',
-    data
-  })
+    data
+  })
 }
-// 在谈线索-柱状图
-export function getProjectUnitAmountEharts(query) {
-  return request({
-    url: '/deptPlan/plan/projectUnitAmountEharts',
-    method: 'get',
-    params: query
-  })
+// 在谈线索-柱状图
+export function getProjectUnitAmountEharts(query) {
+  return request({
+    url: '/deptPlan/plan/projectUnitAmountEharts',
+    method: 'post',
+    params: query
+  })
 }
-// 统计分析-投产项目-柱状图
-export function getProjectInvestmentEharts(query) {
-  return request({
-    url: '/deptPlan/plan/projectInvestmentEharts',
-    method: 'get',
-    params: query
-  })
-}
-// 签约项目-柱状图
-export function getProjectContractEharts(query) {
-  return request({
-    url: '/bmProject/project/projectContractEharts',
-    method: 'get',
-    params: query
-  })
+// 统计分析-投产项目-柱状图
+export function getProjectInvestmentEharts(query) {
+  return request({
+    url: '/deptPlan/plan/projectInvestmentEharts',
+    method: 'post',
+    params: query
+  })
 }
-// 获取用户详细信息
-export function getStatisticst(ids) {
-  return request({
-    url: `/bmProject/project/statistics/${ids}`,
-    method: 'get'
-  })
+// 签约项目-柱状图
+export function getProjectContractEharts(query) {
+  return request({
+    url: '/bmProject/project/projectContractEharts',
+    method: 'post',
+    params: query
+  })
+}
+// 获取用户详细信息
+export function getStatisticst(ids) {
+  return request({
+    url: `/bmProject/project/statistics/${ids}`,
+    method: 'get'
+  })
 }
-// 统计分析公共-销号
-export function delProject(ids) {
-  return request({
-    url: `/bmProject/project/${ids}`,
-    method: 'DELETE'
-  })
+// 统计分析公共-销号
+export function delProject(ids) {
+  return request({
+    url: `/bmProject/project/${ids}`,
+    method: 'DELETE'
+  })
 }
-// 审核/提交
-export function setExamine(data) {
-  return request({
-    url: '/bmProject/project/examine',
+// 审核/提交
+export function setExamine(data) {
+  return request({
+    url: '/bmProject/project/examine',
     method: 'post',
-    data
-  })
+    data
+  })
 }
-// 驳回项目
-export function setReject(data) {
-  return request({
-    url: '/bmProject/project/reject',
-    method: 'post',
-    data
-  })
+// 驳回项目
+export function setReject(data) {
+  return request({
+    url: '/bmProject/project/reject',
+    method: 'post',
+    data
+  })
 }
-// 统计分析-在谈线索-榜单
-export function getUnitClueList() {
-  return request({
-    url: '/deptPlan/plan/unitClueList',
-    method: 'post'
-  })
+// 统计分析-在谈线索-榜单
+export function getUnitClueList() {
+  return request({
+    url: '/deptPlan/plan/unitClueList',
+    method: 'post'
+  })
 }
 
-// 统计分析-签约项目-榜单
-export function getUnitAmountList() {
-  return request({
-    url: '/deptPlan/plan/targetSigningList',
-    method: 'post'
-  })
+// 统计分析-签约项目-榜单
+export function getUnitAmountList() {
+  return request({
+    url: '/deptPlan/plan/targetSigningList',
+    method: 'post'
+  })
+}
+// 统计分析-在建项目-资金榜单
+export function setProjectUnitAmountUnit() {
+  return request({
+    url: '/deptPlan/plan/projectUnitAmountUnit',
+    method: 'post'
+  })
 }
-// 统计分析-在建项目-资金榜单
-export function setUnitAmountList() {
-  return request({
-    url: '/deptPlan/plan/unitAmountList',
-    method: 'post'
-  })
+// 统计分析-投产项目-入规榜单
+export function setInvestmentList() {
+  return request({
+    url: '/deptPlan/plan/investmentList',
+    method: 'post'
+  })
 }
-// 统计分析-投产项目-入规榜单
-export function setInvestmentList() {
-  return request({
-    url: '/deptPlan/plan/investmentList',
-    method: 'post'
-  })
+// 统计分析-在建项目-资金榜单
+export function getTotAmtList() {
+  return request({
+    url: '/deptPlan/plan/totAmtList',
+    method: 'post'
+  })
 }
-// 统计分析-在建项目-资金榜单
-export function getTotAmtList() {
-  return request({
-    url: '/deptPlan/plan/totAmtList',
-    method: 'post'
-  })
-}

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

@@ -226,7 +226,6 @@ export default {
       }else{
         this.form.sysDeptId = e[e.length-1]
       }
-      console.log(e[e.length-1])
 
     },
     /** 查询 部门招商计划列表 */

ruoyi-ui/src/views/index.vue

@@ -40,24 +40,28 @@
       <el-col :span="6" style="padding: 24px 12px 24px 0 ;">
         <div class="in_right">
           <div class="rig_title">
-            单位榜单
+            "两区"及乡镇
           </div>
           <div class="rig_tab_top">
             <div class="rig_tab_item">
               单位名称
             </div>
             <div class="rig_tab_item">
-              目标任务
+              新签约亿元以上项目的个数
             </div>
             <div class="rig_tab_item">
-              已完成任务
+              实际利用市外资金金额
+            </div>
+            <div class="rig_tab_item">
+              入省项目个数
             </div>
           </div>
           <div class="rig_cont">
             <div class="rig_items" v-for="(item,index) in unitList" :key="index">
               <span>{{item.deptName}}</span>
-              <span>{{item.targetInvestmentNum?item.targetInvestmentNum:0}}个</span>
-              <span>{{item.successMission?item.successMission:0}}个</span>
+              <span>{{item.projectMillionNum?item.projectMillionNum:0}}个</span>
+              <span>{{item.projectCityMoney?item.projectCityMoney:0}}亿元</span>
+              <span>{{item.projectProNum?item.projectProNum:0}}个</span>
             </div>
           </div>
           <div class="rig_tab_top" style="background-color: #1C84C6;">
@@ -65,17 +69,17 @@
               单位名称
             </div>
             <div class="rig_tab_item">
-              目标到资
+              新签约目标金额
             </div>
             <div class="rig_tab_item">
-              实际到资
+              实际到资金额
             </div>
           </div>
           <div class="rig_cont">
             <div class="rig_items" v-for="(item,index) in zjList" :key="index">
               <span>{{item.deptName}}</span>
-              <span>{{item.targetArrivalAmount}}万</span>
-              <span>{{item.payForMoney}}万</span>
+              <span>{{item.targetArrivalAmount?item.targetArrivalAmount:0}}万元</span>
+              <span>{{item.targetcAontractAmount?item.targetcAontractAmount:0}}万元</span>
             </div>
           </div>
         </div>

ruoyi-ui/src/views/statistical/clue/index.vue

@@ -113,7 +113,6 @@
 
       },
       bd_btn() {
-        console.log(222)
         getUnitClueList().then(res => {
           this.unitList = res.rows
         })

ruoyi-ui/src/views/statistical/putProduction/index.vue

@@ -49,7 +49,7 @@
           <div class="rig_cont">
             <div class="rig_items" v-for="(item,index) in unitList" :key="index">
               <span>{{item.deptName}}</span>
-              <span>{{item.targetInvestmentNum?item.targetInvestmentNum:0}}个</span>
+              <span>{{item.targetSigningNum?item.targetSigningNum:0}}个</span>
               <span>{{item.successMission?item.successMission:0}}个</span>
             </div>
           </div>

ruoyi-ui/src/views/statistical/sign/index.vue

@@ -33,7 +33,7 @@
       <el-col :span="6" style="padding: 24px 12px 24px 0 ;">
         <div class="in_right">
           <div class="rig_title">
-            单位榜单
+            "两区"及乡镇
           </div>
           <div class="rig_tab_top">
             <div class="rig_tab_item">
@@ -58,7 +58,7 @@
               单位名称
             </div>
             <div class="rig_tab_item">
-              目标合同金额
+              新签约目标金额
             </div>
             <div class="rig_tab_item">
               实际合同金额
@@ -67,7 +67,7 @@
           <div class="rig_cont">
             <div class="rig_items" v-for="(item,index) in zjList" :key="index">
               <span>{{item.deptName}}</span>
-              <span>{{item.targetContractAmount}}万</span>
+              <span>{{item.targetArrivalAmount}}万</span>
               <span>{{item.totAmt}}万</span>
             </div>
           </div>
@@ -128,11 +128,13 @@
       },
       zj_btn() {
         getTotAmtList().then(res => {
+          console.log(res)
           this.zjList = res.rows
         })
       },
       bd_btn() {
         getUnitAmountList().then(res => {
+          console.log(res)
           this.unitList = res.rows
         })
       },

ruoyi-ui/src/views/statistical/underConstruction/index.vue

@@ -33,7 +33,7 @@
       <el-col :span="6" style="padding: 24px 12px 24px 0 ;">
         <div class="in_right">
           <div class="rig_title">
-            单位榜单
+           市直单位
           </div>
           <div class="rig_tab_top">
             <div class="rig_tab_item">
@@ -49,7 +49,7 @@
           <div class="rig_cont">
             <div class="rig_items" v-for="(item,index) in unitList" :key="index">
               <span>{{item.deptName}}</span>
-              <span>{{item.targetArrivalAmount?item.targetArrivalAmount:0}}万</span>
+              <span>{{item.targetContractAmount?item.targetContractAmount:0}}万</span>
               <span>{{item.payForMoney?item.payForMoney:0}}万</span>
             </div>
           </div>
@@ -66,7 +66,7 @@
     toBeReviewedList,
     setExamine,
     setReject,
-    setUnitAmountList,
+    setProjectUnitAmountUnit ,
     getProjectUnitAmountEharts
   } from '@/api/statistical'
   export default {
@@ -111,9 +111,8 @@
 
       },
       bd_btn() {
-        console.log(222)
-        setUnitAmountList().then(res => {
-          this.unitList = res.rows
+        setProjectUnitAmountUnit().then(res => {
+          this.unitList = res.data
         })
       },
       dec_btn(row) {