fix bug

ruoyi-admin/pom.xml

@@ -24,13 +24,13 @@
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
 
-        <!-- swagger2-->
+<!--        &lt;!&ndash; swagger2&ndash;&gt;
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
         </dependency>
 
-        <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
+        &lt;!&ndash;防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本&ndash;&gt;
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
@@ -43,11 +43,11 @@
             <version>1.5.21</version>
         </dependency>
 
-        <!-- swagger2-UI-->
+        &lt;!&ndash; swagger2-UI&ndash;&gt;
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
-        </dependency>
+        </dependency>-->
 
          <!-- Mysql驱动包 -->
         <dependency>

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.project;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -109,4 +110,20 @@ public class BmConstructionPayController extends BaseController
         return AjaxResult.success(stringObjectMap);
     }
 
+    /**
+     * 项目到资金额合计
+     */
+    @PostMapping("/payForMoneyALL")
+    public AjaxResult payForMoneyALL(@RequestBody BmConstructionPay bmConstructionPay)
+    {
+        List<BmConstructionPay> list = bmConstructionPayService.selectBmConstructionPayList(bmConstructionPay);
+        BigDecimal payForMoneyALL = BigDecimal.ZERO;
+        if (list.size() > 0){
+            for (BmConstructionPay constructionPay : list) {
+                BigDecimal payForMoney = constructionPay.getPayForMoney();
+                payForMoneyALL = payForMoneyALL.add(payForMoney);
+            }
+        }
+        return AjaxResult.success(payForMoneyALL);
+    }
 }

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

@@ -100,7 +100,7 @@ public class BmProjectController extends BaseController {
 
 
     /**
-     * 审核/提交
+     * 提交审核
      * @param bmProjectStatus
      * @return
      */
@@ -111,7 +111,18 @@ public class BmProjectController extends BaseController {
     }
 
     /**
-     * 驳回项目
+     * 确认审核
+     * @param bmProjectStatus
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('bmProject:project:pass')")
+    @PostMapping("/pass")
+    public AjaxResult pass(@RequestBody BmProjectStatus bmProjectStatus) {
+        return bmProjectService.examine(bmProjectStatus);
+    }
+
+    /**
+     * 驳回审核
      * @param bmProjectStatus
      * @return
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -160,4 +160,14 @@ public class SysDeptController extends BaseController
         }
         return toAjax(deptService.deleteDeptById(deptId));
     }
+
+
+    /**
+     * 单独获取部门列表
+     */
+    @GetMapping("/deptList")
+    public AjaxResult deptList()
+    {
+        return  deptService.selectDeptVoList();
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java

@@ -1,3 +1,4 @@
+/*
 package com.ruoyi.web.controller.tool;
 
 import java.util.ArrayList;
@@ -14,17 +15,15 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 
+
+*/
 /**
  * swagger 用户测试方法
  * 
  * @author ruoyi
- */
+ *//*
+
 @Api("用户信息管理")
 @RestController
 @RequestMapping("/test/user")
@@ -173,3 +172,4 @@ class UserEntity
         this.mobile = mobile;
     }
 }
+*/

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -128,12 +128,16 @@ public class Constants
     public static final String RESOURCE_PREFIX = "/profile";
 
     /**
-     * 审核通过/提交审核
+     * 提交审核
      */
-    public static final Long EXAMINE_PASS = 1L;
+    public static final Long EXAMINE_COMMIT = 1L;
 
     /**
      * 审核驳回
      */
     public static final Long EXAMINE_BACK = 2L;
+    /**
+     * 审核通过
+     */
+    public static final Long EXAMINE_PASS = 3L;
 }

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

@@ -10,7 +10,7 @@ public class BmProjectStatus {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 1:提交审核/审核通过 2:审核驳回
+     * 1:提交审核 2:审核驳回 3:审核通过
      */
     private Long code;
 

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

@@ -0,0 +1,29 @@
+package com.ruoyi.system.domain.vo;
+
+/**
+ * 单独查询部门
+ */
+public class SysDeptVo {
+    private static final long serialVersionUID = 1L;
+    /** 部门ID */
+    private Long deptId;
+
+    /** 部门名称 */
+    private String deptName;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.vo.SysDeptVo;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysDept;
 
@@ -115,4 +117,11 @@ public interface SysDeptMapper
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+
+    /**
+     * 单独查询部门信息
+     * @return
+     */
+    public List<SysDeptVo> selectDeptVoList();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
 
@@ -106,4 +108,10 @@ public interface ISysDeptService
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+    /**
+     * 单独查询部门信息
+     * @return
+     */
+    public AjaxResult selectDeptVoList();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -4,6 +4,9 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.vo.SysDeptVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.annotation.DataScope;
@@ -261,6 +264,16 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.deleteDeptById(deptId);
     }
 
+    /**
+     * 单独查询部门信息
+     * @return
+     */
+    @Override
+    public AjaxResult selectDeptVoList() {
+        List<SysDeptVo> sysDeptVos = deptMapper.selectDeptVoList();
+        return AjaxResult.success(sysDeptVos);
+    }
+
     /**
      * 递归列表
      */

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

@@ -67,7 +67,7 @@ public class BmConstructionPayInfoServiceImpl implements IBmConstructionPayInfoS
         if (bmProjectId == null) {
             return AjaxResult.error("缺少项目id");
         }
-        templateSetTime(BmConstructionPayInfo.class,bmConstructionPayInfo);
+        //templateSetTime(BmConstructionPayInfo.class,bmConstructionPayInfo);
         int i = bmConstructionPayInfoMapper.insertBmConstructionPayInfo(bmConstructionPayInfo);
         if (i != 1) {
             return AjaxResult.error("新增失败");
@@ -91,7 +91,7 @@ public class BmConstructionPayInfoServiceImpl implements IBmConstructionPayInfoS
         if (bmProjectId == null) {
             return AjaxResult.error("缺少项目id");
         }
-        templateSetTime(BmConstructionPayInfo.class,bmConstructionPayInfo);
+        //templateSetTime(BmConstructionPayInfo.class,bmConstructionPayInfo);
         int i = bmConstructionPayInfoMapper.updateBmConstructionPayInfo(bmConstructionPayInfo);
         if (i != 1) {
             return AjaxResult.error("新增失败");

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

@@ -82,7 +82,7 @@ public class BmProjectConstructionServiceImpl implements IBmProjectConstructionS
         if (bmProjectId == null) {
             return AjaxResult.error("缺少项目id");
         }
-        templateSetTime(BmProjectConstruction.class, bmProjectConstruction);
+        //templateSetTime(BmProjectConstruction.class, bmProjectConstruction);
         int i = bmProjectConstructionMapper.insertBmProjectConstruction(bmProjectConstruction);
         if (i != 1) {
             return AjaxResult.error("添加失败");
@@ -105,7 +105,7 @@ public class BmProjectConstructionServiceImpl implements IBmProjectConstructionS
         if (bmProjectId == null) {
             return AjaxResult.error("缺少项目id");
         }
-        templateSetTime(BmProjectConstruction.class, bmProjectConstruction);
+        //templateSetTime(BmProjectConstruction.class, bmProjectConstruction);
         int i = bmProjectConstructionMapper.updateBmProjectConstruction(bmProjectConstruction);
         if (i != 1) {
             return AjaxResult.error("更新失败");

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

@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.impl.project;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -13,6 +14,7 @@ import com.ruoyi.system.mapper.project.BmProjectOrderinfoMapper;
 import com.ruoyi.system.service.project.IBmProjectOrderinfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 项目签约Service业务层处理
@@ -57,6 +59,7 @@ public class BmProjectOrderinfoServiceImpl implements IBmProjectOrderinfoService
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult insertBmProjectOrderinfo(BmProjectOrderinfo bmProjectOrderinfo) {
         bmProjectOrderinfo.setCreateTime(DateUtils.getNowDate());
         bmProjectOrderinfo.setCreateBy(SecurityUtils.getUsername());
@@ -65,15 +68,8 @@ public class BmProjectOrderinfoServiceImpl implements IBmProjectOrderinfoService
         if (bmProjectId == null) {
             return AjaxResult.error("缺少项目id");
         }
-        BigDecimal totInvestment = bmProjectOrderinfo.getTotInvestment();
-        if (totInvestment != null){
-            BmProject bmProject = new BmProject();
-            bmProject.setId(bmProjectId);
-            bmProject.setTotAmt(totInvestment);
-            bmProjectMapper.updateBmProject(bmProject);
-        }
         bmProjectOrderinfoMapper.insertBmProjectOrderinfo(bmProjectOrderinfo);
-        return AjaxResult.success();
+        return updateBmProjectOrderinfo(bmProjectOrderinfo);
     }
 
     /**
@@ -83,6 +79,7 @@ public class BmProjectOrderinfoServiceImpl implements IBmProjectOrderinfoService
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult updateBmProjectOrderinfo(BmProjectOrderinfo bmProjectOrderinfo) {
         bmProjectOrderinfo.setUpdateTime(DateUtils.getNowDate());
         bmProjectOrderinfo.setUpdateBy(SecurityUtils.getUsername());
@@ -91,15 +88,8 @@ public class BmProjectOrderinfoServiceImpl implements IBmProjectOrderinfoService
         if (bmProjectId == null) {
             return AjaxResult.error("缺少项目id");
         }
-        BigDecimal totInvestment = bmProjectOrderinfo.getTotInvestment();
-        if (totInvestment != null){
-            BmProject bmProject = new BmProject();
-            bmProject.setId(bmProjectId);
-            bmProject.setTotAmt(totInvestment);
-            bmProjectMapper.updateBmProject(bmProject);
-        }
-         bmProjectOrderinfoMapper.updateBmProjectOrderinfo(bmProjectOrderinfo);
-         return AjaxResult.success();
+        bmProjectOrderinfoMapper.updateBmProjectOrderinfo(bmProjectOrderinfo);
+        return updateBmProject(bmProjectOrderinfo);
     }
 
     /**
@@ -123,4 +113,27 @@ public class BmProjectOrderinfoServiceImpl implements IBmProjectOrderinfoService
     public int deleteBmProjectOrderinfoById(Long id) {
         return bmProjectOrderinfoMapper.deleteBmProjectOrderinfoById(id);
     }
+
+    /**
+     * 提取参数更新BmProject表字段
+     *
+     * @param bmProjectOrderInfo
+     */
+    public AjaxResult updateBmProject(BmProjectOrderinfo bmProjectOrderInfo) {
+        Long bmProjectId = bmProjectOrderInfo.getBmProjectId();
+        BigDecimal totInvestment = bmProjectOrderInfo.getTotInvestment();
+        Date agreementStartDate = bmProjectOrderInfo.getAgreementStartdate();
+        Date agreementEndDate = bmProjectOrderInfo.getAgreementEnddate();
+        if (totInvestment != null && agreementStartDate != null && agreementEndDate != null) {
+            BmProject bmProject = new BmProject();
+            bmProject.setId(bmProjectId);
+            bmProject.setTotAmt(totInvestment);
+            bmProject.setOrderBeginTime(agreementStartDate);
+            bmProject.setOrderEndTime(agreementEndDate);
+            bmProjectMapper.updateBmProject(bmProject);
+        } else {
+            return AjaxResult.error("缺少参数");
+        }
+        return AjaxResult.success();
+    }
 }

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

@@ -1,13 +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 java.util.*;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
@@ -22,8 +20,7 @@ import com.ruoyi.system.service.project.IBmProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import static com.ruoyi.common.constant.Constants.EXAMINE_BACK;
-import static com.ruoyi.common.constant.Constants.EXAMINE_PASS;
+import static com.ruoyi.common.constant.Constants.*;
 
 
 /**
@@ -134,27 +131,49 @@ public class BmProjectServiceImpl implements IBmProjectService {
             return AjaxResult.error("项目id为NULL");
         }
         Long code = bmProjectStatus.getCode();
-        //查询项目状态最多有多少个
-        int count = dictDataMapper.countDictDataByType("project_status");
+
         synchronized (this) {
             BmProject bmProject = bmProjectMapper.selectBmProjectById(projectId);
             //获取当前状态
             Long projectStatus = bmProject.getProjectStatus();
             //如果当前进度是1:新增线索,不能继续驳回
-            if (projectStatus.equals(EXAMINE_PASS) && code.equals(EXAMINE_BACK)) {
+            if (projectStatus.equals(EXAMINE_COMMIT) && code.equals(EXAMINE_BACK)) {
                 return AjaxResult.error("无法继续驳回");
             }
-            if (projectStatus == count) {
+           if((projectStatus & 1) == 0 && code.equals(EXAMINE_COMMIT) ){
+               //是偶数并且还是提交审核
+               return AjaxResult.error("正在等待审核");
+           }else if ((projectStatus & 1) == 1 && code.equals(EXAMINE_BACK)){
+               //是奇数并且还是驳回审核或者审核通过
+               return AjaxResult.error("当前已审核通过");
+           }else if ((projectStatus & 1) == 1 && code.equals(EXAMINE_PASS)){
+               //是奇数并且还是驳回审核或者审核通过
+               return AjaxResult.error("当前已审核通过");
+           }
+            //查询项目状态最多有多少个
+            List<SysDictData> dictDataList = dictDataMapper.selectDictDataByType("project_status");
+
+            if (dictDataList.size() > 0 && projectStatus == dictDataList.size()) {
                 return AjaxResult.error("当前项目已结束,无法继续操作");
             }
-            //提交审核/审核通过
-            projectStatus = code.equals(EXAMINE_PASS) ? projectStatus + EXAMINE_PASS : projectStatus - EXAMINE_PASS;
-            if (projectStatus < EXAMINE_PASS) {
-                projectStatus = EXAMINE_PASS;
+            //判断是否是提交审核/通过审核
+            projectStatus = !code.equals(EXAMINE_BACK) ? projectStatus + EXAMINE_COMMIT : projectStatus - EXAMINE_COMMIT;
+            if (projectStatus < EXAMINE_COMMIT) {
+                projectStatus = EXAMINE_COMMIT;
             }
             BmProject bmProjectNew = new BmProject();
             bmProjectNew.setId(projectId);
             bmProjectNew.setProjectStatus(projectStatus);
+            if (dictDataList.size() > 0){
+                for (SysDictData sysDictData : dictDataList) {
+                    if (sysDictData.getDictValue().equals(projectStatus.toString())){
+                        StringBuilder sb = new StringBuilder(DateUtils.getTime());
+                        sb.append("<br>").append("[").append(sysDictData.getDictLabel()).append("]");
+                        bmProjectNew.setRemark(sb.toString());
+                        break;
+                    }
+                }
+            }
             bmProjectMapper.updateBmProject(bmProjectNew);
         }
         return AjaxResult.success();

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -154,4 +154,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 
+	<select id="selectDeptVoList" resultType="com.ruoyi.system.domain.vo.SysDeptVo">
+		select dept_id as deptId,dept_name as deptName from sys_dept where status = '0' and  del_flag = '0'
+	</select>
+
 </mapper> 

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

@@ -27,11 +27,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_dict_data d on p.pay_for_type = d.dict_value and d.dict_type = 'project_pay'
         <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>
-            <if test="payForMoney != null"> and pay_for_money = #{payForMoney}</if>
-            <if test="photo != null  and photo != ''"> and photo = #{photo}</if>
+            <if test="bmProjectId != null "> and p.bm_project_id = #{bmProjectId}</if>
+            <if test="payForType != null  and payForType != ''"> and p.pay_for_type = #{payForType}</if>
+            <if test="payForMoney != null"> and p.pay_for_money = #{payForMoney}</if>
+            <if test="photo != null  and photo != ''"> and p.photo = #{photo}</if>
         </where>
     </select>
     
@@ -39,7 +38,7 @@ 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 bm_project_id = #{id}
+        where p.id = #{id}
     </select>
         
     <insert id="insertBmConstructionPay" parameterType="BmConstructionPay">

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

@@ -40,8 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectBmProjectConstructionById" parameterType="Long" resultMap="BmProjectConstructionResult">
-        <include refid="selectBmProjectConstructionVo"/>
-        where bm_project_id = #{id}
+      select c.id, c.bm_project_id, c.create_by, c.create_time, c.update_by, c.update_time, c.is_del, c.construction_code, c.is_construction, c.construction_startdate, c.construction_enddate, c.construction_doc, c.construction_photo, p.order_begin_time, p.order_end_time
+      from bm_project_construction c
+      left join bm_project p on c.bm_project_id = p.id
+      where c.bm_project_id = #{id} limit 1
     </select>
         
     <insert id="insertBmProjectConstruction" parameterType="BmProjectConstruction" useGeneratedKeys="true" keyProperty="id">

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

@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="beginTime != null "> and p.create_time &gt;= #{beginTime}</if>
             <if test="endTime != null "> and p.create_time &lt;= #{endTime}</if>
         </where>
+        order by p.create_time DESC
     </select>
 
     <select id="selectToBeReviewedList" parameterType="BmProject" resultMap="BmProjectResult">
@@ -89,7 +90,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bm_project p
         left join sys_dict_data sdd on p.project_status = sdd.dict_value and sdd.dict_type = 'project_status'
         where
+        p.is_del = '0' and
         sdd.dict_value=(sdd.dict_value<![CDATA[>>]]>1)<![CDATA[<<]]>1
+        order by p.create_time DESC
     </select>
     
     <select id="selectBmProjectById" parameterType="Long" resultMap="BmProjectResult">
@@ -116,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bm_project p
         left join sys_dept d on p.dept_id = d.dept_id
         left join sys_dict_data sdd on p.project_status = sdd.dict_value and sdd.dict_type = 'project_status'
-        where p.id = #{id}
+        where p.id = #{id} and p.is_del = '0'
     </select>
         
     <insert id="insertBmProject" parameterType="BmProject" useGeneratedKeys="true" keyProperty="id">
@@ -202,12 +205,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
 
-    <select id="selectStatisticsList" resultType="com.ruoyi.system.domain.project.BmProject">
+    <select id="selectStatisticsList" resultMap="BmProjectResult">
         <include refid="selectBmProjectVo"></include>
         where is_del = '0' and project_status in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
+        order by create_time DESC
     </select>
 
     <select id="selectProjectEharts" parameterType="string" resultType="com.ruoyi.system.domain.vo.BmDeptPlanVo">
@@ -217,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     FROM
 	sys_dept d
 	LEFT JOIN bm_project p ON d.dept_id = p.dept_id
-	AND d.del_flag = '0' and p.project_status in (1,2,3) and p.is_del = '0'
+	AND d.del_flag = '0' and d.status = '0' and p.project_status in (1,2,3) and p.is_del = '0'
 	AND YEAR (p.create_time ) = #{year}
     GROUP BY
 	d.dept_id
@@ -233,6 +237,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	sys_dept d
 	LEFT JOIN bm_project p ON d.dept_id = p.dept_id
 	AND d.del_flag = '0'
+	AND d.status = '0'
 	AND p.project_status &gt; 4
 	AND p.is_del = '0'
 	AND YEAR ( p.create_time ) = #{year}