岗位类型

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/ProjectCostBudget.java

@@ -50,7 +50,7 @@ public class ProjectCostBudget extends BaseEntity {
     private BigDecimal budgetDays;
 
     @ApiModelProperty(value = "岗位类型")
-    private Integer postType;
+    private Long postType;
 
     @ApiModelProperty(value = "投入人员数量")
     private BigDecimal staffCount;

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectCostBudgetMapper.java

@@ -51,7 +51,7 @@ public interface ProjectCostBudgetMapper extends BaseMapper<ProjectCostBudget> {
 
     List<ProjectCostBudget> MonthOfYearPlanOverview(@Param("user") Long user,@Param("year") int year);
 
-    Integer getPostMoney(@Param("type") Integer postType);
+    Double getPostMoney(@Param("type") Long postType);
 
     List<ProjectCostBudget> getAllBudgetByProjectId(@Param("id") Long id);
 

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectCostBudgetMapper.xml

@@ -140,10 +140,7 @@
         where pcb.task_user = #{user} and pcb.is_deleted = 0
             and (DATE_FORMAT(pcb.plan_start_time,'%Y') = #{year} or DATE_FORMAT(pcb.plan_end_time,'%Y') = #{year})
     </select>
-    <select id="getPostMoney" resultType="java.lang.Integer">
-        select dict_value
-        from c_dict_info where `type` = 3 and code = #{type}
-    </select>
+
     <select id="getAllBudgetByProjectId" resultType="org.springblade.control.entity.ProjectCostBudget">
         select * from c_project_cost_budget pcb WHERE  pcb.is_deleted =0 and pcb.project_id = #{id} and pcb.parent_id = 0
     </select>
@@ -249,6 +246,10 @@
     <select id="getUnitType" resultType="org.springblade.control.entity.DictInfo">
         select * from c_dict_info WHERE code = 'unit_type' order by sort
     </select>
+    <select id="getPostMoney" resultType="java.lang.Double">
+        select dict_value
+        from c_dict_info where `type` = 3 and id = #{type}
+    </select>
 
 
 </mapper>

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

@@ -741,7 +741,7 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
     public void countMoney(ProjectCostBudget budget){
         BigDecimal postMoney;
         if (budget.getPostType() != null && budget.getPostType() > 0){
-            Integer money = baseMapper.getPostMoney(budget.getPostType());
+            Double money = baseMapper.getPostMoney(budget.getPostType());
             postMoney = new BigDecimal(money);
         }else {
             postMoney = new BigDecimal("0");