Explorar el Código

计划进度不超过100,消息只提示2天

qianxb hace 2 años
padre
commit
57fde87e87

+ 3 - 0
blade-service/blade-control/src/main/java/org/springblade/control/mapper/PlanInformMapper.java

@@ -5,6 +5,8 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.control.entity.AnnualBudgetDisburse;
 import org.springblade.control.entity.PlanInform;
 
+import java.util.List;
+
 /**
  * @Param
  * @Author wangwl
@@ -13,4 +15,5 @@ import org.springblade.control.entity.PlanInform;
 public interface PlanInformMapper extends BaseMapper<PlanInform> {
 
 
+    List<PlanInform> getUserInform(@Param("userId") Long userId);
 }

+ 6 - 0
blade-service/blade-control/src/main/java/org/springblade/control/mapper/PlanInformMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.springblade.control.mapper.PlanInformMapper">
 
+    <select id="getUserInform" resultType="org.springblade.control.entity.PlanInform">
+        select * from c_plan_inform
+        WHERE inform_user = #{userId} AND DATE_FORMAT(inform_date,'%Y-%m-%d') &gt;= DATE_FORMAT(date_add(NOW() , interval '-2' DAY),'%Y-%m-%d')
+        order by inform_date desc
+        limit 5
+    </select>
 </mapper>

+ 1 - 2
blade-service/blade-control/src/main/java/org/springblade/control/service/impl/PlanInformServiceImpl.java

@@ -39,8 +39,7 @@ public class PlanInformServiceImpl extends BaseServiceImpl<PlanInformMapper, Pla
 
     @Override
     public List<PlanInform> getUserInform() {
-        //没有用户
         Long userId = SecureUtil.getUserId();
-        return this.list(new LambdaQueryWrapper<PlanInform>().eq(PlanInform::getInformUser,userId).orderByDesc(PlanInform::getInformDate).last("limit 5"));
+        return baseMapper.getUserInform(userId);
     }
 }

+ 6 - 1
blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectCostBudgetServiceImpl.java

@@ -914,7 +914,12 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
                             }
                         }
                         if (total.compareTo(new BigDecimal(0)) != 0) {
-                            ratios.add(finished.divide(total, 2,RoundingMode.HALF_UP).multiply(new BigDecimal(100)).intValue());
+                            int i = finished.divide(total, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).intValue();
+                            if (i > 100){
+                                i = 100;
+                            }
+                            ratios.add(i);
+
                         } else {
                             ratios.add(0);
                         }