|
@@ -211,14 +211,12 @@ public class FmsTaskServiceImpl implements IFmsTaskService
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public int insertFmsTask(FmsTask fmsTask) {
|
|
public int insertFmsTask(FmsTask fmsTask) {
|
|
|
- fmsTask.setTid(fmsTask.getLandId());
|
|
|
|
|
return fmsTaskMapper.insertFmsTask(fmsTask);
|
|
return fmsTaskMapper.insertFmsTask(fmsTask);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Transactional
|
|
@Transactional
|
|
|
@Override
|
|
@Override
|
|
|
public int insertFmsTask(FmsTask fmsTask, FmsTaskpick fmsTaskpick, FmsWarn fmsWarn) {
|
|
public int insertFmsTask(FmsTask fmsTask, FmsTaskpick fmsTaskpick, FmsWarn fmsWarn) {
|
|
|
- fmsTask.setTid(fmsTask.getLandId());
|
|
|
|
|
int i = insertFmsTask(fmsTask);
|
|
int i = insertFmsTask(fmsTask);
|
|
|
if (fmsTaskpick != null) {
|
|
if (fmsTaskpick != null) {
|
|
|
fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
|
|
fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
|
|
@@ -235,24 +233,23 @@ public class FmsTaskServiceImpl implements IFmsTaskService
|
|
|
public int insertFmsTask(List<String> resIdsStr, FmsTask fmsTask, FmsTaskrcd fmsTaskrcd,
|
|
public int insertFmsTask(List<String> resIdsStr, FmsTask fmsTask, FmsTaskrcd fmsTaskrcd,
|
|
|
FmsTaskpick fmsTaskpick, FmsWarn fmsWarn,
|
|
FmsTaskpick fmsTaskpick, FmsWarn fmsWarn,
|
|
|
List<FmsTaskasset> fmsTaskassets, List<FmsTaskmachine> fmsTaskmachines) {
|
|
List<FmsTaskasset> fmsTaskassets, List<FmsTaskmachine> fmsTaskmachines) {
|
|
|
- fmsTask.setTid(fmsTask.getLandId());
|
|
|
|
|
int i = insertFmsTask(fmsTask);
|
|
int i = insertFmsTask(fmsTask);
|
|
|
if (fmsTaskpick != null) {
|
|
if (fmsTaskpick != null) {
|
|
|
fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
|
|
fmsTaskpickService.insertFmsTaskpick(fmsTaskpick);
|
|
|
}
|
|
}
|
|
|
if (fmsWarn != null) {
|
|
if (fmsWarn != null) {
|
|
|
- fmsWarn.setTid(fmsTask.getLandId());
|
|
|
|
|
|
|
+ fmsWarn.setTid(fmsTask.getTid());
|
|
|
fmsWarnService.insertFmsWarn(fmsWarn);
|
|
fmsWarnService.insertFmsWarn(fmsWarn);
|
|
|
}
|
|
}
|
|
|
/* 增加农事提交记录,关联农资农具*/
|
|
/* 增加农事提交记录,关联农资农具*/
|
|
|
if (fmsTaskrcd != null) {
|
|
if (fmsTaskrcd != null) {
|
|
|
- fmsTaskrcd.setTid(fmsTask.getLandId());
|
|
|
|
|
|
|
+ fmsTaskrcd.setTid(fmsTask.getTid());
|
|
|
fmsTaskrcdService.insertFmsTaskrcd(fmsTaskrcd);
|
|
fmsTaskrcdService.insertFmsTaskrcd(fmsTaskrcd);
|
|
|
if (fmsTaskassets != null && !fmsTaskassets.isEmpty()) {
|
|
if (fmsTaskassets != null && !fmsTaskassets.isEmpty()) {
|
|
|
fmsTaskassets.forEach(v -> {
|
|
fmsTaskassets.forEach(v -> {
|
|
|
v.setTaskrcdId(fmsTaskrcd.getTaskrcdId());
|
|
v.setTaskrcdId(fmsTaskrcd.getTaskrcdId());
|
|
|
v.setTaskassetId(v.getId());
|
|
v.setTaskassetId(v.getId());
|
|
|
- v.setTid(fmsTask.getLandId());
|
|
|
|
|
|
|
+ v.setTid(fmsTask.getTid());
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
fmsTaskassetMapper.insertFmsTaskassetBatch(fmsTaskassets);
|
|
fmsTaskassetMapper.insertFmsTaskassetBatch(fmsTaskassets);
|
|
@@ -261,7 +258,7 @@ public class FmsTaskServiceImpl implements IFmsTaskService
|
|
|
fmsTaskmachines.forEach(v -> {
|
|
fmsTaskmachines.forEach(v -> {
|
|
|
v.setTaskrcdId(fmsTaskrcd.getTaskrcdId());
|
|
v.setTaskrcdId(fmsTaskrcd.getTaskrcdId());
|
|
|
v.setTaskmachId(v.getId());
|
|
v.setTaskmachId(v.getId());
|
|
|
- v.setTid(fmsTask.getLandId());
|
|
|
|
|
|
|
+ v.setTid(fmsTask.getTid());
|
|
|
});
|
|
});
|
|
|
fmsTaskmachineMapper.insertFmsTaskmachineBatch(fmsTaskmachines);
|
|
fmsTaskmachineMapper.insertFmsTaskmachineBatch(fmsTaskmachines);
|
|
|
}
|
|
}
|