Commit d8146621 by 王衍超

修改销售计划;

parent 72b26142
...@@ -90,4 +90,8 @@ public class SalesPlanServiceImpl implements SalesPlanService{ ...@@ -90,4 +90,8 @@ public class SalesPlanServiceImpl implements SalesPlanService{
public int deleteSalesPlanDetails(UUID masterId, @Nullable UUID contractId) { public int deleteSalesPlanDetails(UUID masterId, @Nullable UUID contractId) {
return salesPlanDao.deleteDetails(masterId, contractId); return salesPlanDao.deleteDetails(masterId, contractId);
} }
public void update(KObject salesPlan) {
salesPlanDao.update(salesPlan);
}
} }
...@@ -29,4 +29,6 @@ public interface SalesPlanService { ...@@ -29,4 +29,6 @@ public interface SalesPlanService {
public int deleteSalesPlanDetails(UUID masterId, @Nullable UUID contractId) ; public int deleteSalesPlanDetails(UUID masterId, @Nullable UUID contractId) ;
public void update(KObject salesPlan);
} }
...@@ -90,11 +90,8 @@ public class SalesPlanAutoCreateTask implements Task{ ...@@ -90,11 +90,8 @@ public class SalesPlanAutoCreateTask implements Task{
continue; continue;
} }
//3.更新销售计划 //3.更新销售计划
// HashSet<KObject> contractForAddInPlan = new HashSet<>();
HashSet<UUID> contractForDelInPlan = new HashSet<>();
List<KObject> contractForAddInPlan = new ArrayList<>(); List<KObject> contractForAddInPlan = new ArrayList<>();
// List<UUID> contractForDelInPlan = new ArrayList<>(); HashSet<UUID> contractForDelInPlan = new HashSet<>();
List<KObject> executingContracts = contractDao.getExecutingContractByRegionCompany(regionCompanyId); List<KObject> executingContracts = contractDao.getExecutingContractByRegionCompany(regionCompanyId);
List<KObject> salesPlanDetails = salesPlan.get("SalesPlanDetails").toList(); List<KObject> salesPlanDetails = salesPlan.get("SalesPlanDetails").toList();
...@@ -142,7 +139,7 @@ public class SalesPlanAutoCreateTask implements Task{ ...@@ -142,7 +139,7 @@ public class SalesPlanAutoCreateTask implements Task{
double contractAmount = salesPlanDetail.getDouble(SalesPlanConstant.contractAmount); double contractAmount = salesPlanDetail.getDouble(SalesPlanConstant.contractAmount);
if(contractDinasAmount == contractAmount) continue; if(contractDinasAmount == contractAmount) continue;
salesPlanDetail.set(SalesPlanConstant.contractAmount, contractDinasAmount); salesPlanDetail.set(SalesPlanConstant.contractAmount, contractDinasAmount);
salesPlanDao.update(salesPlanDetail); salesPlanService.update(salesPlanDetail);
updateDetailCount++; updateDetailCount++;
} }
//3.3 新增销售明细 //3.3 新增销售明细
...@@ -153,7 +150,6 @@ public class SalesPlanAutoCreateTask implements Task{ ...@@ -153,7 +150,6 @@ public class SalesPlanAutoCreateTask implements Task{
+ "删除 "+contractForDelInPlan.size()+" 条销售明细,刷新 "+updateDetailCount+" 条销售明细;"); + "删除 "+contractForDelInPlan.size()+" 条销售明细,刷新 "+updateDetailCount+" 条销售明细;");
} }
} }
private void initService() { private void initService() {
......
...@@ -39,7 +39,7 @@ public class SalesPlanAutoCreateTaskRegister implements ServiceInitializer{ ...@@ -39,7 +39,7 @@ public class SalesPlanAutoCreateTaskRegister implements ServiceInitializer{
// 每天凌晨12点执行调度,如测试可修改为每十五秒:*/15 * * * * ?(表达式由至少6个由空格分隔的时间元素,从左至右可分为秒,分,时,日,月,星期) // 每天凌晨12点执行调度,如测试可修改为每十五秒:*/15 * * * * ?(表达式由至少6个由空格分隔的时间元素,从左至右可分为秒,分,时,日,月,星期)
// scheduleService.scheduleTask(TaskDetail, "0 0 0 * * ?"); // scheduleService.scheduleTask(TaskDetail, "0 0 0 * * ?");
// 测试调度时进行调用 // 测试调度时进行调用
scheduleService.scheduleTask(TaskDetail, "*/60 * * * * ?"); scheduleService.scheduleTask(TaskDetail, "*/50 * * * * ?");
logger.info("销售计划自动创建任务初始化成功!"); logger.info("销售计划自动创建任务初始化成功!");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment