项目统计汇总、新增字段、任务删除

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/MateDeliveryController.java

@@ -3,6 +3,7 @@ package com.wx.blink.backend.controller;
 import com.wx.blink.backend.domain.dto.MateDeliveryContactDTO;
 import com.wx.blink.backend.domain.dto.MateDeliveryDTO;
 import com.wx.blink.backend.domain.dto.MateDeliveryFileDTO;
+import com.wx.blink.backend.domain.dto.MateDeliverySummaryDTO;
 import com.wx.blink.backend.domain.qry.MateDeliveryContactQry;
 import com.wx.blink.backend.domain.qry.MateDeliveryFileQry;
 import com.wx.blink.backend.domain.qry.MateDeliveryQry;
@@ -38,6 +39,12 @@ public class MateDeliveryController {
         return mateDeliveryService.mateDeliveryCreate(dto);
     }
 
+    @Operation(summary = "项目信息汇总")
+    @GetMapping("/mate/delivery/summary")
+    public ResponseDTO<List<MateDeliverySummaryDTO>> mateDeliverySummary(MateDeliveryQry qry) {
+        return mateDeliveryService.mateDeliverySummary(qry);
+    }
+
     @Operation(summary = "【管理端】项目列表")
     @GetMapping("/mate/delivery/queryPage")
     public ResponseDTO<PageResult<MateDeliveryDTO>> mateDeliveryQueryPage(MateDeliveryQry qry) {

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/MateDeliveryTaskController.java

@@ -53,7 +53,7 @@ public class MateDeliveryTaskController {
     @Operation(summary = "【管理端】单项目任务列表")
     @GetMapping("/mate/delivery/task/v1/queryPage")
     public ResponseDTO<PageResult<MateDeliveryTaskV1DTO>> mateDeliveryTaskV1QueryPage(MateDeliveryTaskQry qry) {
-        return ResponseDTO.ok(deliveryTaskService.mateDeliveryTaskV1QueryPage(qry));
+        return deliveryTaskService.mateDeliveryTaskV1QueryPage(qry);
     }
 
     @Operation(summary = "【管理端】单项目任务看板part1")
@@ -71,7 +71,13 @@ public class MateDeliveryTaskController {
     @Operation(summary = "【员工端】单项目任务列表")
     @GetMapping("/mate/delivery/task/client/v1/queryPage")
     public ResponseDTO<PageResult<MateDeliveryTaskV1DTO>> mateDeliveryTaskClientV1QueryPage(MateDeliveryTaskQry qry) {
-        return ResponseDTO.ok(deliveryTaskService.mateDeliveryTaskClientV1QueryPage(qry));
+        return deliveryTaskService.mateDeliveryTaskClientV1QueryPage(qry);
+    }
+
+    @Operation(summary = "项目任务删除")
+    @GetMapping("/mate/delivery/task/delete/{id}")
+    public ResponseDTO<String> mateDeliveryTaskDelete(@PathVariable Long id) {
+        return deliveryTaskService.mateDeliveryTaskDelete(id);
     }
 
     @Operation(summary = "【员工端】单项目任务看板Part1")

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/MateDeliveryDO.java

@@ -90,4 +90,43 @@ public class MateDeliveryDO extends BaseEntity {
      */
     private Integer deletedFlag;
 
+    /**
+     * 项目类别
+     */
+    private String deliverySort;
+
+    /**
+     * 服务客户id
+     */
+    private String serviceCustomerId;
+
+    /**
+     * 客户经理
+     */
+    private String customerManager;
+
+    /**
+     * 项目经理
+     */
+    private String projectManager;
+
+    /**
+     * 产品经理
+     */
+    private String productManager;
+
+    /**
+     * 后端开发
+     */
+    private String backDeveloper;
+
+    /**
+     * 前端开发
+     */
+    private String frontDeveloper;
+
+    /**
+     * 测试
+     */
+    private String tester;
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/MateDeliveryTaskDO.java

@@ -162,4 +162,13 @@ public class MateDeliveryTaskDO extends BaseEntity {
      */
     private Integer deletedFlag;
 
+    /**
+     * 预计开始日期
+     */
+    private Date planStartDate;
+
+    /**
+     * 预计结束日期
+     */
+    private Date planEndDate;
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/MateDeliveryDTO.java

@@ -124,4 +124,44 @@ public class MateDeliveryDTO extends BaseEntity {
      * 已完成个数
      */
     private String completedQuantity;
+
+    /**
+     * 项目类别
+     */
+    private String deliverySort;
+
+    /**
+     * 服务客户id
+     */
+    private String serviceCustomerId;
+
+    /**
+     * 客户经理
+     */
+    private String customerManager;
+
+    /**
+     * 项目经理
+     */
+    private String projectManager;
+
+    /**
+     * 产品经理
+     */
+    private String productManager;
+
+    /**
+     * 后端开发
+     */
+    private String backDeveloper;
+
+    /**
+     * 前端开发
+     */
+    private String frontDeveloper;
+
+    /**
+     * 测试
+     */
+    private String tester;
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/MateDeliverySummaryDTO.java

@@ -0,0 +1,40 @@
+package com.wx.blink.backend.domain.dto;
+
+import com.wx.blink.base.common.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class MateDeliverySummaryDTO extends BaseEntity {
+
+    /**
+     * 项目类型
+     */
+    private String deliveryTypeName;
+
+//    private String deliveryType;
+
+    /**
+     * 项目共计
+     */
+    private Integer deliverySum;
+
+    /**
+     * 已完成项目
+     */
+    private Long completedQuantity;
+
+    /**
+     * 未开始项目
+     */
+    private Long unstartedQuantity;
+
+    /**
+     * 进行中项目
+     */
+    private Long workQuantity;
+
+    /**
+     * 暂停项目
+     */
+    private Long suspendCount;
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/qry/MateDeliveryQry.java

@@ -33,6 +33,11 @@ public class MateDeliveryQry extends PageParam {
      */
     private String customerName;
 
+    /**
+     * 项目类型
+     */
+    private String deliveryType;
+
     /**
      * 项目id 涉及权限
      */

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/MateDeliveryServiceImpl.java

@@ -1,14 +1,17 @@
 package com.wx.blink.backend.manager;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wx.blink.backend.constant.DeliveryTaskStageEnums;
 import com.wx.blink.backend.domain.dataobject.MateDeliveryContactDO;
 import com.wx.blink.backend.domain.dataobject.MateDeliveryDO;
 import com.wx.blink.backend.domain.dataobject.MateDeliveryFileDO;
 import com.wx.blink.backend.domain.dto.MateDeliveryContactDTO;
 import com.wx.blink.backend.domain.dto.MateDeliveryDTO;
 import com.wx.blink.backend.domain.dto.MateDeliveryFileDTO;
+import com.wx.blink.backend.domain.dto.MateDeliverySummaryDTO;
 import com.wx.blink.backend.domain.qry.MateDeliveryContactQry;
 import com.wx.blink.backend.domain.qry.MateDeliveryFileQry;
 import com.wx.blink.backend.domain.qry.MateDeliveryQry;
@@ -18,6 +21,7 @@ import com.wx.blink.backend.service.IMateDeliveryService;
 import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.RequestUser;
 import com.wx.blink.base.common.domain.ResponseDTO;
+import com.wx.blink.base.common.enumeration.BaseEnum;
 import com.wx.blink.base.common.util.BlinkEntityUtil;
 import com.wx.blink.base.common.util.BlinkEnumUtil;
 import com.wx.blink.base.common.util.BlinkPageUtil;
@@ -29,13 +33,13 @@ import com.wx.blink.base.module.support.employee.qry.EmployeeQry;
 import com.wx.blink.base.module.support.employee.repository.EmployeeRepository;
 import com.wx.blink.base.module.support.serialnumber.constant.SerialNumberIdEnum;
 import com.wx.blink.base.module.support.serialnumber.service.SerialNumberService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * @author gufj
@@ -180,4 +184,36 @@ public class MateDeliveryServiceImpl extends ServiceImpl<MateDeliveryRepository,
         map.put("暂停项目", summaryList.stream().filter(item -> item.getDeliveryStatus().equals("04")).count());
         return ResponseDTO.ok(pageResult, map);
     }
+
+    @Override
+    public ResponseDTO<List<MateDeliverySummaryDTO>> mateDeliverySummary(MateDeliveryQry qry) {
+        List<MateDeliveryDTO> summaryList = mateDeliveryRepository.mateDeliveryQueryPage(null, qry);
+        //TODO：区分外包与自研，项目类型定义
+        //区分自研与外包项目，并对项目进行数据统计汇总
+        List<MateDeliveryDTO> outSourceList = summaryList.stream().filter(item -> item.getDeliveryType().equals("外包")).collect(Collectors.toList());
+        List<MateDeliveryDTO> selfDevList = summaryList.stream().filter(item -> item.getDeliveryType().equals("自研")).collect(Collectors.toList());
+        List<MateDeliverySummaryDTO> deliverySummaryList = new ArrayList<>();
+        MateDeliverySummaryDTO outSourceSummary = new MateDeliverySummaryDTO();
+        MateDeliverySummaryDTO selfDevSummary = new MateDeliverySummaryDTO();
+        outSourceSummary.setDeliveryTypeName("外包项目");
+        selfDevSummary.setDeliveryTypeName("自研项目");
+        outSourceSummary.setDeliverySum(outSourceList.size());
+        outSourceSummary.setUnstartedQuantity(outSourceList.stream().filter(item -> item.getDeliveryStatus().equals("01")).count());
+        outSourceSummary.setWorkQuantity(outSourceList.stream().filter(item -> item.getDeliveryStatus().equals("02")).count());
+        outSourceSummary.setCompletedQuantity(outSourceList.stream().filter(item -> item.getDeliveryStatus().equals("03")).count());
+        outSourceSummary.setSuspendCount(outSourceList.stream().filter(item -> item.getDeliveryStatus().equals("04")).count());
+        selfDevSummary.setDeliverySum(selfDevList.size());
+        selfDevSummary.setUnstartedQuantity(selfDevList.stream().filter(item -> item.getDeliveryStatus().equals("01")).count());
+        selfDevSummary.setWorkQuantity(selfDevList.stream().filter(item -> item.getDeliveryStatus().equals("02")).count());
+        selfDevSummary.setCompletedQuantity(selfDevList.stream().filter(item -> item.getDeliveryStatus().equals("03")).count());
+        selfDevSummary.setSuspendCount(selfDevList.stream().filter(item -> item.getDeliveryStatus().equals("04")).count());
+
+        LinkedHashMap<String, Object> map = new LinkedHashMap<>();
+        map.put("项目共计", summaryList.size());
+        map.put("未开始项目", summaryList.stream().filter(item -> item.getDeliveryStatus().equals("01")).count());
+        map.put("进行中项目", summaryList.stream().filter(item -> item.getDeliveryStatus().equals("02")).count());
+        map.put("已完成项目", summaryList.stream().filter(item -> item.getDeliveryStatus().equals("03")).count());
+        map.put("暂停项目", summaryList.stream().filter(item -> item.getDeliveryStatus().equals("04")).count());
+        return ResponseDTO.ok(deliverySummaryList, map);
+    }
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/MateDeliveryTaskServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wx.blink.backend.constant.DeliveryTaskStageEnums;
+import com.wx.blink.backend.domain.dataobject.BlinkDeliveryTaskDefectDO;
 import com.wx.blink.backend.domain.dataobject.MateDeliveryDO;
 import com.wx.blink.backend.domain.dataobject.MateDeliveryTaskDO;
 import com.wx.blink.backend.domain.dataobject.MateDeliveryTaskPositionsDO;
@@ -636,7 +637,7 @@ public class MateDeliveryTaskServiceImpl extends ServiceImpl<MateDeliveryTaskRep
     }
 
     @Override
-    public PageResult<MateDeliveryTaskV1DTO> mateDeliveryTaskV1QueryPage(MateDeliveryTaskQry qry) {
+    public ResponseDTO<PageResult<MateDeliveryTaskV1DTO>> mateDeliveryTaskV1QueryPage(MateDeliveryTaskQry qry) {
         Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
         //查询该项目下的所有任务项
         List<MateDeliveryTaskV1DTO> taskV1List = baseMapper.queryDeliveryTaskV1List(page, qry);
@@ -764,7 +765,17 @@ public class MateDeliveryTaskServiceImpl extends ServiceImpl<MateDeliveryTaskRep
             }
         }
         PageResult<MateDeliveryTaskV1DTO> pageResult = BlinkPageUtil.convert2PageResult(page, taskV1List);
-        return pageResult;
+        LinkedHashMap<String, Object> map = new LinkedHashMap<>();
+
+        List<MateDeliveryTaskV1DTO> summaryV1List = baseMapper.queryDeliveryTaskV1List(null, qry);
+        BigDecimal planDays = summaryV1List.stream().map(MateDeliveryTaskV1DTO::getPlanDays).filter(Objects::nonNull).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal actualDays = summaryV1List.stream().map(MateDeliveryTaskV1DTO::getActualDays).filter(Objects::nonNull).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        map.put("任务总数", summaryV1List.size());
+        map.put("预计人天", planDays);
+        map.put("累计发生人天", actualDays);
+        map.put("超预计人天数", actualDays.subtract(planDays).max(BigDecimal.ZERO));
+        map.put("超期任务数", summaryV1List.stream().filter(item -> item.getTaskStatusTag().get(0).contains("超期")).count());
+        return ResponseDTO.ok(pageResult,map);
     }
 
     @Override
@@ -789,7 +800,7 @@ public class MateDeliveryTaskServiceImpl extends ServiceImpl<MateDeliveryTaskRep
     }
 
     @Override
-    public PageResult<MateDeliveryTaskV1DTO> mateDeliveryTaskClientV1QueryPage(MateDeliveryTaskQry qry) {
+    public ResponseDTO<PageResult<MateDeliveryTaskV1DTO>> mateDeliveryTaskClientV1QueryPage(MateDeliveryTaskQry qry) {
         Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
         //查询该项目下的员工的所有任务
         RequestUser employee = BlinkRequestUtil.getRequestUser();
@@ -865,7 +876,17 @@ public class MateDeliveryTaskServiceImpl extends ServiceImpl<MateDeliveryTaskRep
             }
         }
         PageResult<MateDeliveryTaskV1DTO> pageResult = BlinkPageUtil.convert2PageResult(page, taskV1List);
-        return pageResult;
+        LinkedHashMap<String, Object> map = new LinkedHashMap<>();
+
+        List<MateDeliveryTaskV1DTO> summaryV1List = baseMapper.queryDeliveryTaskV1List(null, qry);
+        BigDecimal planDays = summaryV1List.stream().map(MateDeliveryTaskV1DTO::getPlanDays).filter(Objects::nonNull).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal actualDays = summaryV1List.stream().map(MateDeliveryTaskV1DTO::getActualDays).filter(Objects::nonNull).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        map.put("任务总数", summaryV1List.size());
+        map.put("预计人天", planDays);
+        map.put("累计发生人天", actualDays);
+        map.put("超预计人天数", actualDays.subtract(planDays).max(BigDecimal.ZERO));
+        map.put("超期任务数", summaryV1List.stream().filter(item -> item.getTaskStatusTag().get(0).contains("超期")).count());
+        return ResponseDTO.ok(pageResult,map);
     }
 
     @Override
@@ -995,6 +1016,16 @@ public class MateDeliveryTaskServiceImpl extends ServiceImpl<MateDeliveryTaskRep
             this.updateById(taskDO);
         }
     }
+
+    @Override
+    public ResponseDTO<String> mateDeliveryTaskDelete(Long id) {
+        MateDeliveryTaskDO taskDO = new MateDeliveryTaskDO();
+        taskDO.setId(id);
+        BlinkEntityUtil.setUpdatedInfo(taskDO);
+        baseMapper.mateDeliveryTaskDeleteById(taskDO);
+        return ResponseDTO.ok();
+    }
+
     public static BigDecimal calculateOverallProgress(List<MateDeliveryTaskPositionsPermissionDTO> list) {
         BigDecimal totalWeightedProgress = BigDecimal.ZERO; // 总加权进度
         BigDecimal totalPlanDays = BigDecimal.ZERO; // 总预计人天数

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/MateDeliveryTaskRepository.java

@@ -292,4 +292,11 @@ public interface MateDeliveryTaskRepository extends BaseMapper<MateDeliveryTaskD
      * @return
      */
     List<MateDeliveryTaskSettlementSidelineDTO> queryDeliveryTaskSettlementSidelineList();
+
+    /**
+     * 删除任务
+     * @param taskDO
+     * @return
+     */
+    boolean mateDeliveryTaskDeleteById(MateDeliveryTaskDO taskDO);
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IMateDeliveryService.java

@@ -5,6 +5,7 @@ import com.wx.blink.backend.domain.dataobject.MateDeliveryDO;
 import com.wx.blink.backend.domain.dto.MateDeliveryContactDTO;
 import com.wx.blink.backend.domain.dto.MateDeliveryDTO;
 import com.wx.blink.backend.domain.dto.MateDeliveryFileDTO;
+import com.wx.blink.backend.domain.dto.MateDeliverySummaryDTO;
 import com.wx.blink.backend.domain.qry.MateDeliveryContactQry;
 import com.wx.blink.backend.domain.qry.MateDeliveryFileQry;
 import com.wx.blink.backend.domain.qry.MateDeliveryQry;
@@ -85,4 +86,11 @@ public interface IMateDeliveryService extends IService<MateDeliveryDO> {
      * @return
      */
     ResponseDTO<PageResult<MateDeliveryDTO>> mateDeliveryClientQueryPage(MateDeliveryQry qry);
+
+    /**
+     * 项目信息汇总
+     * @param qry
+     * @return
+     */
+    ResponseDTO<List<MateDeliverySummaryDTO>> mateDeliverySummary(MateDeliveryQry qry);
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IMateDeliveryTaskService.java

@@ -154,7 +154,7 @@ public interface IMateDeliveryTaskService extends IService<MateDeliveryTaskDO> {
      * @param qry
      * @return
      */
-    PageResult<MateDeliveryTaskV1DTO> mateDeliveryTaskV1QueryPage(MateDeliveryTaskQry qry);
+    ResponseDTO<PageResult<MateDeliveryTaskV1DTO>> mateDeliveryTaskV1QueryPage(MateDeliveryTaskQry qry);
 
 
     /**
@@ -172,7 +172,7 @@ public interface IMateDeliveryTaskService extends IService<MateDeliveryTaskDO> {
      * @param qry
      * @return
      */
-    PageResult<MateDeliveryTaskV1DTO> mateDeliveryTaskClientV1QueryPage(MateDeliveryTaskQry qry);
+    ResponseDTO<PageResult<MateDeliveryTaskV1DTO>> mateDeliveryTaskClientV1QueryPage(MateDeliveryTaskQry qry);
 
 
     /**
@@ -233,4 +233,11 @@ public interface IMateDeliveryTaskService extends IService<MateDeliveryTaskDO> {
      * @param taskId
      */
     void mateDeliverySubTaskChangeByDayReport(Long taskId);
+
+    /**
+     * 删除任务
+     * @param id
+     * @return
+     */
+    ResponseDTO<String> mateDeliveryTaskDelete(Long id);
 }

bound-link-api/blink-backend/src/main/resources/mapper/MateDeliveryRepositoryMapper.xml

@@ -38,6 +38,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="query.deliveryType != null  and query.deliveryType != ''">
+            and delivery_type in
+            <foreach collection="query.deliveryType.split(',')" item="item" open="(" separator="," close=")" index="index">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY t1.id
         order by COUNT(t2.id) desc,t1.delivery_name
     </select>

bound-link-api/blink-backend/src/main/resources/mapper/MateDeliveryTaskRepositoryMapper.xml

@@ -409,6 +409,10 @@
         where id = #{taskId}
     </update>
 
+    <update id="mateDeliveryTaskDeleteById">
+        update meta_delivery_task set deleted_flag = 1,update_user_id=#{updateUserId},update_time=#{updateTime} where id = #{id}
+    </update>
+
     <select id="querySingleDeliverySettlement"
             resultType="com.wx.blink.backend.domain.dto.MateDeliveryTaskNoticeBoardPart2DTO">
         select SUM(report_days * price_per_day * price_discount_rate) AS plannedProjectSettlement,