Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

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

@@ -11,6 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @Param
@@ -76,6 +77,40 @@ public class ProjectCostBudget extends BaseEntity {
     @ApiModelProperty(value = "之前是否审批通过")
     private String approve;
 
-
+    @ApiModelProperty(value = "计划任务类型")
+    private Integer planTaskType;
+
+    @ApiModelProperty(value = "计划任务描述")
+    private String planTaskDesc;
+
+    @ApiModelProperty(value = "计划完成指标")
+    private String planTarget;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "计划开始日期")
+    private Date planStartDate;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "计划结束日期")
+    private Date planEndDate;
+
+    @ApiModelProperty(value = "计划天数")
+    private BigDecimal planDays;
+
+    @ApiModelProperty(value = "关联回款")
+    private Long contractReturnedId;
+
+    @ApiModelProperty(value = "父id")
+    private Long parentId;
 
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ControlProjectInfoVO.java

@@ -28,6 +28,9 @@ public class ControlProjectInfoVO extends ControlProjectInfo {
     private String implementPrincipalName;
     @ApiModelProperty(value = "维护负责人名称")
     private String maintainPrincipalName;
+
+    @ApiModelProperty(value = "项目当前进程名")
+    private String CurrentProcessName;
     @ApiModelProperty(value = "项目进程集合")
     private List<ProjectProcessVO> projectProcessList;
 }

blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectCostBudgetController.java

@@ -22,9 +22,22 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/projectCostBudget")
-@Api(value = "项目成本测算接口", tags = "项目成本测算接口")
+@Api(value = "计划预算接口", tags = "计划预算接口")
 public class ProjectCostBudgetController {
 
     private final IProjectCostBudgetService budgetService;
 
+    /**
+     * 分页获取计划列表
+     */
+    @GetMapping("/page")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "分页获取计划列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "queryValue", value = "搜索值", required = false),
+    })
+    public R page(ControlProjectInfoDTO dto, Query query){
+        return R.data(budgetService.page(dto,query));
+    }
+
 }

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

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.control.dto.ControlContractInfoDTO;
+import org.springblade.control.dto.ControlProjectInfoDTO;
 import org.springblade.control.entity.*;
 import org.springblade.control.vo.ControlContractInfoVO;
+import org.springblade.control.vo.ControlProjectInfoVO;
 import org.springblade.control.vo.ProjectCostBudgetVO;
+import org.springblade.core.mp.support.Query;
 
 import java.util.List;
 import java.util.Map;
@@ -26,4 +29,5 @@ public interface ProjectCostBudgetMapper extends BaseMapper<ProjectCostBudget> {
 
     ProjectCostBudgetStats getBudgetTotalByProjectId(@Param("projectId") Long projectId);
 
+    ControlProjectInfoVO page(IPage page,@Param("dto") ControlProjectInfoDTO dto);
 }

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

@@ -31,6 +31,27 @@
                 (select IFNULL(SUM(budget_count_money),0) FROM c_project_cost_budget WHERE project_id = #{projectId} and cost_type = 6) as outsourceCostTotal,
                 (select IFNULL(SUM(budget_count_money),0) FROM c_project_cost_budget WHERE project_id = #{projectId}) as projectCostTotal
     </select>
+    <select id="page" resultType="org.springblade.control.vo.ControlProjectInfoVO">
+        select
+            pi.*,
+            (select dict_name  from c_dict_info WHERE code = 'project_type' AND dict_value = pi.project_type) as projectTypeValue,
+            (select dict_name  from c_dict_info WHERE code = 'project_server_type' AND dict_value = pi.project_server_type) as projectServerTypeValue,
+            IFNULL((select cpp.name from c_project_process cpp WHERE cpp.project_id = pi.id and cpp.start_time &lt;= NOW() order by cpp.sort desc limit 1),
+                (select cpp.name from c_project_process cpp WHERE cpp.project_id = pi.id order by cpp.sort limit 1)) as CurrentProcessName
+        from c_control_project_info pi
+        WHERE 1=1
+        <if test="dto.projectType != null and dto.projectType != ''">
+            and pi.project_type = #{dto.projectType}
+        </if>
+        <if test="dto.projectServerType != null and dto.projectServerType != ''">
+            and pi.project_server_type = #{dto.projectServerType}
+        </if>
+        <if test="dto.queryValue != null and dto.queryValue != ''">
+            and pi.name like concat('%', #{dto.queryValue}, '%')
+        </if>
+        and id in (select cbs.project_id from c_project_cost_budget_stats cbs WHERE cbs.approve = 1)
+
+    </select>
 
 
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/service/IProjectCostBudgetService.java

@@ -30,4 +30,7 @@ public interface IProjectCostBudgetService extends BaseService<ProjectCostBudget
     List<ProjectCostBudget> budgetListByProjectId(Long projectId);
 
     void deleteByProjectId(Long projectId);
+
+    //分页获取列表
+    ControlProjectInfoVO page(ControlProjectInfoDTO dto, Query query);
 }

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

@@ -112,6 +112,12 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
         baseMapper.removeOldBudget(projectId);
     }
 
+    @Override
+    public ControlProjectInfoVO page(ControlProjectInfoDTO dto, Query query) {
+        IPage page = new Page(query.getCurrent(), query.getSize());
+        return baseMapper.page(page,dto);
+    }
+
     /**
      * 统计一行的几个总金额
      */