Browse Source

咨询师列表修改

anderx 1 year ago
parent
commit
471d5a3fd9

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

@@ -1414,7 +1414,7 @@
       <foreach collection="type" item="item" separator="," open="(" close=")">
         #{item}
       </foreach>
-      group by order_no) toa2 on e.order_no=toa.order_no
+      group by order_no) toa2 on e.order_no=toa2.order_no
     </if>
     where e.delete_sign in(0,2,3)
     <if test="orderNo != null">

+ 14 - 46
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -1,47 +1,12 @@
 package com.goafanti.techproject.service.impl;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.ContractMapper;
-import com.goafanti.common.dao.ContractTaskLogMapper;
-import com.goafanti.common.dao.ContractTaskMapper;
-import com.goafanti.common.dao.TOrderMapper;
-import com.goafanti.common.dao.TechProjectLogMapper;
-import com.goafanti.common.dao.TechProjectMapper;
-import com.goafanti.common.dao.UserMapper;
-import com.goafanti.common.enums.DeleteStatus;
-import com.goafanti.common.enums.NoticeReadStatus;
-import com.goafanti.common.enums.NoticeStatus;
-import com.goafanti.common.enums.OrderFlowState;
-import com.goafanti.common.enums.TechProjectStatus;
+import com.goafanti.common.dao.*;
+import com.goafanti.common.enums.*;
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.Contract;
-import com.goafanti.common.model.ContractTask;
-import com.goafanti.common.model.ContractTaskLog;
-import com.goafanti.common.model.Notice;
-import com.goafanti.common.model.TOrder;
-import com.goafanti.common.model.TechProject;
-import com.goafanti.common.model.TechProjectLog;
-import com.goafanti.common.model.User;
+import com.goafanti.common.model.*;
 import com.goafanti.common.utils.MobileMessageUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
@@ -52,17 +17,20 @@ import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.enums.ProjectStage;
 import com.goafanti.order.enums.PublicStatus;
 import com.goafanti.order.enums.TaskDistributionState;
-import com.goafanti.techproject.bo.ProjectDetailBo;
-import com.goafanti.techproject.bo.ProjectListBo;
-import com.goafanti.techproject.bo.TaskDetailBo;
-import com.goafanti.techproject.bo.TaskListBo;
-import com.goafanti.techproject.bo.TechProjectClientListBo;
-import com.goafanti.techproject.bo.TechProjectContractListBo;
-import com.goafanti.techproject.bo.TechProjectDetailBo;
-import com.goafanti.techproject.bo.TechProjectManageListBo;
+import com.goafanti.techproject.bo.*;
 import com.goafanti.techproject.enums.TaskState;
 import com.goafanti.techproject.service.TechProjectService;
 import com.goafanti.user.bo.OrgUnitNames;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;