|
|
@@ -12,6 +12,8 @@ import com.goafanti.common.model.*;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.order.bo.NewOrderChangeBo;
|
|
|
import com.goafanti.order.bo.TOrderNewBo;
|
|
|
+import com.goafanti.order.bo.TOrderTaskBo;
|
|
|
+import com.goafanti.order.enums.NewProjectStatus;
|
|
|
import com.goafanti.order.enums.OrderChangeProcess;
|
|
|
import com.goafanti.order.enums.OrderChangeType;
|
|
|
import com.goafanti.order.enums.ProcessStatus;
|
|
|
@@ -278,6 +280,7 @@ public class AsyncUtils {
|
|
|
//获取旧人员与新人员的角色
|
|
|
List<String> useType=adminMapper.getAdminRoleListByAid(admin.getId());
|
|
|
List<String> newType=adminMapper.getAdminRoleListByAid(tadmin.getId());
|
|
|
+ List<String> useOrderNo=tOrderTaskMapper.selectOrderNoAllByaid(admin.getId());
|
|
|
String aid=admin.getId();
|
|
|
String transferId=tadmin.getId();
|
|
|
if (useType.contains(AFTConstants.TECH)&&newType.contains(AFTConstants.TECH)){
|
|
|
@@ -316,8 +319,45 @@ public class AsyncUtils {
|
|
|
}
|
|
|
taskAttributionLogMapper.insertList(aid, transferId, date);
|
|
|
tTaskLogMapper.updateDimissionTransfer(aid, transferId);
|
|
|
+ updateOrderMidServiceProject(useOrderNo);
|
|
|
}
|
|
|
|
|
|
+ private void updateOrderMidServiceProject(List<String> useOrderNo) {
|
|
|
+ for (String orderNo : useOrderNo) {
|
|
|
+ updateOrderMidServiceProject(orderNo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private void updateOrderMidServiceProject(String orderNo) {
|
|
|
+ {
|
|
|
+ List<TOrderTaskBo> taskBos = tOrderTaskMapper.selectOrderTaskAll(orderNo, null);
|
|
|
+ if (!taskBos.isEmpty()){
|
|
|
+ List<String > cp=new ArrayList<>();
|
|
|
+ List<String > cc=new ArrayList<>();
|
|
|
+ StringBuffer ps=new StringBuffer();
|
|
|
+ StringBuffer cs=new StringBuffer();
|
|
|
+ for (TOrderTaskBo taskBo : taskBos) {
|
|
|
+ if (!cp.contains(taskBo.getCommodityName())){
|
|
|
+ cp.add(taskBo.getCommodityName());
|
|
|
+ ps=ps.append(taskBo.getCommodityName());
|
|
|
+ String str= NewProjectStatus.getValueByCode(taskBo.getProjectStatus());
|
|
|
+ ps=ps.append("-").append(str).append("-").append(taskBo.getContacts()).append(",");
|
|
|
+ }
|
|
|
+ if (!cc.contains(taskBo.getCname())){
|
|
|
+ cc.add(taskBo.getCname());
|
|
|
+ cs=cs.append(taskBo.getCname()).append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ TOrderMid tOrderMid = new TOrderMid();
|
|
|
+ tOrderMid.setOrderNo(orderNo);
|
|
|
+ if (ps.length()>1)tOrderMid.setServiceProject(ps.substring(0,ps.length()-1));
|
|
|
+ if (ps.length()>1)tOrderMid.setServiceType(cs.substring(0,cs.length()-1));
|
|
|
+ tOrderMidMapper.updateByOrderNo(tOrderMid);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
private void pushChangeProcessZXSJL(List<Integer> list) {
|
|
|
if(!list.isEmpty()){
|
|
|
Date date =new Date();
|