招商引资,后端接口完成

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

@@ -1,19 +1,13 @@
 package com.ruoyi.web.controller.project;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.system.domain.project.BmConstructionPay;
 import com.ruoyi.system.service.project.IBmConstructionPayService;
 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 org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -102,4 +96,17 @@ public class BmConstructionPayController extends BaseController
     {
         return toAjax(bmConstructionPayService.deleteBmConstructionPayByIds(ids));
     }
+
+
+    /**
+     * 首页柱状图
+     */
+    //@PreAuthorize("@ss.hasPermi('constructionPay:pay:remove')")
+    @GetMapping("/indexEharts")
+    public AjaxResult indexEharts(String year)
+    {
+        Map<String, Object> stringObjectMap = bmConstructionPayService.selectIndexEharts(year);
+        return AjaxResult.success(stringObjectMap);
+    }
+
 }

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

@@ -77,7 +77,7 @@ public class BmConstructionPayInfoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BmConstructionPayInfo bmConstructionPayInfo)
     {
-        return toAjax(bmConstructionPayInfoService.insertBmConstructionPayInfo(bmConstructionPayInfo));
+        return bmConstructionPayInfoService.insertBmConstructionPayInfo(bmConstructionPayInfo);
     }
 
     /**
@@ -88,7 +88,7 @@ public class BmConstructionPayInfoController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody BmConstructionPayInfo bmConstructionPayInfo)
     {
-        return toAjax(bmConstructionPayInfoService.updateBmConstructionPayInfo(bmConstructionPayInfo));
+        return bmConstructionPayInfoService.updateBmConstructionPayInfo(bmConstructionPayInfo);
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.project;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.system.domain.project.BmDeptPlan;
 import com.ruoyi.system.domain.vo.BmDeptPlanVo;
@@ -128,4 +129,33 @@ public class BmDeptPlanController extends BaseController {
         List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectTotAmtList();
         return getDataTable(bmDeptPlanVos);
     }
+
+
+    /**
+     * 统计分析-在建项目-柱状图
+     */
+    @GetMapping("/projectUnitAmountEharts")
+    public AjaxResult projectUnitAmountEharts(String year) {
+        Map<String, Object> map = bmDeptPlanService.selectProjectUnitAmountEharts(year);
+        return AjaxResult.success(map);
+    }
+
+    /**
+     * 统计分析-入归榜单
+     */
+    //@PreAuthorize("@ss.hasPermi('deptPlan:Plan:totAmtList')")
+    @PostMapping("/investmentList")
+    public TableDataInfo investmentList() {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanService.selectInvestmentList();
+        return getDataTable(bmDeptPlanVos);
+    }
+
+    /**
+     * 统计分析-投产项目-柱状图
+     */
+    @GetMapping("/projectInvestmentEharts")
+    public AjaxResult projectInvestmentEharts(String year) {
+        Map<String, Object> map = bmDeptPlanService.selectProjectInvestmentEharts(year);
+        return AjaxResult.success(map);
+    }
 }

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

@@ -72,7 +72,7 @@ public class BmProjectConstructionController extends BaseController
     /**
      * 新增项目施工
      */
-    @PreAuthorize("@ss.hasPermi('projectConstruction:construction:add')")
+    //@PreAuthorize("@ss.hasPermi('projectConstruction:construction:add')")
     @Log(title = "项目施工", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BmProjectConstruction bmProjectConstruction)

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.project;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.project.BmProject;
@@ -99,7 +100,7 @@ public class BmProjectController extends BaseController {
 
 
     /**
-     * 审核/提交/驳回项目
+     * 审核/提交
      * @param bmProjectStatus
      * @return
      */
@@ -109,6 +110,17 @@ public class BmProjectController extends BaseController {
         return bmProjectService.examine(bmProjectStatus);
     }
 
+    /**
+     * 驳回项目
+     * @param bmProjectStatus
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('bmProject:project:reject')")
+    @PostMapping("/reject")
+    public AjaxResult reject(@RequestBody BmProjectStatus bmProjectStatus) {
+        return bmProjectService.examine(bmProjectStatus);
+    }
+
     /**
      * 首页查询待审核列表
      */
@@ -123,7 +135,7 @@ public class BmProjectController extends BaseController {
     /**
      * 统计分析公共查询列表
      */
-    //@PreAuthorize("@ss.hasPermi('bmProject:project:list')")
+    //@PreAuthorize("@ss.hasPermi('bmProject:project:statistics')")
     @GetMapping("/statistics/{projectStatus}")
     public TableDataInfo statisticsList(@PathVariable Long[] projectStatus) {
         startPage();
@@ -131,4 +143,21 @@ public class BmProjectController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 统计分析-在谈线索-柱状图
+     */
+    @GetMapping("/projectEharts")
+    public AjaxResult projectEharts(String year) {
+        Map<String, Object> stringObjectMap = bmProjectService.selectProjectEharts(year);
+        return AjaxResult.success(stringObjectMap);
+    }
+
+    /**
+     * 统计分析-签约项目-柱状图
+     */
+    @GetMapping("/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

@@ -5,6 +5,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.Locale;
+
 import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
@@ -27,7 +29,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     private static String[] parsePatterns = {
             "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
-            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM",
+            "EEE MMM dd HH:mm:ss zzz yyyy"};
 
     /**
      * 获取当前Date型日期
@@ -122,6 +125,25 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
             return null;
         }
     }
+
+    // 格林威治时间转Date
+
+    /**
+     * "EEE MMM dd HH:mm:ss zzz yyyy", Locale.US
+     * @param str
+     * @return
+     */
+    public static Date parse(String str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            return new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US).parse(str);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
     
     /**
      * 获取服务器启动时间

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

@@ -53,11 +53,13 @@ public class BmProjectConstruction extends BaseEntity
     /**
      * 合同约定开工时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date orderBeginTime;
 
     /**
      * 合同约定竣工时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date orderEndTime;
 
     public Date getOrderBeginTime() {

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

@@ -1,8 +1,11 @@
 package com.ruoyi.system.mapper.project;
 
 import com.ruoyi.system.domain.project.BmConstructionPay;
+import com.ruoyi.system.domain.vo.BmDeptPlanVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目到资
@@ -65,6 +68,13 @@ public interface BmConstructionPayMapper
      */
     public int deleteBmConstructionPayById(Long id);
 
+    /**
+     * 首页柱状图
+     * @param year
+     * @return
+     */
+    public List<BmDeptPlanVo> selectIndexEharts(@Param("year") String year);
+
     /**
      * 批量删除项目到资
 (最少一条记录、合计、回写项目单)

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

@@ -79,4 +79,26 @@ public interface BmDeptPlanMapper
      * @return
      */
     public List<BmDeptPlanVo> selectTotAmtList();
+
+    /**
+     * 统计分析-在建项目-柱状图
+     * @return
+     */
+    public List<BmDeptPlanVo> selectProjectUnitAmountEharts(String year);
+
+    /**
+     * 统计分析-入归榜单
+     * >8 根据字典值来判断是否是已经入归(项目完成)状态
+     * @return
+     */
+    public List<BmDeptPlanVo> selectInvestmentList();
+
+    /**
+     * 统计分析-投产项目-柱状图
+     * @param year
+     * @return
+     */
+    public List<BmDeptPlanVo> selectProjectInvestmentEharts(String year);
+
+
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper.project;
 
 import com.ruoyi.system.domain.project.BmProject;
+import com.ruoyi.system.domain.vo.BmDeptPlanVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -74,4 +76,18 @@ public interface BmProjectMapper
      * @return
      */
     public List<BmProject> selectStatisticsList(Long[] ids);
+
+    /**
+     * 统计分析-在谈线索-柱状图
+     * @param year
+     * @return
+     */
+    public List<BmDeptPlanVo> selectProjectEharts(@Param("year") String year);
+
+    /**
+     * 统计分析-签约项目-柱状图
+     * @param year
+     * @return
+     */
+    public List<BmDeptPlanVo> selectProjectContractEharts(@Param("year") String year);
 }

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

@@ -1,14 +1,20 @@
 package com.ruoyi.system.service.impl.project;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.project.BmConstructionPayInfo;
+import com.ruoyi.system.domain.project.BmProjectConstruction;
 import com.ruoyi.system.mapper.project.BmConstructionPayInfoMapper;
 import com.ruoyi.system.service.project.IBmConstructionPayInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import static com.ruoyi.system.service.impl.project.BmProjectConstructionServiceImpl.templateSetTime;
+
+
 /**
  * 项目入统Service业务层处理
  * 
@@ -52,12 +58,21 @@ public class BmConstructionPayInfoServiceImpl implements IBmConstructionPayInfoS
      * @return 结果
      */
     @Override
-    public int insertBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo)
+    public AjaxResult insertBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo)
     {
         bmConstructionPayInfo.setCreateTime(DateUtils.getNowDate());
         bmConstructionPayInfo.setCreateBy(SecurityUtils.getUsername());
-
-        return bmConstructionPayInfoMapper.insertBmConstructionPayInfo(bmConstructionPayInfo);
+        //提取出合同约定开工时间/竣工时间
+        Long bmProjectId = bmConstructionPayInfo.getBmProjectId();
+        if (bmProjectId == null) {
+            return AjaxResult.error("缺少项目id");
+        }
+        templateSetTime(BmConstructionPayInfo.class,bmConstructionPayInfo);
+        int i = bmConstructionPayInfoMapper.insertBmConstructionPayInfo(bmConstructionPayInfo);
+        if (i != 1) {
+            return AjaxResult.error("新增失败");
+        }
+        return AjaxResult.success();
     }
 
     /**
@@ -67,11 +82,21 @@ public class BmConstructionPayInfoServiceImpl implements IBmConstructionPayInfoS
      * @return 结果
      */
     @Override
-    public int updateBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo)
+    public AjaxResult updateBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo)
     {
         bmConstructionPayInfo.setUpdateTime(DateUtils.getNowDate());
         bmConstructionPayInfo.setUpdateBy(SecurityUtils.getUsername());
-        return bmConstructionPayInfoMapper.updateBmConstructionPayInfo(bmConstructionPayInfo);
+        //提取出合同约定开工时间/竣工时间
+        Long bmProjectId = bmConstructionPayInfo.getBmProjectId();
+        if (bmProjectId == null) {
+            return AjaxResult.error("缺少项目id");
+        }
+        templateSetTime(BmConstructionPayInfo.class,bmConstructionPayInfo);
+        int i = bmConstructionPayInfoMapper.updateBmConstructionPayInfo(bmConstructionPayInfo);
+        if (i != 1) {
+            return AjaxResult.error("新增失败");
+        }
+        return AjaxResult.success();
     }
 
     /**

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

@@ -1,9 +1,15 @@
 package com.ruoyi.system.service.impl.project;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.project.BmConstructionPay;
+import com.ruoyi.system.domain.vo.BmDeptPlanVo;
 import com.ruoyi.system.mapper.project.BmConstructionPayMapper;
 import com.ruoyi.system.service.project.IBmConstructionPayService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -111,4 +117,27 @@ public class BmConstructionPayServiceImpl implements IBmConstructionPayService
     {
         return bmConstructionPayMapper.deleteBmConstructionPayById(id);
     }
+
+
+    /**
+     * 首页柱状图
+     * @param year
+     * @return
+     */
+    @Override
+    public Map<String, Object> selectIndexEharts(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmConstructionPayMapper.selectIndexEharts(year);
+        Map<String,Object> map = new HashMap<>(2);
+        List<String> deptName = new ArrayList<>();
+        List<BigDecimal> payForMoney = new ArrayList<>();
+        if (bmDeptPlanVos.size() > 0){
+            for (BmDeptPlanVo bmDeptPlanVo : bmDeptPlanVos) {
+                deptName.add(bmDeptPlanVo.getDeptName());
+                payForMoney.add(bmDeptPlanVo.getPayForMoney());
+            }
+        }
+        map.put("x",deptName);
+        map.put("y",payForMoney);
+        return map;
+    }
 }

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

@@ -1,6 +1,11 @@
 package com.ruoyi.system.service.impl.project;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.project.BmDeptPlan;
@@ -128,4 +133,59 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
         List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectTotAmtList();
         return bmDeptPlanVos;
     }
+
+    /**
+     * 统计分析-在建项目-柱状图
+     * @param year
+     * @return
+     */
+    @Override
+    public Map<String, Object> selectProjectUnitAmountEharts(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectProjectUnitAmountEharts(year);
+        Map<String, Object> map  = new HashMap<>(2);
+        List<String> deptName = new ArrayList<>();
+        List<BigDecimal> payForMoney = new ArrayList<>();
+        if (bmDeptPlanVos.size() > 0){
+            for (BmDeptPlanVo bmDeptPlanVo : bmDeptPlanVos) {
+                deptName.add(bmDeptPlanVo.getDeptName());
+                payForMoney.add(bmDeptPlanVo.getPayForMoney());
+            }
+        }
+        map.put("x",deptName);
+        map.put("y",payForMoney);
+        return map;
+    }
+
+    /**
+     * 统计分析-入归榜单
+     * @return
+     */
+
+    @Override
+    public List<BmDeptPlanVo> selectInvestmentList() {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectInvestmentList();
+        return bmDeptPlanVos;
+    }
+
+    /**
+     * 统计分析-投产项目-柱状图
+     * @param year
+     * @return
+     */
+    @Override
+    public Map<String, Object> selectProjectInvestmentEharts(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmDeptPlanMapper.selectProjectInvestmentEharts(year);
+        Map<String, Object> map  = new HashMap<>(2);
+        List<String> deptName = new ArrayList<>();
+        List<Integer> successMission = new ArrayList<>();
+        if (bmDeptPlanVos.size() > 0){
+            for (BmDeptPlanVo bmDeptPlanVo : bmDeptPlanVos) {
+                deptName.add(bmDeptPlanVo.getDeptName());
+                successMission.add(bmDeptPlanVo.getSuccessMission());
+            }
+        }
+        map.put("x",deptName);
+        map.put("y",successMission);
+        return map;
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.ruoyi.system.service.impl.project;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Date;
 import java.util.List;
 
@@ -12,75 +14,77 @@ import com.ruoyi.system.mapper.project.BmProjectConstructionMapper;
 import com.ruoyi.system.mapper.project.BmProjectMapper;
 import com.ruoyi.system.service.project.IBmProjectConstructionService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
+
 
 /**
  * 项目施工Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2021-03-08
  */
 @Service
-public class BmProjectConstructionServiceImpl implements IBmProjectConstructionService
-{
+@Component
+public class BmProjectConstructionServiceImpl implements IBmProjectConstructionService {
+
     @Autowired
     private BmProjectConstructionMapper bmProjectConstructionMapper;
 
     @Autowired
     private BmProjectMapper bmProjectMapper;
 
+    private static BmProjectConstructionServiceImpl bmProjectConstructionServiceImpl;
+    ;
+
+    @PostConstruct
+    public void init() {
+        bmProjectConstructionServiceImpl = this;
+        bmProjectConstructionServiceImpl.bmProjectMapper = this.bmProjectMapper;
+    }
+
     /**
      * 查询项目施工
-     * 
+     *
      * @param id 项目施工ID
      * @return 项目施工
      */
     @Override
-    public BmProjectConstruction selectBmProjectConstructionById(Long id)
-    {
+    public BmProjectConstruction selectBmProjectConstructionById(Long id) {
         return bmProjectConstructionMapper.selectBmProjectConstructionById(id);
     }
 
     /**
      * 查询项目施工列表
-     * 
+     *
      * @param bmProjectConstruction 项目施工
      * @return 项目施工
      */
     @Override
-    public List<BmProjectConstruction> selectBmProjectConstructionList(BmProjectConstruction bmProjectConstruction)
-    {
+    public List<BmProjectConstruction> selectBmProjectConstructionList(BmProjectConstruction bmProjectConstruction) {
         return bmProjectConstructionMapper.selectBmProjectConstructionList(bmProjectConstruction);
     }
 
     /**
      * 新增项目施工
-     * 
+     *
      * @param bmProjectConstruction 项目施工
      * @return 结果
      */
     @Override
-    public AjaxResult insertBmProjectConstruction(BmProjectConstruction bmProjectConstruction)
-    {
+    public AjaxResult insertBmProjectConstruction(BmProjectConstruction bmProjectConstruction) {
         bmProjectConstruction.setCreateTime(DateUtils.getNowDate());
-        bmProjectConstruction.setCreateBy(SecurityUtils.getUsername());
+        //bmProjectConstruction.setCreateBy(SecurityUtils.getUsername());
         //提取出合同约定开工时间/竣工时间
         Long bmProjectId = bmProjectConstruction.getBmProjectId();
-        if (bmProjectId == null){
+        if (bmProjectId == null) {
             return AjaxResult.error("缺少项目id");
         }
-        Date orderBeginTime = bmProjectConstruction.getOrderBeginTime();
-        Date orderEndTime = bmProjectConstruction.getOrderEndTime();
-        BmProject bmProject = new BmProject();
-        bmProject.setId(bmProjectId);
-        if (orderBeginTime != null && orderEndTime != null){
-            bmProject.setOrderBeginTime(orderBeginTime);
-            bmProject.setOrderEndTime(orderEndTime);
-            bmProjectMapper.updateBmProject(bmProject);
-        }
+        templateSetTime(BmProjectConstruction.class, bmProjectConstruction);
         int i = bmProjectConstructionMapper.insertBmProjectConstruction(bmProjectConstruction);
-        if (i != 1){
+        if (i != 1) {
             return AjaxResult.error("添加失败");
         }
         return AjaxResult.success();
@@ -88,31 +92,22 @@ public class BmProjectConstructionServiceImpl implements IBmProjectConstructionS
 
     /**
      * 修改项目施工
-     * 
+     *
      * @param bmProjectConstruction 项目施工
      * @return 结果
      */
     @Override
-    public AjaxResult updateBmProjectConstruction(BmProjectConstruction bmProjectConstruction)
-    {
+    public AjaxResult updateBmProjectConstruction(BmProjectConstruction bmProjectConstruction) {
         bmProjectConstruction.setUpdateTime(DateUtils.getNowDate());
         bmProjectConstruction.setUpdateBy(SecurityUtils.getUsername());
         //提取出合同约定开工时间/竣工时间
         Long bmProjectId = bmProjectConstruction.getBmProjectId();
-        if (bmProjectId == null){
+        if (bmProjectId == null) {
             return AjaxResult.error("缺少项目id");
         }
-        Date orderBeginTime = bmProjectConstruction.getOrderBeginTime();
-        Date orderEndTime = bmProjectConstruction.getOrderEndTime();
-        BmProject bmProject = new BmProject();
-        bmProject.setId(bmProjectId);
-        if (orderBeginTime != null && orderEndTime != null){
-            bmProject.setOrderBeginTime(orderBeginTime);
-            bmProject.setOrderEndTime(orderEndTime);
-            bmProjectMapper.updateBmProject(bmProject);
-        }
+        templateSetTime(BmProjectConstruction.class, bmProjectConstruction);
         int i = bmProjectConstructionMapper.updateBmProjectConstruction(bmProjectConstruction);
-        if (i != 1){
+        if (i != 1) {
             return AjaxResult.error("更新失败");
         }
         return AjaxResult.success();
@@ -120,25 +115,49 @@ public class BmProjectConstructionServiceImpl implements IBmProjectConstructionS
 
     /**
      * 批量删除项目施工
-     * 
+     *
      * @param ids 需要删除的项目施工ID
      * @return 结果
      */
     @Override
-    public int deleteBmProjectConstructionByIds(Long[] ids)
-    {
+    public int deleteBmProjectConstructionByIds(Long[] ids) {
         return bmProjectConstructionMapper.deleteBmProjectConstructionByIds(ids);
     }
 
     /**
      * 删除项目施工信息
-     * 
+     *
      * @param id 项目施工ID
      * @return 结果
      */
     @Override
-    public int deleteBmProjectConstructionById(Long id)
-    {
+    public int deleteBmProjectConstructionById(Long id) {
         return bmProjectConstructionMapper.deleteBmProjectConstructionById(id);
     }
+
+
+    public static <T> void templateSetTime(Class<T> clazz, T cla) {
+        T u = clazz.cast(cla);
+        try {
+            Class<?> aClass = u.getClass();
+            Field bmProjectField = aClass.getDeclaredField("bmProjectId");
+            Field orderBeginTimeField = aClass.getDeclaredField("orderBeginTime");
+            Field orderEndTimeField = aClass.getDeclaredField("orderEndTime");
+            bmProjectField.setAccessible(true);
+            orderBeginTimeField.setAccessible(true);
+            orderEndTimeField.setAccessible(true);
+            String bmProjectId = bmProjectField.get(u).toString();
+            String orderBeginTimeString = orderBeginTimeField.get(u).toString();
+            String orderEndTimeString = orderEndTimeField.get(u).toString();
+            BmProject bmProject = new BmProject();
+            bmProject.setId(Long.valueOf(bmProjectId));
+            if (orderBeginTimeString != null && orderEndTimeString != null) {
+                bmProject.setOrderBeginTime(DateUtils.parse(orderBeginTimeString));
+                bmProject.setOrderEndTime(DateUtils.parse(orderEndTimeString));
+                bmProjectConstructionServiceImpl.bmProjectMapper.updateBmProject(bmProject);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -1,6 +1,10 @@
 package com.ruoyi.system.service.impl.project;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -11,6 +15,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.project.BmProject;
 import com.ruoyi.system.domain.project.BmProjectStatus;
+import com.ruoyi.system.domain.vo.BmDeptPlanVo;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.mapper.project.BmProjectMapper;
 import com.ruoyi.system.service.project.IBmProjectService;
@@ -177,4 +182,51 @@ public class BmProjectServiceImpl implements IBmProjectService {
         List<BmProject> bmProjects = bmProjectMapper.selectStatisticsList(ids);
         return bmProjects;
     }
+
+    /**
+     * 统计分析-在谈线索-柱状图
+     * @param year
+     * @return
+     */
+    @Override
+    public Map<String, Object> selectProjectEharts(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmProjectMapper.selectProjectEharts(year);
+        Map<String, Object> map  = new HashMap<>(2);
+        List<String> deptName = new ArrayList<>();
+        List<Integer> successMission = new ArrayList<>();
+        if (bmDeptPlanVos.size() > 0){
+            for (BmDeptPlanVo bmDeptPlanVo : bmDeptPlanVos) {
+                deptName.add(bmDeptPlanVo.getDeptName());
+                successMission.add(bmDeptPlanVo.getSuccessMission());
+            }
+        }
+        map.put("x",deptName);
+        map.put("y",successMission);
+        return map;
+    }
+
+    /**
+     * 统计分析-签约项目-柱状图
+     * @param year
+     * @return
+     */
+    @Override
+    public Map<String, Object> selectProjectContractEharts(String year) {
+        List<BmDeptPlanVo> bmDeptPlanVos = bmProjectMapper.selectProjectContractEharts(year);
+        Map<String, Object> map  = new HashMap<>(3);
+        List<String> deptName = new ArrayList<>();
+        List<Integer> successMission = new ArrayList<>();
+        List<BigDecimal> totAmt = new ArrayList<>();
+        if (bmDeptPlanVos.size() > 0){
+            for (BmDeptPlanVo bmDeptPlanVo : bmDeptPlanVos) {
+                deptName.add(bmDeptPlanVo.getDeptName());
+                successMission.add(bmDeptPlanVo.getSuccessMission());
+                totAmt.add(bmDeptPlanVo.getTotAmt());
+            }
+        }
+        map.put("x",deptName);
+        map.put("y1",successMission);
+        map.put("y2",totAmt);
+        return map;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.project;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.project.BmConstructionPayInfo;
 
 import java.util.List;
@@ -34,7 +35,7 @@ public interface IBmConstructionPayInfoService
      * @param bmConstructionPayInfo 项目入统
      * @return 结果
      */
-    public int insertBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo);
+    public AjaxResult insertBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo);
 
     /**
      * 修改项目入统
@@ -42,7 +43,7 @@ public interface IBmConstructionPayInfoService
      * @param bmConstructionPayInfo 项目入统
      * @return 结果
      */
-    public int updateBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo);
+    public AjaxResult updateBmConstructionPayInfo(BmConstructionPayInfo bmConstructionPayInfo);
 
     /**
      * 批量删除项目入统

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

@@ -3,6 +3,7 @@ package com.ruoyi.system.service.project;
 import com.ruoyi.system.domain.project.BmConstructionPay;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目到资
@@ -74,4 +75,11 @@ public interface IBmConstructionPayService
      * @return 结果
      */
     public int deleteBmConstructionPayById(Long id);
+
+    /**
+     * 首页柱状图
+     * @param year
+     * @return
+     */
+    public Map<String,Object> selectIndexEharts(String year);
 }

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

@@ -4,6 +4,7 @@ import com.ruoyi.system.domain.project.BmDeptPlan;
 import com.ruoyi.system.domain.vo.BmDeptPlanVo;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -79,4 +80,26 @@ public interface IBmDeptPlanService
      * @return
      */
     public List<BmDeptPlanVo> selectTotAmtList();
+
+    /**
+     * 统计分析-在建项目-柱状图
+     * @param year
+     * @return
+     */
+    public Map<String,Object> selectProjectUnitAmountEharts(String year);
+
+    /**
+     * 统计分析-入归榜单
+     * @return
+     */
+    public List<BmDeptPlanVo> selectInvestmentList();
+
+    /**
+     * 统计分析-投产项目-柱状图
+     * @param year
+     * @return
+     */
+    public Map<String,Object> selectProjectInvestmentEharts(String year);
+
+
 }

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

@@ -5,6 +5,7 @@ import com.ruoyi.system.domain.project.BmProject;
 import com.ruoyi.system.domain.project.BmProjectStatus;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -85,5 +86,19 @@ public interface IBmProjectService
      */
    public List<BmProject> selectStatisticsList(Long[] ids);
 
+    /**
+     * 统计分析-在谈线索-柱状图
+     * @param year
+     * @return
+     */
+   public Map<String,Object> selectProjectEharts(String year);
+
+    /**
+     * 统计分析-签约项目-柱状图
+     * @param year
+     * @return
+     */
+   public Map<String,Object> selectProjectContractEharts(String year);
+
 
 }

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

@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmCompanyShareholderList" parameterType="BmCompanyShareholder" resultMap="BmCompanyShareholderResult">
         <include refid="selectBmCompanyShareholderVo"/>
-        <where>  
+        <where>
+            is_del = '0'
             <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -34,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idcardFront != null  and idcardFront != ''"> and idcard_front = #{idcardFront}</if>
             <if test="idcardBack != null  and idcardBack != ''"> and idcard_back = #{idcardBack}</if>
         </where>
+
     </select>
     
     <select id="selectBmCompanyShareholderById" parameterType="Long" resultMap="BmCompanyShareholderResult">

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

@@ -35,7 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         bm_construction_eq e
         LEFT JOIN sys_dict_data d on e.eq_type = d.dict_value and d.dict_type = 'project_schedule'
-        <where>  
+        <where>
+            e.is_del = '0'
             <if test="bmProjectId != null "> and e.bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and e.is_del = #{isDel}</if>
             <if test="eqType != null  and eqType != ''"> and e.eq_type = #{eqType}</if>

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

@@ -22,7 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmConstructionPayInfoList" parameterType="BmConstructionPayInfo" resultMap="BmConstructionPayInfoResult">
         <include refid="selectBmConstructionPayInfoVo"/>
-        <where>  
+        <where>
+            is_del = '0'
             <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="statisticsDate != null "> and statistics_date = #{statisticsDate}</if>

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

@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select p.id, p.bm_project_id, p.create_by, p.create_time, p.update_by, p.update_time, p.is_del, p.pay_for_type, p.pay_for_money,  p.photo, d.dict_label as payForTypeName
         from bm_construction_pay p
         left join sys_dict_data d on p.pay_for_type = d.dict_value and d.dict_type = 'project_pay'
-        <where>  
+        <where>
+            p.is_del = '0'
             <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="payForType != null  and payForType != ''"> and pay_for_type = #{payForType}</if>
@@ -93,12 +94,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-<!--    <delete id="deleteBmConstructionPayByIds" parameterType="String">
-        delete from bm_construction_pay where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>-->
+    <select id="selectIndexEharts" parameterType="string" resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+        SELECT
+        d.dept_name as deptName,
+        ifnull(sum(cp.pay_for_money),0) as payForMoney
+        FROM
+        sys_dept d
+        LEFT JOIN bm_project p ON d.dept_id = p.dept_id
+        AND d.del_flag = '0'
+        LEFT JOIN bm_construction_pay cp ON p.id = cp.bm_project_id and p.is_del = '0' and year(cp.create_time) = #{year}
+        GROUP BY d.dept_id
+
+    </select>
+
+
+    <!--    <delete id="deleteBmConstructionPayByIds" parameterType="String">
+            delete from bm_construction_pay where id in
+            <foreach item="id" collection="array" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </delete>-->
 
     <update id="deleteBmConstructionPayByIds" parameterType="String">
         update bm_construction_pay set is_del = '1' where id in

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

@@ -24,7 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select r.id, r.bm_project_id, r.create_by, r.create_time, r.update_by, r.update_time, r.is_del, r.rate_type, r.photo, d.dict_label as rateTypeName
         from bm_construction_rate r
         left join sys_dict_data d on r.rate_type = d.dict_value and d.dict_type = 'project_rate'
-        <where>  
+        <where>
+            r.is_del = '0'
             <if test="bmProjectId != null "> and r.bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and r.is_del = #{isDel}</if>
             <if test="rateType != null  and rateType != ''"> and r.rate_type = #{rateType}</if>

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

@@ -26,7 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmDeptPlanList" parameterType="BmDeptPlan" resultMap="BmDeptPlanResult">
         <include refid="selectBmDeptPlanVo"/>
-        <where>  
+        <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>
@@ -140,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	AND d.is_del = '0'
 	LEFT JOIN (
 	SELECT
-		sum( s.payForMoney ) AS payForMoney,
+		sum(s.payForMoney ) AS payForMoney,
 		s.dept_id
 	FROM
 		(
@@ -168,8 +169,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     FROM
 	sys_dept d
 	LEFT JOIN bm_project p ON p.dept_id = d.dept_id
-	AND d.del_flag = '0'
+	AND d.del_flag = '0' and p.is_del = '0'
 	LEFT JOIN bm_dept_plan dp ON dp.sys_dept_id = d.dept_id
 	GROUP BY d.dept_id
     </select>
+
+
+    <select id="selectProjectUnitAmountEharts"  parameterType="string" resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    SELECT
+	sd.dept_name AS deptName,
+	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 sd.del_flag = '0'
+	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' and year(cp.create_time) = '2021'
+		) s
+	GROUP BY
+		s.dept_id
+	) s1 ON s1.dept_id = d.sys_dept_id
+    ORDER BY
+	s1.payForMoney DESC
+    </select>
+
+
+    <select id="selectInvestmentList"  resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    SELECT
+	d.dept_name AS deptName,
+	ifnull( dp.target_investment_num, 0 ) AS targetInvestmentNum,
+	ifnull( count(p.id), 0 ) AS successMission
+    FROM
+	sys_dept d
+	LEFT JOIN bm_project p ON p.dept_id = d.dept_id
+	AND d.del_flag = '0' 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
+    GROUP BY
+	d.dept_id
+	order by successMission DESC,
+	targetInvestmentNum DESC
+    </select>
+
+
+
+    <select id="selectProjectInvestmentEharts"  parameterType="string" resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    SELECT
+	d.dept_name AS deptName,
+	ifnull( count(p.id), 0 ) AS successMission
+    FROM
+	sys_dept d
+	LEFT JOIN bm_project p ON p.dept_id = d.dept_id
+	AND d.del_flag = '0' 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
+    GROUP BY
+	d.dept_id
+    </select>
 </mapper>

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

@@ -26,7 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmProjectConstructionList" parameterType="BmProjectConstruction" resultMap="BmProjectConstructionResult">
         <include refid="selectBmProjectConstructionVo"/>
-        <where>  
+        <where>
+            is_del = '0'
             <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="constructionCode != null  and constructionCode != ''"> and construction_code = #{constructionCode}</if>

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

@@ -41,7 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmProjectInfoList" parameterType="BmProjectInfo" resultMap="BmProjectInfoResult">
         <include refid="selectBmProjectInfoVo"/>
-        <where>  
+        <where>
+            is_del = '0'
             <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>

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

@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmProjectInvestorList" parameterType="BmProjectInvestor" resultMap="BmProjectInvestorResult">
         <include refid="selectBmProjectInvestorVo"/>
-        <where>  
+        <where>
+            is_del = '0'
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
             <if test="companyAddress != null  and companyAddress != ''"> and company_address = #{companyAddress}</if>
@@ -93,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>-->
 
     <update id="deleteBmProjectInvestorById" parameterType="Long">
-        update  bm_project_investor set id_del = '1' where id = #{id}
+        update  bm_project_investor set is_del = '1' where id = #{id}
     </update>
 
 <!--    <delete id="deleteBmProjectInvestorByIds" parameterType="String">
@@ -104,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>-->
 
     <update id="deleteBmProjectInvestorByIds" parameterType="String">
-        update  bm_project_investor set id_del = '1' where id in
+        update  bm_project_investor set is_del = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

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

@@ -51,9 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sdd.dict_label
         FROM
         bm_project p
-        left join sys_dept d on p.dept_id = d.dept_id
+        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>  
+        <where>
             <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>
@@ -184,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>-->
 
     <update id="deleteBmProjectById" parameterType="Long">
-        update  bm_project set id_del = '1' where id = #{id}
+        update  bm_project set is_del = '1' where id = #{id}
     </update>
 
 <!--    <delete id="deleteBmProjectByIds" parameterType="String">
@@ -195,7 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>-->
 
     <update id="deleteBmProjectByIds" parameterType="String">
-        update  bm_project set id_del = '1' where id in
+        update  bm_project set is_del = '1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -209,4 +209,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </select>
+
+    <select id="selectProjectEharts" parameterType="string" resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    SELECT
+	d.dept_name AS deptName,
+	ifnull( count(p.id), 0 ) as successMission
+    FROM
+	sys_dept d
+	LEFT JOIN bm_project p ON d.dept_id = p.dept_id
+	AND d.del_flag = '0' and p.project_status in (1,2,3) and p.is_del = '0'
+	AND YEAR (p.create_time ) = #{year}
+    GROUP BY
+	d.dept_id
+    </select>
+
+
+    <select id="selectProjectContractEharts" parameterType="string" resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
+    SELECT
+	d.dept_name AS deptName,
+	ifnull( sum( p.tot_amt ), 0 ) AS totAmt,
+	ifnull( count( p.id ), 0 ) AS successMission
+    FROM
+	sys_dept d
+	LEFT JOIN bm_project p ON d.dept_id = p.dept_id
+	AND d.del_flag = '0'
+	AND p.project_status &gt; 4
+	AND p.is_del = '0'
+	AND YEAR ( p.create_time ) = #{year}
+    GROUP BY
+	d.dept_id
+    </select>
 </mapper>

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

@@ -69,7 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmProjectOrderinfoList" parameterType="BmProjectOrderinfo" resultMap="BmProjectOrderinfoResult">
         <include refid="selectBmProjectOrderinfoVo"/>
-        <where>  
+        <where>
+            is_del = '0'
             <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="orderDate != null "> and order_date = #{orderDate}</if>

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

@@ -24,7 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmProjectPersionList" parameterType="BmProjectPersion" resultMap="BmProjectPersionResult">
         <include refid="selectBmProjectPersionVo"/>
-        <where>  
+        <where>
+            is_del = '0'
             <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>

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

@@ -26,7 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmProjectProductList" parameterType="BmProjectProduct" resultMap="BmProjectProductResult">
         <include refid="selectBmProjectProductVo"/>
-        <where>  
+        <where>
+            is_del = '0'
             <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="totInvestment != null "> and tot_investment = #{totInvestment}</if>

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

@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmProjectReferralList" parameterType="BmProjectReferral" resultMap="BmProjectReferralResult">
         <include refid="selectBmProjectReferralVo"/>
-        <where>  
+        <where>
+            is_del = '0'
             <if test="bmProjectId != null "> and bm_project_id = #{bmProjectId}</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>