|
|
@@ -16,6 +16,7 @@ import com.goafanti.common.enums.NoticeStatus;
|
|
|
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.enums.OrderChangeProcess;
|
|
|
import com.goafanti.order.enums.ProcessStatus;
|
|
|
import org.apache.ibatis.annotations.Param;
|
|
|
@@ -180,19 +181,19 @@ public class AsyncUtils {
|
|
|
*/
|
|
|
public void addProjectSotpNotic(Integer type, Integer sotpType, String ids, TOrderTask task) {
|
|
|
Integer noticeType=0;
|
|
|
+ TOrderNewBo tOrderNew = tOrderNewMapper.getOrderNewDetail(task.getOrderNo());
|
|
|
if (type==0){
|
|
|
noticeType=sotpType==0?NoticeStatus.PROJECT_SOPT_START.getCode() :NoticeStatus.PROJECT_RENEW_START.getCode();
|
|
|
String[] split = ids.split(",");
|
|
|
task = tOrderTaskMapper.selectByPrimaryKey(Integer.valueOf(split[0]));
|
|
|
- String str=String.format("订单编号[%s]项目编号[%s],请及时审核",task.getOrderNo(),ids);
|
|
|
- TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(task.getOrderNo());
|
|
|
+ String str=String.format("客户名称[%s]订单编号[%s]项目编号[%s],请及时审核",tOrderNew.getUserName(),task.getOrderNo(),ids);
|
|
|
List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(tOrderNew.getOrderDep(),AFTConstants.SALESMAN_ADMIN);
|
|
|
for (Admin admin : admins) {
|
|
|
addNotic( noticeType,admin.getId(), str);
|
|
|
send(new EmailBo(NoticeStatus.getValueByCode(noticeType),admin.getEmail(),str));
|
|
|
}
|
|
|
}else if(type==1){
|
|
|
- String str=String.format("订单编号[%s]项目编号[%s],已%s请悉知。",task.getOrderNo(),task.getId(),sotpType==1?"恢复":"暂停");
|
|
|
+ String str=String.format("客户名称[%s]订单编号[%s]项目编号[%s],已%s请悉知。",tOrderNew.getUserName(),task.getOrderNo(),task.getId(),sotpType==1?"恢复":"暂停");
|
|
|
noticeType=sotpType==0?NoticeStatus.PROJECT_SOPT_YES.getCode() :NoticeStatus.PROJECT_RENEW_YES.getCode();
|
|
|
List<String> list = new ArrayList<>();
|
|
|
List<Notice> notes=new ArrayList<>();
|