|
|
@@ -17,6 +17,7 @@ import com.goafanti.admin.bo.AdminListBo;
|
|
|
import com.goafanti.common.bo.*;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
+import com.goafanti.common.model.*;
|
|
|
import com.goafanti.common.utils.*;
|
|
|
import com.goafanti.common.utils.excel.NewExcelUtil;
|
|
|
import com.goafanti.order.bo.*;
|
|
|
@@ -35,29 +36,6 @@ import com.goafanti.common.enums.ChannelStatus;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.enums.OrderLogProcess;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
-import com.goafanti.common.model.Admin;
|
|
|
-import com.goafanti.common.model.BusinessProject;
|
|
|
-import com.goafanti.common.model.Notice;
|
|
|
-import com.goafanti.common.model.OrganizationContactBook;
|
|
|
-import com.goafanti.common.model.OrganizationIdentity;
|
|
|
-import com.goafanti.common.model.ProjcetCheckLog;
|
|
|
-import com.goafanti.common.model.TArrearsDun;
|
|
|
-import com.goafanti.common.model.TOrderBonus;
|
|
|
-import com.goafanti.common.model.TOrderLog;
|
|
|
-import com.goafanti.common.model.TOrderMid;
|
|
|
-import com.goafanti.common.model.TOrderNew;
|
|
|
-import com.goafanti.common.model.TOrderTask;
|
|
|
-import com.goafanti.common.model.TTaskHours;
|
|
|
-import com.goafanti.common.model.TTaskLog;
|
|
|
-import com.goafanti.common.model.TTaskMid;
|
|
|
-import com.goafanti.common.model.TaskAttributionLog;
|
|
|
-import com.goafanti.common.model.TaskHoursCount;
|
|
|
-import com.goafanti.common.model.TaskLog;
|
|
|
-import com.goafanti.common.model.TaskProgress;
|
|
|
-import com.goafanti.common.model.TaskProgressLog;
|
|
|
-import com.goafanti.common.model.UserBusiness;
|
|
|
-import com.goafanti.common.model.UserChannel;
|
|
|
-import com.goafanti.common.model.UserLockRelease;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
@@ -131,6 +109,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Autowired
|
|
|
private PublicReleaseMapper publicReleaseMapper;
|
|
|
@Autowired
|
|
|
+ private MemberLogMapper memberLogMapper;
|
|
|
+ @Autowired
|
|
|
private AsyncUtils asyncUtils;
|
|
|
@Value(value = "${upload.path}")
|
|
|
private String uploadPath = null;
|
|
|
@@ -1088,70 +1068,67 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Override
|
|
|
public int pushExamineMemberProject(InputMenber in) {
|
|
|
TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(in.getId());
|
|
|
- TOrderLog log=new TOrderLog();
|
|
|
- log.setRemarks(in.getRemarks());
|
|
|
- log.setOrderNo(task.getOrderNo());
|
|
|
- log.setAid(TokenManager.getAdminId());
|
|
|
+ Integer status=1;
|
|
|
TOrderTask nt=new TOrderTask();
|
|
|
nt.setId(task.getId());
|
|
|
Integer result=0;
|
|
|
+ Integer notice=NoticeStatus.MENBER_YES.getCode();
|
|
|
TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
|
|
|
// 1=通过 0=驳回
|
|
|
if (in.getResult()==1){
|
|
|
//0=财务 1=特批
|
|
|
if (in.getType()==0){
|
|
|
if(task.getProcessStatus()!=1)throw new BusinessException("审核状态错误");
|
|
|
- log.setProcess(19);
|
|
|
if (task.getMemberType()==1||task.getMemberType()==2){
|
|
|
nt.setProcessStatus(2);
|
|
|
- addLog(log,0);
|
|
|
}else if (task.getMemberType()==0){
|
|
|
nt.setProcessStatus(3);
|
|
|
- addLog(log,1);
|
|
|
+ status=3;
|
|
|
result=1;
|
|
|
}
|
|
|
}else if(in.getType()==1){
|
|
|
if(task.getProcessStatus()!=2)throw new BusinessException("审核状态错误");
|
|
|
nt.setProcessStatus(3);
|
|
|
- log.setProcess(20);
|
|
|
- addLog(log,1);
|
|
|
+ status=3;
|
|
|
+
|
|
|
result=1;
|
|
|
}
|
|
|
- orderNewService.addNoticMember(NoticeStatus.MENBER_YES.getCode(), ono, in.getType(),result);
|
|
|
}else if (in.getResult()==0){
|
|
|
- if (in.getType()==0){
|
|
|
- log.setProcess(21);
|
|
|
- }else if(in.getType()==1){
|
|
|
- log.setProcess(22);
|
|
|
- }
|
|
|
- addLog(log,0);
|
|
|
+ status=2;
|
|
|
nt.setProcessStatus(4);
|
|
|
- orderNewService.addNoticMember(NoticeStatus.MENBER_NO.getCode(), ono, in.getType(),result);
|
|
|
+ notice=NoticeStatus.MENBER_NO.getCode();
|
|
|
}
|
|
|
+ orderNewService.addNoticMember(notice, ono, in.getType(),result);
|
|
|
+ addMemberLog(in.getId(),status,in.getRemarks());
|
|
|
return tOrderTaskMapper.updateByPrimaryKeySelective(nt);
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- *
|
|
|
- * @param log
|
|
|
- * @param type 0只做审核 1并完成
|
|
|
- */
|
|
|
- private void addLog(TOrderLog log,Integer type) {
|
|
|
- if (type==1){
|
|
|
- log.setProcess(23);
|
|
|
- }
|
|
|
- tOrderLogMapper.insertSelective(log);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public int updateMemberProject(TOrderTask t) {
|
|
|
TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(t.getId());
|
|
|
if(task.getProcessStatus()!=4)throw new BusinessException("审核状态错误,无法提交。");
|
|
|
- addOrderLog(task.getOrderNo(),OrderLogProcess.HYXMFQ.getCode(), "修改重新发起");
|
|
|
+ addMemberLog(t.getId(),0,"修改重新发起");
|
|
|
t.setProcessStatus(1);
|
|
|
TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
|
|
|
orderNewService.addNoticMember(NoticeStatus.MENBER_START.getCode(), ono, null,0);
|
|
|
return orderNewService.updateOrderTask(t);
|
|
|
}
|
|
|
+ @Override
|
|
|
+ public void addMemberLog(Integer id,Integer status ,String remarks){
|
|
|
+ MemberLog log = new MemberLog();
|
|
|
+ log.setPid(id);
|
|
|
+ log.setStatus(status);
|
|
|
+ log.setRemarks(remarks);
|
|
|
+ log.setAid(TokenManager.getAdminId());
|
|
|
+ memberLogMapper.insertSelective(log);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<MemberLogBo> memberLog(Integer id) {
|
|
|
+ return memberLogMapper.memberLog(id);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|