Browse Source

修改任务

guozj 3 months ago
parent
commit
5a29e0bd56

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

@@ -1,6 +1,8 @@
 package com.wx.blink.backend.controller;
 package com.wx.blink.backend.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.wx.blink.backend.domain.dataobject.BlinkDeliveryTaskDefectDO;
+import com.wx.blink.backend.domain.dataobject.MateDeliveryTaskDO;
 import com.wx.blink.backend.domain.dto.*;
 import com.wx.blink.backend.domain.dto.*;
 import com.wx.blink.backend.domain.qry.MateDeliveryTaskPermissionQry;
 import com.wx.blink.backend.domain.qry.MateDeliveryTaskPermissionQry;
 import com.wx.blink.backend.domain.qry.MateDeliveryTaskQry;
 import com.wx.blink.backend.domain.qry.MateDeliveryTaskQry;
@@ -74,6 +76,12 @@ public class MateDeliveryTaskController {
         return deliveryTaskService.mateDeliveryTaskClientV1QueryPage(qry);
         return deliveryTaskService.mateDeliveryTaskClientV1QueryPage(qry);
     }
     }
 
 
+    @Operation(summary = "修改任务")
+    @PostMapping("/supports/delivery/task/update")
+    public ResponseDTO<String> mateDeliveryTaskUpdate(@RequestBody @Valid MateDeliveryTaskDO taskDO) {
+        return deliveryTaskService.mateDeliveryTaskUpdate(taskDO);
+    }
+
     @Operation(summary = "项目任务删除")
     @Operation(summary = "项目任务删除")
     @GetMapping("/mate/delivery/task/delete/{id}")
     @GetMapping("/mate/delivery/task/delete/{id}")
     public ResponseDTO<String> mateDeliveryTaskDelete(@PathVariable Long id) {
     public ResponseDTO<String> mateDeliveryTaskDelete(@PathVariable Long id) {

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

@@ -171,4 +171,14 @@ public class MateDeliveryTaskDO extends BaseEntity {
      * 预计结束日期
      * 预计结束日期
      */
      */
     private Date planEndDate;
     private Date planEndDate;
+
+    /**
+     * 实际开始日期
+     */
+    private Date actualStartDate;
+
+    /**
+     * 实际结束日期
+     */
+    private Date actualEndDate;
 }
 }

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

@@ -1026,6 +1026,13 @@ public class MateDeliveryTaskServiceImpl extends ServiceImpl<MateDeliveryTaskRep
         return ResponseDTO.ok();
         return ResponseDTO.ok();
     }
     }
 
 
+    @Override
+    public ResponseDTO<String> mateDeliveryTaskUpdate(MateDeliveryTaskDO taskDO) {
+        BlinkEntityUtil.setUpdatedInfo(taskDO);
+        baseMapper.mateDeliveryTaskUpdate(taskDO);
+        return ResponseDTO.ok();
+    }
+
     public static BigDecimal calculateOverallProgress(List<MateDeliveryTaskPositionsPermissionDTO> list) {
     public static BigDecimal calculateOverallProgress(List<MateDeliveryTaskPositionsPermissionDTO> list) {
         BigDecimal totalWeightedProgress = BigDecimal.ZERO; // 总加权进度
         BigDecimal totalWeightedProgress = BigDecimal.ZERO; // 总加权进度
         BigDecimal totalPlanDays = BigDecimal.ZERO; // 总预计人天数
         BigDecimal totalPlanDays = BigDecimal.ZERO; // 总预计人天数

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

@@ -299,4 +299,11 @@ public interface MateDeliveryTaskRepository extends BaseMapper<MateDeliveryTaskD
      * @return
      * @return
      */
      */
     boolean mateDeliveryTaskDeleteById(MateDeliveryTaskDO taskDO);
     boolean mateDeliveryTaskDeleteById(MateDeliveryTaskDO taskDO);
+
+    /**
+     * 修改任务
+     * @param taskDO
+     * @return
+     */
+    boolean mateDeliveryTaskUpdate(MateDeliveryTaskDO taskDO);
 }
 }

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

@@ -240,4 +240,11 @@ public interface IMateDeliveryTaskService extends IService<MateDeliveryTaskDO> {
      * @return
      * @return
      */
      */
     ResponseDTO<String> mateDeliveryTaskDelete(Long id);
     ResponseDTO<String> mateDeliveryTaskDelete(Long id);
+
+    /**
+     * 修改任务
+     * @param taskDO
+     * @return
+     */
+    ResponseDTO<String> mateDeliveryTaskUpdate(MateDeliveryTaskDO taskDO);
 }
 }

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

@@ -413,6 +413,11 @@
         update meta_delivery_task set deleted_flag = 1,update_user_id=#{updateUserId},update_time=#{updateTime} where id = #{id}
         update meta_delivery_task set deleted_flag = 1,update_user_id=#{updateUserId},update_time=#{updateTime} where id = #{id}
     </update>
     </update>
 
 
+    <update id="mateDeliveryTaskUpdate">
+        update meta_delivery_task set task_name = #{taskName},task_label=#{taskLabel},task_grade=#{taskGrade},task_links=#{taskLinks},
+        task_remark=#{taskRemark},plan_days=#{planDays},update_user_id=#{updateUserId},update_time=#{updateTime} where id = #{id}
+    </update>
+
     <select id="querySingleDeliverySettlement"
     <select id="querySingleDeliverySettlement"
             resultType="com.wx.blink.backend.domain.dto.MateDeliveryTaskNoticeBoardPart2DTO">
             resultType="com.wx.blink.backend.domain.dto.MateDeliveryTaskNoticeBoardPart2DTO">
         select SUM(report_days * price_per_day * price_discount_rate) AS plannedProjectSettlement,
         select SUM(report_days * price_per_day * price_discount_rate) AS plannedProjectSettlement,