|
|
@@ -150,7 +150,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Override
|
|
|
@Transactional
|
|
|
public int updateProjectDistribution(Integer taskId, String taskReceiverId,String remarks,Integer type) {
|
|
|
- TOrderTask t=tOrderTaskMapper.selectByPrimaryKey(taskId);
|
|
|
+ TOrderTask t=tOrderTaskMapper.queryById(taskId);
|
|
|
TOrderNew tn=checkDeleteSign(t.getOrderNo());
|
|
|
Date date=new Date();
|
|
|
t.setTaskStatus(TaskState.DISTRIBUTION.getCode());
|
|
|
@@ -216,7 +216,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
t.setManagerId(taskReceiverId);
|
|
|
}
|
|
|
t.setReceiverName(a.getName());
|
|
|
- tOrderTaskMapper.updateByPrimaryKey(t);
|
|
|
+ tOrderTaskMapper.update(t);
|
|
|
List<String> aids = new ArrayList<>();
|
|
|
aids.add(taskReceiverId);
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
@@ -607,7 +607,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
} catch (ParseException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
- tOrderTaskMapper.updateByPrimaryKeySelective(task);
|
|
|
+ tOrderTaskMapper.update(task);
|
|
|
//项目中间表修改
|
|
|
if (t.getUrgentDay()!=null||t.getIfMaterial()!=null||t.getRejectCount()!=null||
|
|
|
t.getAcceptCount()!=null||t.getAuthorizeCount()!=null||t.getSpotCheckStatus()!=null) {
|
|
|
@@ -644,7 +644,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
t.setCertificateNumber(b.getCertificateNumber());
|
|
|
if(b.getSetUpAmount()!=null)t.setSetUpAmount(new BigDecimal(b.getSetUpAmount()));
|
|
|
if (b.getPubicityUrl()!=null)t.setPubicityUrl(b.getPubicityUrl());
|
|
|
- TOrderTask task2=tOrderTaskMapper.selectByPrimaryKey(b.getTid());//查询出项目信息
|
|
|
+ TOrderTask task2=tOrderTaskMapper.queryById(b.getTid());//查询出项目信息
|
|
|
if(b.getProjectStatus()!=task2.getProjectStatus()||!b.getTimeRecord().equals(task2.getTimeRecord())){
|
|
|
TTaskMid taskMid = new TTaskMid();
|
|
|
taskMid.setTid(b.getTid());
|
|
|
@@ -673,7 +673,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
//做计时处理
|
|
|
pushTaskTimes(t);
|
|
|
- tOrderTaskMapper.updateByPrimaryKeySelective(t);
|
|
|
+ tOrderTaskMapper.update(t);
|
|
|
projectSplitPush(b.getTid(), b.getProjectStatus(),task2);
|
|
|
pushTaskLog(b.getTid(), b.getProjectStatus());
|
|
|
updateMidServiceProject(task2.getOrderNo());
|
|
|
@@ -751,8 +751,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
TOrderTask fatherTask=new TOrderTask();
|
|
|
fatherTask.setId(task2.getSplitSuper());
|
|
|
fatherTask.setProjectStatus(i);
|
|
|
- tOrderTaskMapper.updateByPrimaryKeySelective(fatherTask);
|
|
|
- TOrderTask task3=tOrderTaskMapper.selectByPrimaryKey(task2.getSplitSuper());
|
|
|
+ tOrderTaskMapper.update(fatherTask);
|
|
|
+ TOrderTask task3=tOrderTaskMapper.queryById(task2.getSplitSuper());
|
|
|
//设置父任务
|
|
|
TOrderTaskDetailBo t2=new TOrderTaskDetailBo();
|
|
|
t2.setOrderNo(task2.getOrderNo());
|
|
|
@@ -765,8 +765,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
TOrderTask task3 =tOrderTaskMapper.selectBySuperId(task2.getSuperId());
|
|
|
task3.setId(Integer.valueOf(task2.getSuperId()));
|
|
|
task3.setSuperId(null);
|
|
|
- tOrderTaskMapper.updateByPrimaryKeySelective(task3);
|
|
|
- TOrderTask task4 = tOrderTaskMapper.selectByPrimaryKey(Integer.valueOf(task2.getSuperId()));
|
|
|
+ tOrderTaskMapper.update(task3);
|
|
|
+ TOrderTask task4 = tOrderTaskMapper.queryById(Integer.valueOf(task2.getSuperId()));
|
|
|
meanwhileUpdateOrder(task4);
|
|
|
}else {
|
|
|
meanwhileUpdateOrder(task2);
|
|
|
@@ -975,7 +975,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
@Override
|
|
|
public int addTaskHours(TTaskHours t) {
|
|
|
- TOrderTask tt=tOrderTaskMapper.selectByPrimaryKey(Integer.valueOf(t.getTaskId()));
|
|
|
+ TOrderTask tt=tOrderTaskMapper.queryById(Integer.valueOf(t.getTaskId()));
|
|
|
checkDeleteSign(tt.getOrderNo());
|
|
|
t.setAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
|
|
|
t.setId(UUID.randomUUID().toString());
|
|
|
@@ -1056,7 +1056,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Override
|
|
|
public int createTaskProgress(TaskProgressBo t) {
|
|
|
TaskProgress tp=new TaskProgress();
|
|
|
- TOrderTask tt=tOrderTaskMapper.selectByPrimaryKey(t.getTaskId());
|
|
|
+ TOrderTask tt=tOrderTaskMapper.queryById(t.getTaskId());
|
|
|
int count =taskProgressMapper.AlreadyNuberCount(t.getTaskId());
|
|
|
count +=t.getAlreadyNumber();
|
|
|
if(tt.getCommodityQuantity()<count)throw new BusinessException(new Error( "数量不能大于总量!" ,"数量不能大于总量!"));
|
|
|
@@ -1081,7 +1081,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Override
|
|
|
public int updateTaskProgress(TaskProgressBo t) {
|
|
|
TaskProgress tp=taskProgressMapper.selectByPrimaryKey(t.getId());
|
|
|
- TOrderTask tt=tOrderTaskMapper.selectByPrimaryKey(t.getTaskId());
|
|
|
+ TOrderTask tt=tOrderTaskMapper.queryById(t.getTaskId());
|
|
|
int count =taskProgressMapper.AlreadyNuberCount(t.getTaskId());
|
|
|
count = count-tp.getAlreadyNumber()+t.getAlreadyNumber();
|
|
|
if(tt.getCommodityQuantity()<count)throw new BusinessException(new Error( "数量不能大于总量!" ,"数量不能大于总量!"));
|
|
|
@@ -1143,7 +1143,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Override
|
|
|
public int pushSplitProject(Integer tid, String splitList) {
|
|
|
String[] str=splitList.split(",");
|
|
|
- TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(tid);
|
|
|
+ TOrderTask task=tOrderTaskMapper.queryById(tid);
|
|
|
checkDeleteSign(task.getOrderNo());
|
|
|
TOrderTask usedTask=new TOrderTask();
|
|
|
usedTask.setId(tid);
|
|
|
@@ -1156,7 +1156,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (!task.getCommodityQuantity().equals(x)||str.length==1) {
|
|
|
return -1;
|
|
|
}
|
|
|
- tOrderTaskMapper.updateByPrimaryKeySelective(usedTask);
|
|
|
+ tOrderTaskMapper.update(usedTask);
|
|
|
int i=1;
|
|
|
TOrderTask newTask=task;
|
|
|
newTask.setCommodityPrice(new BigDecimal(0));
|
|
|
@@ -1256,7 +1256,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
projcetCheckLogMapper.insertSelective(log);
|
|
|
tOrderPaymentMapper.deleteByParam(tid,2);
|
|
|
- return tOrderTaskMapper.updateByPrimaryKeySelective(t);
|
|
|
+ return tOrderTaskMapper.update(t);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -1408,7 +1408,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
*/
|
|
|
@Override
|
|
|
public int pushExamineMemberProject(InputMenber in) {
|
|
|
- TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(in.getId());
|
|
|
+ TOrderTask task=tOrderTaskMapper.queryById(in.getId());
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
Integer status=1;
|
|
|
boolean appFlag=false;
|
|
|
@@ -1504,7 +1504,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (nt.getProcessStatus()!=null&&nt.getProcessStatus()==3){
|
|
|
tTaskMemberMapper.updateServiceYearBySplitSuper(task.getSplitSuper());
|
|
|
}
|
|
|
- tOrderTaskMapper.updateByPrimaryKeySelective(nt);
|
|
|
+ tOrderTaskMapper.update(nt);
|
|
|
if (flag){
|
|
|
addNoticMember(notice, ono, in.getType(),result);
|
|
|
}
|
|
|
@@ -1542,7 +1542,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
@Override
|
|
|
public int updateMemberProject(InputAddTask t) {
|
|
|
- TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(t.getId());
|
|
|
+ TOrderTask task=tOrderTaskMapper.queryById(t.getId());
|
|
|
if(task.getProcessStatus()!=4)throw new BusinessException("审核状态错误,无法提交。");
|
|
|
addMemberLog(t.getId(),0,"修改重新发起",TokenManager.getAdminId());
|
|
|
t.setProcessStatus(1);
|
|
|
@@ -1574,11 +1574,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
@Override
|
|
|
public TOrderTask addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer memberType,String pictureUrl) {
|
|
|
Date date =new Date();
|
|
|
- TOrderTask tOrderTask = tOrderTaskMapper.selectByPrimaryKey(tid);
|
|
|
+ TOrderTask tOrderTask = tOrderTaskMapper.queryById(tid);
|
|
|
tOrderTask.setSplitStatus(1);
|
|
|
tOrderTask.setSplitAid(TokenManager.getAdminId());
|
|
|
tOrderTask.setSplitTime(date);
|
|
|
- tOrderTaskMapper.updateByPrimaryKey(tOrderTask);
|
|
|
+ tOrderTaskMapper.update(tOrderTask);
|
|
|
tOrderTask.setId(null);
|
|
|
tOrderTask.setSplitStatus(2);
|
|
|
tOrderTask.setSplitSuper(tid);
|
|
|
@@ -1659,7 +1659,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
tOrderTask.setId(t.getId());
|
|
|
|
|
|
- tOrderTaskMapper.updateByPrimaryKeySelective(tOrderTask);
|
|
|
+ tOrderTaskMapper.update(tOrderTask);
|
|
|
tOrderExamineMapper.insertBatch(list);
|
|
|
}
|
|
|
|
|
|
@@ -1809,15 +1809,15 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
|
|
|
@Override
|
|
|
public int deleteMemberSonProject(Integer id) {
|
|
|
- TOrderTask task = tOrderTaskMapper.selectByPrimaryKey(id);
|
|
|
- tOrderTaskMapper.deleteByPrimaryKey(id);
|
|
|
+ TOrderTask task = tOrderTaskMapper.queryById(id);
|
|
|
+ tOrderTaskMapper.deleteById(id);
|
|
|
List<TOrderTaskListBo> tOrderTaskListBos = tOrderTaskMapper.splitProjectList(task.getSplitSuper(),null);
|
|
|
//如果没有子项目则修改上级
|
|
|
if (tOrderTaskListBos==null||tOrderTaskListBos.isEmpty()){
|
|
|
TOrderTask tOrderTask=new TOrderTask();
|
|
|
tOrderTask.setId(task.getSplitSuper());
|
|
|
tOrderTask.setSplitStatus(0);
|
|
|
- tOrderTaskMapper.updateByPrimaryKeySelective(tOrderTask);
|
|
|
+ tOrderTaskMapper.update(tOrderTask);
|
|
|
}
|
|
|
tTaskMidMapper.deleteByPrimaryKey(id);
|
|
|
tTaskMemberMapper.deleteByPrimaryKey(id);
|
|
|
@@ -1976,7 +1976,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
TaskStop use = taskStopMapper.selectByPrimaryKey(in.getTaskStopId());
|
|
|
TaskStop t=new TaskStop();
|
|
|
t.setId(use.getId());
|
|
|
- TOrderTask task = tOrderTaskMapper.selectByPrimaryKey(use.getTid());
|
|
|
+ TOrderTask task = tOrderTaskMapper.queryById(use.getTid());
|
|
|
if (in.getStatus()==1){
|
|
|
t.setStatus(1);
|
|
|
StringBuffer str =new StringBuffer();
|
|
|
@@ -2001,7 +2001,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
task2.setId(task.getId());
|
|
|
task2.setProjectStatus(task.getProjectStatus());
|
|
|
|
|
|
- tOrderTaskMapper.updateByPrimaryKeySelective(task2);
|
|
|
+ tOrderTaskMapper.update(task2);
|
|
|
tOrderMidMapper.updateStopProjectByOrderNo(task.getOrderNo());
|
|
|
if (task.getSplitStatus()==1){
|
|
|
TOrderTask tot=new TOrderTask();
|
|
|
@@ -2057,7 +2057,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}else if (formRetrieve==4){
|
|
|
in.setSatisfactionDegreeUrl(satisfactionDegreeUrl);
|
|
|
}
|
|
|
- return tOrderTaskMapper.updateByPrimaryKeySelective(in);
|
|
|
+ return tOrderTaskMapper.update(in);
|
|
|
}
|
|
|
|
|
|
@Override
|