Просмотр исходного кода

新增项目特色工作删除

anderx 1 год назад
Родитель
Сommit
350d494fe3

+ 10 - 0
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -137,6 +137,16 @@ public class TaskDetailsController extends BaseController {
         return new Result<>().data(this.taskDetailsService.updateFeature(in));
     }
 
+    /**
+     * 删除项目特色工作
+     *
+     * @return 编辑结果
+     */
+    @PostMapping("/deleteTaskFeature")
+    public Result deleteTaskFeature(Integer id) {
+        return new Result<>().data(this.taskDetailsService.deleteTaskFeature(id));
+    }
+
 
 
     /**

+ 2 - 0
src/main/java/com/goafanti/techproject/service/TaskDetailsService.java

@@ -70,4 +70,6 @@ public interface TaskDetailsService {
     Object logList(Integer id);
 
     Object logDetails(Integer id);
+
+    Object deleteTaskFeature(Integer id);
 }

+ 11 - 7
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -69,8 +69,9 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         List<Map<String,Object >> list=new ArrayList<>();
         TaskDetails taskDetails=null;
         //获取项目服务年份算出平均值
-        List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
+        List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), null);
         List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 1).collect(Collectors.toList());
+        List<TOrderTaskBo> collect2 = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
         int yearSum=1;
         for (TOrderTaskBo e : collect) {
             if (e.getYearSum()>yearSum){
@@ -83,7 +84,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
 
             //如果是会员
             TOrderTaskBo thisTask = null;
-            for (TOrderTaskBo e : tOrderTaskBos) {
+            for (TOrderTaskBo e : collect2) {
                 if (e.getId().equals(id)){
                     thisTask=e;
                     break;
@@ -94,7 +95,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
                 serviceYear=serviceYear.replace("(赠)", "");
             }
             Integer tid=null;
-            for (TOrderTaskBo e : tOrderTaskBos) {
+            for (TOrderTaskBo e : collect2) {
                 e.getServiceLife();
                 if (e.getServiceYear().equals(serviceYear)){
                     Map<String,Object> map=new HashMap<>();
@@ -142,7 +143,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             BeanUtils.copyProperties(taskDetails, res);
             //如果是会员
             TOrderTaskBo thisTask = null;
-            for (TOrderTaskBo e : tOrderTaskBos) {
+            for (TOrderTaskBo e : collect2) {
                 if (e.getId().equals(id)){
                     thisTask=e;
                     break;
@@ -153,7 +154,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
                 serviceYear=serviceYear.replace("(赠)", "");
             }
             Integer tid=null;
-            for (TOrderTaskBo e : tOrderTaskBos) {
+            for (TOrderTaskBo e : collect2) {
                 if (e.getServiceYear().equals(serviceYear)){
                     Map<String,Object> map=new HashMap<>();
                     map.put("serviceYear", e.getServiceYear());
@@ -166,8 +167,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             if (taskDetails !=null){
                 BeanUtils.copyProperties(taskDetails, res);
             }
-
-
             res.setUserName(mid.getBuyerName());
             res.setOrderNo(tOrderNew.getOrderNo());
             res.setContractNo(tOrderNew.getContractNo());
@@ -442,5 +441,10 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         return res;
     }
 
+    @Override
+    public Object deleteTaskFeature(Integer id) {
+        return taskFeatureMapper.deleteById(id);
+    }
+
 
 }