bug修改

common/src/main/java/com/jpsoft/shinestar/modules/base/service/impl/WorkOverServiceImpl.java

@@ -452,8 +452,8 @@ public class WorkOverServiceImpl implements WorkOverService {
 
 
 				workOver.setProcinstId(procinstId);
-				update(workOver);
 				workOver.setStatus("0");
+				update(workOver);
 
 				ProcinstActivity procinstActivity = procinstActivityService.findByActivityIndexAndProcinstId(1, procinstId);
 

web/src/main/java/com/jpsoft/shinestar/modules/mobile/controller/AdjustShiftApiController.java

@@ -744,6 +744,7 @@ public class AdjustShiftApiController {
             map.put("oldShift", oldShiftName);
             map.put("newShift", newShiftName);
             map.put("createTime", DateUtil.format(adjustShift.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+            map.put("newShiftIds", newShiftIds);
             messageResult.setData(map);
             messageResult.setCode(200);
             messageResult.setResult(true);