Merge remote-tracking branch 'origin/master'

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

@@ -13,7 +13,8 @@ import java.util.List;
  * @Date 2023/6/8 10:30
  **/
 @Data
-public class ProjectCostBudgetVO3 {
+@EqualsAndHashCode(callSuper = true)
+public class ProjectCostBudgetVO3 extends ProjectCostBudget{
     @ApiModelProperty(value = "任务总数")
     private Integer totalPlan;
 
@@ -38,5 +39,8 @@ public class ProjectCostBudgetVO3 {
     @ApiModelProperty(value = "未填写日志总数")
     private Integer notFilledLog;
 
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
 
 }

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

@@ -110,6 +110,16 @@ public class ProjectCostBudgetController {
         return R.data(budgetService.planOverview());
     }
 
+    /**
+     * 门户普通权限预警
+     */
+    @GetMapping("/postponePlan")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "门户普通权限预警")
+    public R postponePlan(){
+        return R.data(budgetService.postponePlan());
+    }
+
     /**
      * 门户普通权限单月计划统计
      */

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

@@ -103,8 +103,8 @@ public class ProjectCostBudgetStatsController {
     @GetMapping("/getProjectList")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "获取未做预算的项目列表")
-    public R getProjectList() {
-        return R.data(budgetStatsService.getProjectList());
+    public R getProjectList(Integer type) {
+        return R.data(budgetStatsService.getProjectList(type));
     }
 
     /**

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

@@ -43,4 +43,6 @@ public interface ProjectCostBudgetMapper extends BaseMapper<ProjectCostBudget> {
     ProjectCostBudgetVO3 getUserALLPlan(@Param("user") Long user);
 
     ProjectCostBudgetVO3 MonthPlanOverview(@Param("user") Long user,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<ProjectCostBudgetVO3> postponePlan(@Param("user") Long user);
 }

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

@@ -98,6 +98,11 @@
                 or pcb.plan_end_time BETWEEN #{startDate} AND #{endDate})) as 'unfinishedPlan'
 
     </select>
+    <select id="postponePlan" resultType="org.springblade.control.vo.ProjectCostBudgetVO3">
+        select pcb.id,pcb.plan_task_desc,pcb.plan_end_time,
+               (select cpi.name from c_control_project_info cpi WHERE cpi.id = pcb.project_id) as "projectName"
+        from c_project_cost_budget pcb where pcb.task_user = #{user} and pcb.is_deleted = 0 and pcb.plan_end_time &lt;= NOW() and pcb.status in (1,2,3)
+    </select>
 
 
 </mapper>

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

@@ -26,6 +26,8 @@ public interface ProjectCostBudgetStatsMapper extends BaseMapper<ProjectCostBudg
 
     List<ControlProjectInfo> getProjectList();
 
+    List<ControlProjectInfo> getProjectList2();
+
     List<DictInfo> getCostTypeDict();
 
     List<ProjectProcess> getProcessList(@Param("projectId") Long projectId);

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

@@ -16,14 +16,18 @@
     <select id="page" resultType="org.springblade.control.vo.ProjectCostBudgetStatsVO">
         SELECT cbs.*,cpi.name as projectName,CASE cbs.status WHEN '0' THEN '未上报' WHEN '1' THEN '已上报' WHEN '2' THEN '已审批' ELSE '已驳回' END as statusValue
         from c_project_cost_budget_stats cbs left join bladex.c_control_project_info cpi on cbs.project_id = cpi.id
-        where is_deleted = 0
+        where cbs.is_deleted = 0
         <if test="queryValue != null and queryValue != ''">
             and cpi.name like concat('%', #{queryValue}, '%')
         </if>
     </select>
 
     <select id="getProjectList" resultType="org.springblade.control.entity.ControlProjectInfo">
-        select * FROM c_control_project_info cpi left join c_project_cost_budget_stats cbs on cpi.id = cbs.project_id WHERE cbs.id is null
+        select * FROM c_control_project_info cpi left join c_project_cost_budget_stats cbs on cpi.id = cbs.project_id WHERE cpi.is_deleted = 0 and cbs.id is null
+    </select>
+
+    <select id="getProjectList2" resultType="org.springblade.control.entity.ControlProjectInfo">
+        select * FROM c_control_project_info cpi  WHERE cpi.is_deleted = 0
     </select>
 
     <select id="getCostTypeDict" resultType="org.springblade.control.entity.DictInfo">

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

@@ -48,4 +48,6 @@ public interface IProjectCostBudgetService extends BaseService<ProjectCostBudget
     ProjectCostBudgetVO3 planOverview();
 
     ProjectCostBudgetVO3 MonthPlanOverview(String planDate);
+
+    List<ProjectCostBudgetVO3> postponePlan();
 }

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

@@ -28,7 +28,7 @@ public interface IProjectCostBudgetStatsService extends BaseService<ProjectCostB
 
     ProjectCostBudgetStatsVO budgetList(ProjectCostBudget costBudget);
 
-    List<ControlProjectInfo> getProjectList();
+    List<ControlProjectInfo> getProjectList(Integer type);
 
     List<DictInfo> getCostTypeDict();
 

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

@@ -313,6 +313,16 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
         return vo3;
     }
 
+    /**
+     * 门户普通权限预警
+     */
+    @Override
+    public List<ProjectCostBudgetVO3> postponePlan() {
+        //没有用户
+        Long user = 1123598821738675201L;
+        return baseMapper.postponePlan(user);
+    }
+
     /**
      * 统计一行的几个总金额
      */

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

@@ -130,8 +130,12 @@ public class ProjectCostBudgetStatsServiceImpl extends BaseServiceImpl<ProjectCo
      * 获取未做预算的项目列表
      */
     @Override
-    public List<ControlProjectInfo> getProjectList() {
-        return baseMapper.getProjectList();
+    public List<ControlProjectInfo> getProjectList(Integer type) {
+        if (type.equals(1)) {
+            return baseMapper.getProjectList();
+        }else {
+            return baseMapper.getProjectList2();
+        }
     }
 
     /**

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeContractController.java

@@ -333,6 +333,7 @@ public class ArchiveTreeContractController extends BladeController {
             return R.fail(200, "节点错误");
         }
         boolean b = archiveTreeContractService.syncProjectTree(archiveTree);
+        //
         if (b) {
             return R.success("同步成功");
         }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.java

@@ -96,4 +96,9 @@ public interface ArchiveTreeContractMapper extends BaseMapper<ArchiveTreeContrac
     ArchiveTreeContract getFirstNodeByTreeCode(@Param("projectId") Long projectId);
 
     ArchiveTreeContract getFirstNodeByTreeCode2(@Param("projectId") Long projectId,@Param("type") String type);
+
+    List<ArchiveTreeContract> getSelectRuleNode(@Param("projectId")Long projectId);
+
+    Integer getCountfromIdIsNull(@Param("id") Long id);
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -450,4 +450,15 @@
         WHERE parent_id = (select id from m_archive_tree_contract WHERE parent_id = 0 and project_id = #{projectId})
           and is_deleted = 0 and tree_code = #{type}
     </select>
+
+    <select id="getSelectRuleNode" resultType="org.springblade.manager.entity.ArchiveTreeContract">
+        select * from m_archive_tree_contract
+        WHERE project_id = #{projectId}) and is_deleted = 0 and archive_auto_group_select = 1
+    </select>
+
+    <select id="getCountfromIdIsNull" resultType="java.lang.Integer">
+        select count(*) from m_archive_tree_contract
+        WHERE project_id = #{projectId}) and is_deleted = 0 and from_id is null and like concat('%',#{id},'%')
+    </select>
+
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IArchiveTreeContractService.java

@@ -88,6 +88,13 @@ public interface IArchiveTreeContractService extends BaseService<ArchiveTreeCont
 
     boolean syncProjectTree(ArchiveTreeContract dstNode);
 
+    /**
+     * 更新在客户级新加的节点的组卷规则 这些节点没有对应的项目级节点
+     * @param projectId
+     * @return
+     */
+    void syncArchiveTreeContractForAddNodeRule(Long projectId);
+
     boolean UpdateByArchiveTree(ArchiveTree archiveTree);
 
     boolean deleteTree(Long id);

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractServiceImpl.java

@@ -471,6 +471,28 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 		return true;
 	}
 
+	/**
+	 * 更新在客户级新加的节点的组卷规则 这些节点没有对应的项目级节点
+	 * @param projectId
+	 * @return
+	 */
+	@Override
+	public void syncArchiveTreeContractForAddNodeRule(Long projectId) {
+
+		//找出客户级select=1的节点，把规则覆盖到下级所有节点，
+		List<ArchiveTreeContract> selectRuleNode = archiveTreeContractMapper.getSelectRuleNode(projectId);
+		for(ArchiveTreeContract treeContract:selectRuleNode){
+			//查看下面节点是否有新加的节点
+			Integer countfromIdIsNull = archiveTreeContractMapper.getCountfromIdIsNull(treeContract.getId());
+			if(countfromIdIsNull>0){
+				// 下级节点存在有对应项目级节点的（formId不为空）默认规则不能覆盖 单独和分类；
+
+				// 下级节点formId为空的，默认规则可以覆盖 单独和分类，但是先执行顺序是 默认规则同步必须先执行。
+			}
+		}
+
+	}
+
 	/**
 	 * 新增合同段时，要复制一份合同段的分支出来
 	 * @param contractInfos