Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

tall/src/main/java/com/ccsens/tall/service/ProjectService.java

@@ -890,6 +890,22 @@ public class ProjectService implements IProjectService {
 
             }
             projectFeign.setTaskDetails(taskDetailListFeign);
+            //复制上下道工序
+            copyLastTask(oldIdAndNewId,newProjectId);
+        }
+    }
+
+    public void copyLastTask(Map<Long,Long> oldIdAndNewId,Long newProjectId){
+        ProTaskDetailExample taskDetailExample = new ProTaskDetailExample();
+        taskDetailExample.createCriteria().andProjectIdEqualTo(newProjectId);
+        List<ProTaskDetail> proTaskDetails = taskDetailDao.selectByExample(taskDetailExample);
+        if (CollectionUtil.isNotEmpty(proTaskDetails)){
+            for (ProTaskDetail taskDetail : proTaskDetails) {
+                if(ObjectUtil.isNotNull(taskDetail.getLastTaskDetailId())){
+                    taskDetail.setLastTaskDetailId(oldIdAndNewId.get(taskDetail.getLastTaskDetailId()));
+                    taskDetailDao.updateByPrimaryKeySelective(taskDetail);
+                }
+            }
         }
     }
 

tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java

@@ -359,7 +359,7 @@ public class TaskSubTimeService implements ITaskSubTimeService {
                 subTimeExample.createCriteria().andBeginTimeGreaterThan(currentTime).andTaskDetailIdEqualTo(proTaskDetail.getId());
                 List<ProTaskSubTime> taskSubTimes = taskSubTimeDao.selectByExample(subTimeExample);
                 if (CollectionUtil.isNotEmpty(taskSubTimes)){
-                    taskSubTimes.get(0).setBeginTime(taskSubTimes.get(0).getBeginTime()+timeDifference);
+                    taskSubTimes.get(0).setBeginTime(taskSubTimes.get(0).getBeginTime()-timeDifference);
                     taskSubTimeDao.updateByPrimaryKeySelective(taskSubTimes.get(0));
                 }
                 updateTimeDifference(timeDifference,proTaskDetail.getId());

wisdomcar/src/main/resources/mapper_dao/PatientWisdomCarDao.xml

@@ -67,7 +67,6 @@
 		and
 		((a.start_time < REPLACE(unix_timestamp(NOW(3)),'.','') and a.end_time > REPLACE(unix_timestamp(NOW(3)),'.','') )
 		or (a.end_time =0 and a.start_time+7200000 > REPLACE(unix_timestamp(NOW(3)),'.','')))
-		ORDER BY a.start_time
-		DESC LIMIT 1
+		ORDER BY a.start_time DESC LIMIT 1
 	</select>
 </mapper>