|
|
|
@ -16,10 +16,12 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.plansub.PlanSubMapper;
|
|
|
|
|
import com.chanko.yunxi.mes.module.heli.enums.ProjectPlanStatusEnum;
|
|
|
|
|
import com.chanko.yunxi.mes.module.heli.service.projectorder.ProjectOrderService;
|
|
|
|
|
import com.chanko.yunxi.mes.module.heli.service.serialnumber.SerialNumberService;
|
|
|
|
|
import jodd.util.StringUtil;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
import org.thymeleaf.util.StringUtils;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
@ -143,8 +145,20 @@ public class PlanServiceImpl implements PlanService {
|
|
|
|
|
planSubDO.setProjectPlanId(planDO.getId());
|
|
|
|
|
planSubDO.setProjectId(projectId);
|
|
|
|
|
planSubDO.setProjectSubId(item.getId());
|
|
|
|
|
if(!StringUtils.isEmpty(item.getDeviceModel())){
|
|
|
|
|
planSubDO.setEquipId(Long.parseLong(item.getDeviceModel()));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
planSubMapper.insert(planSubDO);
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
PlanSubDO planSubDO = list.stream().filter(ps -> ps.getProjectSubId().equals(item.getId())).findFirst().get();
|
|
|
|
|
if(!StringUtils.isEmpty(item.getDeviceModel())){
|
|
|
|
|
planSubDO.setEquipId(Long.parseLong(item.getDeviceModel()));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
planSubMapper.updateById(planSubDO);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}else{
|
|
|
|
@ -171,6 +185,9 @@ public class PlanServiceImpl implements PlanService {
|
|
|
|
|
planSubDO.setProjectPlanId(planDO.getId());
|
|
|
|
|
planSubDO.setProjectId(projectId);
|
|
|
|
|
planSubDO.setProjectSubId(item.getId());
|
|
|
|
|
if(!StringUtils.isEmpty(item.getDeviceModel())){
|
|
|
|
|
planSubDO.setEquipId(Long.parseLong(item.getDeviceModel()));
|
|
|
|
|
}
|
|
|
|
|
planSubMapper.insert(planSubDO);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|