Browse Source

项目进度详情开发

anderx 1 year ago
parent
commit
ec955d0852

+ 1 - 1
src/main/java/com/goafanti/common/dao/TaskDetailsMapper.java

@@ -81,6 +81,6 @@ public interface TaskDetailsMapper {
      */
     int deleteById(Integer id);
 
-    TaskDetails queryByTid(Integer id);
+    TaskDetails selectByTid(Integer id);
 }
 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml

@@ -1116,7 +1116,7 @@
         where id = #{id}
     </delete>
 
-    <select id="queryByTid" resultMap="TaskDetailsMap">
+    <select id="selectByTid" resultMap="TaskDetailsMap">
         select
         <include refid="TaskDetailsAllSql"/>
         from task_details

+ 4 - 4
src/main/java/com/goafanti/techproject/bo/TaskDetailsBo.java

@@ -1,9 +1,9 @@
 package com.goafanti.techproject.bo;
 
 import com.goafanti.common.model.TaskDetails;
-import com.goafanti.order.bo.TOrderTaskBo;
 
 import java.util.List;
+import java.util.Map;
 
 public class TaskDetailsBo extends TaskDetails {
     private String orderNo;
@@ -17,13 +17,13 @@ public class TaskDetailsBo extends TaskDetails {
      */
     private String memberLvl;
 
-    List<TOrderTaskBo> taskList;
+    List<Map<String,Object >> taskList;
 
-    public List<TOrderTaskBo> getTaskList() {
+    public List<Map<String, Object>> getTaskList() {
         return taskList;
     }
 
-    public void setTaskList(List<TOrderTaskBo> taskList) {
+    public void setTaskList(List<Map<String, Object>> taskList) {
         this.taskList = taskList;
     }
 

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

@@ -54,19 +54,35 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         TOrderNew tOrderNew = tOrderNewMapper.selectByTid(id);
         TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
         List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
-        TaskDetails taskDetails=new TaskDetails();
+        List<Map<String,Object >> list=new ArrayList<>();
+        TaskDetails taskDetails=taskDetailsMapper.selectByTid(id);
         //如果是会员
-        if (mid.getProjectType()==1){
-            List<TOrderTaskBo> list =new ArrayList<>();
-            for (TOrderTaskBo e : tOrderTaskBos) {
-                //
-                if (e.getcSort()==6){
-                     taskDetails = queryByTid(id);
-                    if (taskDetails!=null) break;
+        TOrderTaskBo thisTask = null;
+        for (TOrderTaskBo e : tOrderTaskBos) {
+            if (e.getId().equals(id)){
+                thisTask=e;
+                break;
+            }
+        }
+        String serviceYear = thisTask.getServiceYear();
+        if (serviceYear.contains("(赠)")){
+            serviceYear=serviceYear.replace("(赠)", "");
+        }
+        for (TOrderTaskBo e : tOrderTaskBos) {
+            if (e.getServiceYear().equals(serviceYear)){
+                Map<String,Object> map=new HashMap<>();
+                map.put("serviceYear", e.getServiceYear());
+                map.put("taskName", e.getCommodityName());
+                map.put("id",e.getId());
+                //如果没有项目进度,查询同年份的项目进度
+                if (taskDetails==null&&!e.getId().equals(id)&&e.getcSort()==6){
+                    taskDetails=taskDetailsMapper.selectByTid(e.getId());
                 }
+                list.add(map);
             }
         }
 
+
         TaskDetailsBo res = new TaskDetailsBo();
         BeanUtils.copyProperties(taskDetails, res);
         BigDecimal totalAmount = tOrderNew.getTotalAmount();
@@ -82,13 +98,12 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         res.setContractNo(tOrderNew.getContractNo());
         res.setMemberStatus(mid.getProjectType());
         res.setMemberLvl(lvl);
-
-        res.setTaskList(tOrderTaskBos);
+        res.setTaskList(list);
         return res;
     }
 
     private TaskDetails queryByTid(Integer id) {
-        return taskDetailsMapper.queryByTid(id);
+        return taskDetailsMapper.selectByTid(id);
     }
 
     /**