|
|
@@ -1065,16 +1065,22 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
|
|
|
if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());
|
|
|
tOrderTaskMapper.insertSelective(ot);
|
|
|
- orderNewService.addTaskMid(ot.getId(),ot.getCommodityId(),ot.getOrderNo(),1);
|
|
|
+ InputAddTask inMid=new InputAddTask();
|
|
|
+ inMid.setId(ot.getId());
|
|
|
+ inMid.setCommodityId(ot.getCommodityId());
|
|
|
+ inMid.setOrderNo(ot.getOrderNo());
|
|
|
+ inMid.setChange(1);
|
|
|
+ inMid.setLastYear(cd.getLastYear());
|
|
|
+ inMid.setLastYearCapital(cd.getLastYearCapital());
|
|
|
+ inMid.setLastYearIncome(cd.getLastYearIncome());
|
|
|
+ orderNewService.addTaskMid(inMid);
|
|
|
if (cd.getSplitStatus()==1){
|
|
|
map.put(cd.getId(),ot.getId());
|
|
|
}
|
|
|
if (cd.getServiceLife()!=null){
|
|
|
addTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum(),cd.getContractTerm());
|
|
|
}
|
|
|
- if (cd.getLastYear()!=null){
|
|
|
- addTaskMid(ot.getId(),cd.getLastYear(),cd.getLastYearCapital(),cd.getLastYearIncome());
|
|
|
- }
|
|
|
+
|
|
|
cd.setTid(ot.getId());
|
|
|
tChangeTaskMapper.updateByPrimaryKeySelective(cd);
|
|
|
tChangeDunMapper.updateByCTid(cd.getId(), ot.getId());
|
|
|
@@ -1108,14 +1114,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tTaskMidMapper.updateByTid(tTaskMid);
|
|
|
}
|
|
|
|
|
|
- private void addTaskMid(Integer id, String lastYear, BigDecimal lastYearCapital, BigDecimal lastYearIncome) {
|
|
|
- TTaskMid tTaskMid = new TTaskMid();
|
|
|
- tTaskMid.setTid(id);
|
|
|
- tTaskMid.setLastYear(lastYear);
|
|
|
- tTaskMid.setLastYearCapital(lastYearCapital);
|
|
|
- tTaskMid.setLastYearIncome(lastYearIncome);
|
|
|
- tTaskMidMapper.insertSelective(tTaskMid);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
private void updateTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum,String contractTerm) {
|
|
|
TTaskMember ttm=new TTaskMember();
|
|
|
@@ -1585,4 +1584,29 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
NewOrderChange newOrderChange=newOrderChangeMapper.selectByPrimaryKey(id);
|
|
|
return newOrderChangeMapper.gerProcessName(id,newOrderChange.getOrderNo());
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean checkTaskMain(TChangeTask t) {
|
|
|
+ int i=0;
|
|
|
+ if (t.getMain()==1){
|
|
|
+ if (t.getId()!=null) {
|
|
|
+ TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(t.getId());
|
|
|
+ t.setCid(tChangeTask.getCid());
|
|
|
+ }
|
|
|
+ List<TChangeTaskOut> l = tChangeTaskMapper.selectByCid(t.getCid(), null);
|
|
|
+ for (TChangeTaskOut task : l) {
|
|
|
+ if (task.getId().equals(t.getId())){
|
|
|
+ task.setMain(1);
|
|
|
+ }
|
|
|
+ if (task.getMain()==1){
|
|
|
+ i++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (i>1){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|