Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/fnc/dao/IncomeTaskRelationshipMapper.java

@@ -10,4 +10,7 @@ import java.util.List;
 @Mapper
 public interface IncomeTaskRelationshipMapper extends BaseMapper<IncomeTaskRelationshipEntity> {
     List<String> getByTaskId(String taskId);
+
+    void deleteByIncomeId(String id);
+
 }

src/main/java/com/ydtech/modules/fnc/service/IncomeTaskRelationshipService.java

@@ -10,4 +10,6 @@ public interface IncomeTaskRelationshipService extends IService<IncomeTaskRelati
 
     List<String> getByTaskId(String taskId);
 
+    void deleteByIncomeId(String id);
+
 }

src/main/java/com/ydtech/modules/fnc/service/impl/IncomeTaskRelationshipServiceImpl.java

@@ -35,4 +35,9 @@ public class IncomeTaskRelationshipServiceImpl extends ServiceImpl<IncomeTaskRel
 
         return baseMapper.getByTaskId(taskId);
     }
+
+    @Override
+    public void deleteByIncomeId(String id) {
+        baseMapper.deleteByIncomeId(id);
+    }
 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1970,6 +1970,7 @@ handlingProportion,
         settlementDocumentaryFeesVo.setInvoicingMethod(insPlyIncomeVo.getInvoicingMethod());  //开票方式
         settlementDocumentaryFeesVo.setTaxPoints(insPlyIncomeVo.getTaxPoints());  //税点
         settlementDocumentaryFeesVo.setExpendAmount(insPlyIncomeVo.getInvoicCommissionFeevalue().multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100)))));
+        settlementDocumentaryFeesVo.setTaskId(insPlyIncomeVo.getTaskId());
         settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());   //进账金额
         settlementDocumentaryFeesVo.setTotalAmount(insPlyIncomeVo.getInvoicCommissionFeevalue());
         settlementDocumentaryFeesVo.setHandlingFeesStatus("0");
@@ -2369,7 +2370,12 @@ handlingProportion,
             sumUnSettledAmount = sumUnSettledAmount.add(item.getUnSettledAmount());
             sumAllInvoicCommissionFeevalue = sumAllInvoicCommissionFeevalue.add(item.getAllInvoicCommissionFeevalue());
         }
-
+        if(sumCommissionFeevalue.compareTo(sumReadyCommissionFeevalue) <0){
+            sumAllInvoicCommissionFeevalue=sumCommissionFeevalue;
+            sumReadyCommissionFeevalue=sumCommissionFeevalue;
+            sumNoInvoicCommissionFeevalue =sumCommissionFeevalue.subtract(sumAllInvoicCommissionFeevalue);
+            sumUnSettledAmount=sumAllInvoicCommissionFeevalue.subtract(sumReadyCommissionFeevalue);
+        }
         insPlyIncome.setCommissionFeevalue(sumCommissionFeevalue);
         insPlyIncome.setInvoicCommissionFeevalue(sumInvoicCommissionFeevalue);
         insPlyIncome.setReadyCommissionFeevalue(sumReadyCommissionFeevalue);

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesServiceImpl.java

@@ -15,6 +15,7 @@ import com.ydtech.modules.fnc.dao.SettlementDocumentaryFeesMapper;
 import com.ydtech.modules.fnc.entity.InsPlyIncome;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryFeesEntity;
 import com.ydtech.modules.fnc.entity.SettlementDocumentaryLogEntity;
+import com.ydtech.modules.fnc.service.IncomeTaskRelationshipService;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryFeesService;
 import com.ydtech.modules.fnc.service.SettlementDocumentaryLogService;
 import com.ydtech.modules.fnc.vo.InsPlyIncomeVo;
@@ -40,6 +41,8 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
     private SettlementDocumentaryLogService settlementDocumentaryLogService;
     @Autowired
     private InsPlyIncomeMapper insPlyIncomeMapper;
+    @Autowired
+    private IncomeTaskRelationshipService  incomeTaskRelationshipService;
 
 
     @Override
@@ -185,6 +188,7 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
      * @param settlementDocumentaryFeesVo
      */
     @Override
+    @Transactional
     public HttpResult<Object> voidInvoicing(SettlementDocumentaryFeesVo settlementDocumentaryFeesVo) {
         SettlementDocumentaryFeesEntity oldSettlementDocumentaryFeesEntity = baseMapper.selectById(settlementDocumentaryFeesVo.getId());
 
@@ -210,9 +214,12 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
             wrapper.set(InsPlyIncome::getSettlementUserId, null);
             wrapper.set(InsPlyIncome::getSettlementTime, null);
             insPlyIncomeMapper.update(item, wrapper);
+
+            incomeTaskRelationshipService.deleteByIncomeId(item.getId());  //作废后删除关系任务表
         }
 
 
+
         SettlementDocumentaryFeesEntity settlementDocumentaryFeesEntity = new SettlementDocumentaryFeesEntity();
         BeanUtils.copyProperties(settlementDocumentaryFeesVo, settlementDocumentaryFeesEntity);
         settlementDocumentaryFeesEntity.setSettlementStatus("3");  // 3  为作废

src/main/java/com/ydtech/modules/order/controller/ExcelExportController.java

@@ -33,7 +33,7 @@ public class ExcelExportController extends BaseController {
 
     private String EXCEL_PATH = "excel//";
 
-    private String UPLOAD_PATH = "upload//excel//";
+    private String UPLOAD_PATH = "/upload//excel//";
 
 
     @PostMapping("/carBusinessDetailExcelExport")

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementUndwrtRulesNewHistoryServiceImpl.java

@@ -61,8 +61,8 @@ public class PtlAgreementUndwrtRulesNewHistoryServiceImpl extends ServiceImpl<Pt
                 .eq("agreement_id", agreementUndwrtRulesQueryVo.getAgreementId())
                 .eq(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperator()), "modifier", agreementUndwrtRulesQueryVo.getOperator())
                 .eq(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorType()), "operator_type", agreementUndwrtRulesQueryVo.getOperatorType())
-                .le(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorStartTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorStartTime())
-                .ge(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorEndTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorEndTime());
+                .ge(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorStartTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorStartTime())
+                .le(!ObjectUtils.isEmpty(agreementUndwrtRulesQueryVo.getOperatorEndTime()), "DATE(`operator_time`)", agreementUndwrtRulesQueryVo.getOperatorEndTime());
         Page selectPage = baseMapper.selectPage(page, wrapper);
         List<PtlAgreementUndwrtRulesNewHistory> records = selectPage.getRecords();
 
@@ -119,6 +119,20 @@ public class PtlAgreementUndwrtRulesNewHistoryServiceImpl extends ServiceImpl<Pt
 
         // 查询费用属性模型
         List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = ptlAgreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
+        agreementUndwrtRulesAttrLinkHistorie.forEach(item->{
+            undwrtRulesAttrList.stream().filter(x -> x.getAttrCode().equals(item.getAttrCode())).forEach(x->{
+                if(x.getAttrType().equals("checkbox") || x.getAttrType().equals("select")) {
+                    if(item.getMin() != null) {
+                        x.setMinArray(item.getMin().split(","));
+                    }
+                }else {
+                    x.setMin(item.getMin());
+                    x.setMax(item.getMax());
+                    x.setOperator(item.getOperator());
+                }
+            });
+        });
+
 
         // 设置费用属性因子列表
         agreementUndwrtRulesNewHistory.setCostsAttrLinkList(undwrtRulesAttrList);

src/main/java/com/ydtech/modules/task/constants/TaskFirst.java

@@ -0,0 +1,29 @@
+package com.ydtech.modules.task.constants;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 任务优先级
+ */
+@Getter
+@AllArgsConstructor
+public enum TaskFirst {
+
+    FIRST_0(1, "低"),
+    FIRST_1(2, "中"),
+    FIRST_2(3, "高");
+
+    private int code;
+    private String desc;
+
+    public static TaskFirst getByCode(int code){
+        for (TaskFirst taskFirst : TaskFirst.values()) {
+            if (taskFirst.getCode() == code) {
+                return taskFirst;
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/com/ydtech/modules/task/constants/TaskStatus.java

@@ -0,0 +1,32 @@
+package com.ydtech.modules.task.constants;
+
+import lombok.Data;
+import lombok.Getter;
+
+/**
+ * 任务状态
+ */
+@Getter
+public enum TaskStatus {
+
+    STATUS_0(0, "未指派"),
+    STATUS_1(1, "未开始"),
+    STATUS_2(2, "已开始"),
+    STATUS_3(3, "已完成");
+
+    private final int code;
+    private final String desc;
+
+    TaskStatus(int code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

src/main/java/com/ydtech/modules/task/controller/TaskController.java

@@ -0,0 +1,11 @@
+package com.ydtech.modules.task.controller;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "任务controller")
+@RestController
+@RequestMapping("/task/task")
+public class TaskController {
+}

src/main/java/com/ydtech/modules/task/dao/TaskFileMapper.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.task.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.order.entity.BatchOrder;
+import com.ydtech.modules.task.entity.po.TaskFile;
+
+/**
+ * @author Administrator
+ * @description 针对表【task_file】的数据库操作Mapper
+ * @createDate 2024-6-5 16:19:14
+ * @Entity generator.domain.InsAccidentalDriving
+ */
+public interface TaskFileMapper extends BaseMapper<TaskFile> {
+
+}

src/main/java/com/ydtech/modules/task/dao/TaskPersonChargeMapper.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.task.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.task.entity.po.TaskFile;
+import com.ydtech.modules.task.entity.po.TaskPersonCharge;
+
+/**
+ * @author Administrator
+ * @description 针对表【task_person_charge】的数据库操作Mapper
+ * @createDate 2024-6-5 16:19:14
+ * @Entity generator.domain.TaskPersonCharge
+ */
+public interface TaskPersonChargeMapper extends BaseMapper<TaskPersonCharge> {
+
+}

src/main/java/com/ydtech/modules/task/dao/TaskProjectMapper.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.task.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.task.entity.po.TaskFile;
+import com.ydtech.modules.task.entity.po.TaskProject;
+
+/**
+ * @author Administrator
+ * @description 针对表【task_project】的数据库操作Mapper
+ * @createDate 2024-6-5 16:19:14
+ * @Entity generator.domain.InsAccidentalDriving
+ */
+public interface TaskProjectMapper extends BaseMapper<TaskProject> {
+
+}

src/main/java/com/ydtech/modules/task/dao/TaskTaskMapper.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.task.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.task.entity.po.TaskProject;
+import com.ydtech.modules.task.entity.po.TaskTask;
+
+/**
+ * @author Administrator
+ * @description 针对表【task_task】的数据库操作Mapper
+ * @createDate 2024-6-5 16:19:14
+ * @Entity generator.domain.InsAccidentalDriving
+ */
+public interface TaskTaskMapper extends BaseMapper<TaskTask> {
+
+}

src/main/java/com/ydtech/modules/task/dao/TaskTrajectoryMapper.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.task.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.task.entity.po.TaskTask;
+import com.ydtech.modules.task.entity.po.TaskTrajectory;
+
+/**
+ * @author Administrator
+ * @description 针对表【task_task】的数据库操作Mapper
+ * @createDate 2024-6-5 16:19:14
+ * @Entity generator.domain.InsAccidentalDriving
+ */
+public interface TaskTrajectoryMapper extends BaseMapper<TaskTrajectory> {
+
+}

src/main/java/com/ydtech/modules/task/entity/po/TaskFile.java

@@ -0,0 +1,37 @@
+package com.ydtech.modules.task.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@TableName(value = "task_file")
+@Data
+@ApiModel("任务上传文件")
+public class TaskFile {
+
+    @TableId(value = "id")
+    private String id;
+
+    @TableField(value = "task_id")
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    @TableField(value = "file_name")
+    @ApiModelProperty(value = "文件名称")
+    private String fileName;
+
+    @TableField(value = "file_type")
+    @ApiModelProperty(value = "文件类型")
+    private String fileType;
+
+    @TableField(value = "file_url")
+    @ApiModelProperty(value = "文件url地址")
+    private String fileUrl;
+
+    @TableField(value = "create_time")
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+}

src/main/java/com/ydtech/modules/task/entity/po/TaskPersonCharge.java

@@ -0,0 +1,27 @@
+package com.ydtech.modules.task.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@TableName(value = "task_person_charge")
+@Data
+@ApiModel("任务指派表")
+public class TaskPersonCharge {
+    @TableId(value = "id")
+    private String id;
+
+    @TableField(value = "task_id")
+    private String taskId;
+
+    @TableField(value = "person_charge_id")
+    private String personChargeId;
+
+    @TableField(value = "person_charge")
+    private String personCharge;
+
+    @TableField(value = "create_time")
+    private String createTime;
+}

src/main/java/com/ydtech/modules/task/entity/po/TaskProject.java

@@ -0,0 +1,37 @@
+package com.ydtech.modules.task.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@TableName(value = "task_project")
+@Data
+@ApiModel("任务项目")
+public class TaskProject {
+
+    @TableId(value = "id")
+    private String id;
+
+    @TableField(value = "project_type")
+    @ApiModelProperty("项目类型")
+    private String projectType;
+
+    @TableField(value = "project_name")
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    @TableField(value = "project_desc")
+    @ApiModelProperty("项目描述")
+    private String projectDesc;
+
+    @TableField(value = "project_status")
+    @ApiModelProperty("项目状态")
+    private Integer projectStatus;
+
+    @TableField(value = "create_time")
+    @ApiModelProperty("创建时间")
+    private String createTime;
+}

src/main/java/com/ydtech/modules/task/entity/po/TaskTask.java

@@ -0,0 +1,43 @@
+package com.ydtech.modules.task.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@TableName(value = "task_task")
+@Data
+@ApiModel("任务")
+public class TaskTask {
+
+    @TableId(value = "id")
+    private String id;
+
+    @TableField(value = "parentId")
+    private String parentId;
+
+    @TableField(value = "project_id")
+    private String projectId;
+
+    @TableField(value = "task_name")
+    private String taskName;
+
+    @TableField(value = "task_desc")
+    private String taskDesc;
+
+    @TableField(value = "task_start_time")
+    private String taskStartTime;
+
+    @TableField(value = "task_end_time")
+    private String taskEmdTo;
+
+    @TableField(value = "task_status")
+    private String taskStatus;
+
+    @TableField(value = "task_first")
+    private String taskFirst;
+
+    @TableField(value = "create_time")
+    private String createTime;
+}

src/main/java/com/ydtech/modules/task/entity/po/TaskTrajectory.java

@@ -0,0 +1,28 @@
+package com.ydtech.modules.task.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@TableName(value = "task_trajectory")
+@Data
+@ApiModel("任务轨迹表")
+public class TaskTrajectory {
+
+    @TableId(value = "id")
+    private String id;
+
+    @TableField(value = "taks_id")
+    private String taskId;
+
+    @TableField(value = "task_operator")
+    private String taskOperator;
+
+    @TableField(value = "task_status")
+    private Integer taskStatus;
+
+    @TableField(value = "create_time")
+    private String createTime;
+}

src/main/java/com/ydtech/modules/task/service/TaskFileService.java

@@ -0,0 +1,13 @@
+package com.ydtech.modules.task.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.task.entity.po.TaskFile;
+
+/**
+ * @author Administrator
+ * @description 针对表【TaskFile】的数据库操作Service
+ * @createDate 2023-01-31 15:44:29
+ */
+public interface TaskFileService extends IService<TaskFile> {
+
+}

src/main/java/com/ydtech/modules/task/service/TaskPersonChargeService.java

@@ -0,0 +1,7 @@
+package com.ydtech.modules.task.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.task.entity.po.TaskPersonCharge;
+
+public interface TaskPersonChargeService extends IService<TaskPersonCharge> {
+}

src/main/java/com/ydtech/modules/task/service/TaskProjectService.java

@@ -0,0 +1,4 @@
+package com.ydtech.modules.task.service;
+
+public interface TaskProjectService {
+}

src/main/java/com/ydtech/modules/task/service/TaskTaskService.java

@@ -0,0 +1,7 @@
+package com.ydtech.modules.task.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.task.entity.po.TaskTask;
+
+public interface TaskTaskService extends IService<TaskTask> {
+}

src/main/java/com/ydtech/modules/task/service/TaskTrajectoryService.java

@@ -0,0 +1,8 @@
+package com.ydtech.modules.task.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.task.entity.po.TaskTask;
+import com.ydtech.modules.task.entity.po.TaskTrajectory;
+
+public interface TaskTrajectoryService extends IService<TaskTrajectory> {
+}

src/main/java/com/ydtech/modules/task/service/impl/TaskFileServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ydtech.modules.task.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.task.dao.TaskFileMapper;
+import com.ydtech.modules.task.entity.po.TaskFile;
+import com.ydtech.modules.task.service.TaskFileService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Administrator
+ * @description 针对表【task_file】的数据库操作Service实现
+ * @createDate 2023-03-09 14:45:58
+ */
+@Service
+public class TaskFileServiceImpl extends ServiceImpl<TaskFileMapper, TaskFile>
+        implements TaskFileService {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/task/service/impl/TaskPersonChargeServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ydtech.modules.task.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.task.dao.TaskPersonChargeMapper;
+import com.ydtech.modules.task.entity.po.TaskPersonCharge;
+import com.ydtech.modules.task.service.TaskPersonChargeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Administrator
+ * @description 针对表【task_file】的数据库操作Service实现
+ * @createDate 2023-03-09 14:45:58
+ */
+@Service
+public class TaskPersonChargeServiceImpl extends ServiceImpl<TaskPersonChargeMapper, TaskPersonCharge>
+        implements TaskPersonChargeService {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/task/service/impl/TaskProjectServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ydtech.modules.task.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.task.dao.TaskProjectMapper;
+import com.ydtech.modules.task.entity.po.TaskProject;
+import com.ydtech.modules.task.service.TaskProjectService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Administrator
+ * @description 针对表【task_file】的数据库操作Service实现
+ * @createDate 2023-03-09 14:45:58
+ */
+@Service
+public class TaskProjectServiceImpl extends ServiceImpl<TaskProjectMapper, TaskProject>
+        implements TaskProjectService {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/task/service/impl/TaskTaskServiceImpl.java

@@ -0,0 +1,25 @@
+package com.ydtech.modules.task.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.task.dao.TaskFileMapper;
+import com.ydtech.modules.task.dao.TaskTaskMapper;
+import com.ydtech.modules.task.entity.po.TaskFile;
+import com.ydtech.modules.task.entity.po.TaskTask;
+import com.ydtech.modules.task.service.TaskFileService;
+import com.ydtech.modules.task.service.TaskTaskService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Administrator
+ * @description 针对表【task_file】的数据库操作Service实现
+ * @createDate 2023-03-09 14:45:58
+ */
+@Service
+public class TaskTaskServiceImpl extends ServiceImpl<TaskTaskMapper, TaskTask>
+        implements TaskTaskService {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/task/service/impl/TaskTrajectoryServiceImpl.java

@@ -0,0 +1,22 @@
+package com.ydtech.modules.task.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.task.dao.TaskTrajectoryMapper;
+import com.ydtech.modules.task.entity.po.TaskTrajectory;
+import com.ydtech.modules.task.service.TaskTrajectoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Administrator
+ * @description 针对表【task_file】的数据库操作Service实现
+ * @createDate 2023-03-09 14:45:58
+ */
+@Service
+public class TaskTrajectoryServiceImpl extends ServiceImpl<TaskTrajectoryMapper, TaskTrajectory>
+        implements TaskTrajectoryService {
+
+}
+
+
+
+

src/main/resources/mapper/modules/fnc/IncomeTaskRelationshipMapper.xml

@@ -23,7 +23,11 @@
                 </where>
     </select>
 
-
+    <delete id="deleteByIncomeId">
+        delete
+        from income_task_relationship a
+        where a.income_id = #{id}
+    </delete>