Quellcode durchsuchen

会员进度新增、详情修改

anderx vor 1 Jahr
Ursprung
Commit
00e9d74a94

+ 23 - 0
src/main/java/com/goafanti/techproject/bo/InputTaskDetailsBo.java

@@ -0,0 +1,23 @@
+package com.goafanti.techproject.bo;
+
+public class InputTaskDetailsBo {
+
+    private Integer pageSize;
+    private Integer pageNo;
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.model.TaskDetails;
 import com.goafanti.common.model.TaskDetailsLog;
 import com.goafanti.common.model.TaskFeature;
+import com.goafanti.techproject.bo.InputTaskDetailsBo;
 import com.goafanti.techproject.bo.InputTaskFeature;
 import com.goafanti.techproject.service.TaskDetailsService;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -122,6 +123,17 @@ public class TaskDetailsController extends BaseController {
     }
 
     /**
+     * 项目进度列表
+     *
+     * @param in 参数
+     * @return
+     */
+    @GetMapping("/detailsList")
+    public Result<TaskDetails> detailsList(InputTaskDetailsBo in) {
+        return new Result<>().data(this.taskDetailsService.detailsList(in));
+    }
+
+    /**
      * 导出数据
      *
      * @return

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

@@ -3,6 +3,7 @@ package com.goafanti.techproject.service;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.TaskDetails;
 import com.goafanti.common.model.TaskFeature;
+import com.goafanti.techproject.bo.InputTaskDetailsBo;
 import com.goafanti.techproject.bo.InputTaskFeature;
 import com.goafanti.techproject.bo.TaskDetailsBo;
 
@@ -79,4 +80,6 @@ public interface TaskDetailsService {
 
 
     Result export();
+
+    Object detailsList(InputTaskDetailsBo in);
 }

+ 20 - 8
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -10,6 +10,7 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.techproject.bo.InputTaskDetailsBo;
 import com.goafanti.techproject.bo.InputTaskFeature;
 import com.goafanti.techproject.bo.TaskDetailsBo;
 import com.goafanti.techproject.service.TaskDetailsService;
@@ -108,7 +109,6 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
                     }
                     if (taskDetails==null&&!e.getId().equals(id)&&e.getcSort()==6){
                         taskDetails=taskDetailsMapper.selectByTid(e.getId());
-                        tid=e.getId();
                     }
                     list.add(map);
                 }
@@ -130,13 +130,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             String lvl=getOrderLvl(totalAmount);
             res.setMemberLvl(lvl);
             res.setFeatureList(taskFeatureMapper.selectByTdId(id));
-            if (tid==null&&taskDetails!=null){
-                tid=taskDetails.getTid();
-                TOrderTask update =new TOrderTask();
-                update.setId(id);
-                update.setProgressTid(tid);
-                tOrderTaskMapper.update(update);
-            }
+
         }else {
             taskDetails=taskDetailsMapper.selectByTid(tOrderTask.getProgressTid());
             //如果是会员
@@ -177,6 +171,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         return null;
     }
 
+    @Override
+    public Object detailsList(InputTaskDetailsBo in) {
+        return null;
+    }
+
     private String getServiceYer(String serviceYear) {
         String serviceYear2=null;
         if (StringUtils.isEmpty(serviceYear)){
@@ -233,6 +232,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         //数据计算
         countTaskDetails(taskDetails);
         this.taskDetailsMapper.insert(taskDetails);
+        updateTask(taskDetails,tOrderNew.getOrderNo());
+
         //新增日志数据
         if (type==1){
             try {
@@ -244,6 +245,17 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         return taskDetails;
     }
 
+    private void updateTask(TaskDetails taskDetails, String orderNo) {
+        List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(orderNo, null);
+        List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
+        for (TOrderTaskBo tOrderTaskBo : collect) {
+                TOrderTask updatedTask = new TOrderTask();
+                updatedTask.setId(tOrderTaskBo.getId());
+                updatedTask.setProgressTid(taskDetails.getTid());
+                tOrderTaskMapper.update(updatedTask);
+        }
+    }
+
     /**
      *新增的时候特殊数据可以是单传输,修改的时候可以多传
      *