|
|
@@ -2087,6 +2087,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
String date = null;
|
|
|
boolean flag = false;
|
|
|
for (String s : str) {
|
|
|
+ //判定时间是否为空
|
|
|
if (StringUtils.isEmpty(date)){
|
|
|
String s1 = pushStr(s, map);
|
|
|
if (s1!=null)date=s1;
|
|
|
@@ -2101,16 +2102,22 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
}
|
|
|
//如果是完成则修改成完成
|
|
|
if(flag){
|
|
|
+ TOrderTaskDetailBo orderTaskDetail = tOrderTaskMapper.getOrderTaskDetail(e.getId());
|
|
|
+ Integer sort = orderTaskDetail.getSort();
|
|
|
if (type==1){
|
|
|
e.setCompleteStatus(1);
|
|
|
e.setCompleteDate(DateUtils.parseDate(date));
|
|
|
- e.setScoreStatus(1);
|
|
|
+ if (sort==3||sort==6||sort==9){
|
|
|
+ e.setScoreStatus(1);
|
|
|
+ }
|
|
|
}else {
|
|
|
TOrderTask t=new TOrderTask();
|
|
|
t.setId(e.getId());
|
|
|
t.setCompleteStatus(1);
|
|
|
t.setCompleteDate(DateUtils.parseDate(date));
|
|
|
- t.setScoreStatus(1);
|
|
|
+ if (sort==3||sort==6||sort==9){
|
|
|
+ t.setScoreStatus(1);
|
|
|
+ }
|
|
|
tOrderTaskMapper.update(t);
|
|
|
}
|
|
|
}
|